diff options
| -rw-r--r-- | kde-base/kalarm/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/kalarm/files/kdepim-r1133220-fix-holidayregion.patch | 26 | ||||
| -rw-r--r-- | kde-base/kalarm/kalarm-4.4.90.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/korganizer/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/korganizer/files/kdepim-r1133220-fix-holidayregion.patch | 26 | ||||
| -rw-r--r-- | kde-base/korganizer/korganizer-4.4.90.ebuild | 1 |
6 files changed, 59 insertions, 2 deletions
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest index efb4817ace4..cbc900e8d3f 100644 --- a/kde-base/kalarm/Manifest +++ b/kde-base/kalarm/Manifest @@ -1,7 +1,8 @@ +AUX kdepim-r1133220-fix-holidayregion.patch 1093 RMD160 10b881149d57793e014f2b54f8d414f50a9391b6 SHA1 378734c278763a6e7507a6db8a6e2b6475524560 SHA256 0647a313c03cc9fcf2777a9bbb18396185604cb20a4e4feec716a9146189a723 DIST kdepim-4.4.85.tar.bz2 8724079 RMD160 fc2a727846cce35c0b00e8ca4a88d693c2687648 SHA1 5a85a14806ec11d13e7c2f81f0c34e83d8876288 SHA256 ee8fa747123b3902c6db367d5ccf3adc72d6ca4d3ce0c7cdb86c333ebd5b4c49 DIST kdepim-4.4.90.tar.bz2 8713986 RMD160 d04f4e2fb6a621c21b4546c150b890049dfbd64b SHA1 d79f6bc55d654ab200144d80df5b066f42cce19f SHA256 08bb8f76e1e6d047a656e0c1d6af6463045307923092762fe1c915664b1b9a0f EBUILD kalarm-4.4.85.ebuild 511 RMD160 04483a0687b3d602500b5f05876fafc356769aeb SHA1 ae78fe0412e1737f8ef03b241126b0729fc3575d SHA256 bd3baae6856e0b54825128f150297f27b34c29d37f1c927b3d0b797f7b5604ba -EBUILD kalarm-4.4.90.ebuild 498 RMD160 322696bbdb5203398dbfe533ce953e7d5c7cf930 SHA1 5c2bcc8b6016f26a7055b836a54e3833bf7f0e12 SHA256 b2e6b605b8cc8d920a86fd7021d130ddf3fbf81e799f6d926de4c105b8324558 +EBUILD kalarm-4.4.90.ebuild 565 RMD160 7f0c013565de3c84563bbde298451190f1b56d4e SHA1 c54c77a8595f0a2501f144de2ee533f9df078533 SHA256 70ee5aebd67757dd109b3c86fc14542a1eb3d95a28687190b668e9cbc3c648b7 EBUILD kalarm-4.4.9999.ebuild 590 RMD160 38dc5aacfc2fbfa0edc5df84b42f7b75aed50177 SHA1 b7161c96b6ae240ac79b456bdbdebe8c73ff85ce SHA256 c0a3b8db557ab69d960b2a9727b36964a34211015254f6b08ed3d2c2e68c05da EBUILD kalarm-9999.ebuild 444 RMD160 5bcaecefca34dda58897b81f7403780be43cfb5d SHA1 2441aec13707effa1cdfb70052369d1a97569489 SHA256 8f53aa1757496757dd9f4328da5d4bbca5c575fd3fb8cfee8d0c58b851cba2db MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kalarm/files/kdepim-r1133220-fix-holidayregion.patch b/kde-base/kalarm/files/kdepim-r1133220-fix-holidayregion.patch new file mode 100644 index 00000000000..6bd4fdc462d --- /dev/null +++ b/kde-base/kalarm/files/kdepim-r1133220-fix-holidayregion.patch @@ -0,0 +1,26 @@ +Index: kdepim/kalarm/prefdlg.cpp +=================================================================== +--- kdepim/kalarm/prefdlg.cpp (revision 1133219) ++++ kdepim/kalarm/prefdlg.cpp (revision 1133220) +@@ -640,7 +640,7 @@ + box->setWhatsThis(i18nc("@info:whatsthis", + "Select which holiday region to use")); + +- QStringList regions = HolidayRegion::regions(); ++ QStringList regions = HolidayRegion::regionCodes(); + QMap<QString, QString> regionsMap; + + foreach (const QString & regionCode, regions) { +Index: kdepim/korganizer/koprefsdialog.cpp +=================================================================== +--- kdepim/korganizer/koprefsdialog.cpp (revision 1133219) ++++ kdepim/korganizer/koprefsdialog.cpp (revision 1133220) +@@ -342,7 +342,7 @@ + + mHolidayCombo->setWhatsThis( KOPrefs::instance()->holidaysItem()->whatsThis() ); + +- QStringList regions = HolidayRegion::regions(); ++ QStringList regions = HolidayRegion::regionCodes(); + QMap<QString, QString> regionsMap; + + foreach ( const QString & regionCode, regions ) { diff --git a/kde-base/kalarm/kalarm-4.4.90.ebuild b/kde-base/kalarm/kalarm-4.4.90.ebuild index 4a33ada3fcf..0984601d87a 100644 --- a/kde-base/kalarm/kalarm-4.4.90.ebuild +++ b/kde-base/kalarm/kalarm-4.4.90.ebuild @@ -21,3 +21,5 @@ DEPEND="${RDEPEND}" KMEXTRACTONLY=" kmail/ " + +PATCHES=( "${FILESDIR}/kdepim-r1133220-fix-holidayregion.patch" ) diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest index 9c92cc7dc5a..0c461da7948 100644 --- a/kde-base/korganizer/Manifest +++ b/kde-base/korganizer/Manifest @@ -1,8 +1,9 @@ +AUX kdepim-r1133220-fix-holidayregion.patch 1093 RMD160 10b881149d57793e014f2b54f8d414f50a9391b6 SHA1 378734c278763a6e7507a6db8a6e2b6475524560 SHA256 0647a313c03cc9fcf2777a9bbb18396185604cb20a4e4feec716a9146189a723 AUX korganizer-4.4.75_missing_header.patch 383 RMD160 93dc7b6ab8362682917264785a7dfe358149ccff SHA1 b01f22b42c5fcb31a7a77cf474e52e5093caa67d SHA256 c49a3849686f456302372d7614508e1094c21b3e2977acaabaf25a38f34c16ab DIST kdepim-4.4.85.tar.bz2 8724079 RMD160 fc2a727846cce35c0b00e8ca4a88d693c2687648 SHA1 5a85a14806ec11d13e7c2f81f0c34e83d8876288 SHA256 ee8fa747123b3902c6db367d5ccf3adc72d6ca4d3ce0c7cdb86c333ebd5b4c49 DIST kdepim-4.4.90.tar.bz2 8713986 RMD160 d04f4e2fb6a621c21b4546c150b890049dfbd64b SHA1 d79f6bc55d654ab200144d80df5b066f42cce19f SHA256 08bb8f76e1e6d047a656e0c1d6af6463045307923092762fe1c915664b1b9a0f EBUILD korganizer-4.4.85.ebuild 1154 RMD160 543309c7e7cf61b249aa47aa7090b421262f0fa4 SHA1 cd3b981a80fb3609c49d2fd541947c3cb975b37d SHA256 7bb74d5fd34e2620b40481025e37edecb500e28eadfb9a48d49d767d17d51324 -EBUILD korganizer-4.4.90.ebuild 1141 RMD160 cfdce8524f7eb49ee2de4b6371a7165a9524c2c9 SHA1 5cabb2b67f0afeb49e7c1370e3fa034d47fb7581 SHA256 417f260a1245b31b67e5233b2c3a4492c1cea85aadc3f3aa7a4b0f3384cebac7 +EBUILD korganizer-4.4.90.ebuild 1196 RMD160 d02165bb1d1f35830357bd7fc9480f09090c3663 SHA1 c2d4acbd3ac03f1bb384f015c1d023340aec1f51 SHA256 ec2bb0254559727b9cae9b10390a61ba95ff4ac6425add515d96b8b150d28481 EBUILD korganizer-4.4.9999.ebuild 952 RMD160 5d6f74dba9ae0165a95ac3a4c85f83c288edf921 SHA1 9350c5ef2f17423946f19e01e1604a885780c471 SHA256 def63f4d70d5d393344d55bd2a252ffc990d37174c7802433a865ff121c2c21e EBUILD korganizer-9999.ebuild 1087 RMD160 d405ec4ce0fdaa28d164e8d2ad9bab3bd815b922 SHA1 82559a474a2c69e29e1c35f1cfd514ee3e8127ca SHA256 20f3d507a971d269cf4cec038fd7f857dfe1636b8a230f5ec77eed8e18dc4b42 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/korganizer/files/kdepim-r1133220-fix-holidayregion.patch b/kde-base/korganizer/files/kdepim-r1133220-fix-holidayregion.patch new file mode 100644 index 00000000000..6bd4fdc462d --- /dev/null +++ b/kde-base/korganizer/files/kdepim-r1133220-fix-holidayregion.patch @@ -0,0 +1,26 @@ +Index: kdepim/kalarm/prefdlg.cpp +=================================================================== +--- kdepim/kalarm/prefdlg.cpp (revision 1133219) ++++ kdepim/kalarm/prefdlg.cpp (revision 1133220) +@@ -640,7 +640,7 @@ + box->setWhatsThis(i18nc("@info:whatsthis", + "Select which holiday region to use")); + +- QStringList regions = HolidayRegion::regions(); ++ QStringList regions = HolidayRegion::regionCodes(); + QMap<QString, QString> regionsMap; + + foreach (const QString & regionCode, regions) { +Index: kdepim/korganizer/koprefsdialog.cpp +=================================================================== +--- kdepim/korganizer/koprefsdialog.cpp (revision 1133219) ++++ kdepim/korganizer/koprefsdialog.cpp (revision 1133220) +@@ -342,7 +342,7 @@ + + mHolidayCombo->setWhatsThis( KOPrefs::instance()->holidaysItem()->whatsThis() ); + +- QStringList regions = HolidayRegion::regions(); ++ QStringList regions = HolidayRegion::regionCodes(); + QMap<QString, QString> regionsMap; + + foreach ( const QString & regionCode, regions ) { diff --git a/kde-base/korganizer/korganizer-4.4.90.ebuild b/kde-base/korganizer/korganizer-4.4.90.ebuild index 264d1a4759b..98e77ddbefe 100644 --- a/kde-base/korganizer/korganizer-4.4.90.ebuild +++ b/kde-base/korganizer/korganizer-4.4.90.ebuild @@ -35,6 +35,7 @@ KMEXTRACTONLY=" PATCHES=( "${FILESDIR}/${PN}-4.4.75_missing_header.patch" + "${FILESDIR}/kdepim-r1133220-fix-holidayregion.patch" ) src_unpack() { |