[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [emerge/kde-4.7] portage/kde/kdepim: remove obsolete patches(now
From: Andreas Holzammer <andreas.holzammer () kdab ! com>
Date: 2011-08-28 9:02:50
Message-ID: 20110828090250.91636A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 8d8abe5988c1df4b6d66a547b8d84a788fe0fb4c by Andreas Holzammer.
Committed on 28/08/2011 at 11:01.
Pushed by aholzammer into branch 'kde-4.7'.
remove obsolete patches(now upstream)
D +0 -60 portage/kde/kdepim/broken-app-icons-fix.diff
M +1 -4 portage/kde/kdepim/kdepim-20110826-2.py
D +0 -83 portage/kde/kdepim/Add-kde4_app_icon-macro-for-mobile-targets.patch
D +0 -14 portage/kde/kdepim/remove-old-icon-way.diff
http://commits.kde.org/emerge/8d8abe5988c1df4b6d66a547b8d84a788fe0fb4c
diff --git a/portage/kde/kdepim/Add-kde4_app_icon-macro-for-mobile-targets.patch \
b/portage/kde/kdepim/Add-kde4_app_icon-macro-for-mobile-targets.patch deleted file \
mode 100644 index 9bf7e8b..0000000
--- a/portage/kde/kdepim/Add-kde4_app_icon-macro-for-mobile-targets.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 36403cee5dbced992d79956b0fd90f62618920c4 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Fri, 26 Aug 2011 15:37:24 +0000
-Subject: [PATCH 1/2] Add kde4_add_app_icon macro for mobile targets
-
- This converts the png's to ico format and embeds them as
- a ressource with rc or windres
----
- mobile/calendar/CMakeLists.txt | 2 ++
- mobile/contacts/CMakeLists.txt | 2 ++
- mobile/mail/CMakeLists.txt | 2 ++
- mobile/notes/CMakeLists.txt | 2 ++
- mobile/tasks/CMakeLists.txt | 2 ++
- 5 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/mobile/calendar/CMakeLists.txt b/mobile/calendar/CMakeLists.txt
-index 000ac88..2d13f39 100644
---- a/mobile/calendar/CMakeLists.txt
-+++ b/mobile/calendar/CMakeLists.txt
-@@ -43,6 +43,8 @@ if (RUNTIME_PLUGINS_STATIC)
- add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
- endif (RUNTIME_PLUGINS_STATIC)
-
-+kde4_add_app_icon(korganizer_mobile_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-korganizer-mobile.png")
-+
- kde4_add_executable(korganizer-mobile ${korganizer_mobile_SRCS} )
- if (WINCE)
- SET_TARGET_PROPERTIES(korganizer-mobile PROPERTIES LINK_FLAGS " /FIXED:NO")
-diff --git a/mobile/contacts/CMakeLists.txt b/mobile/contacts/CMakeLists.txt
-index f6a54a6..644b9b2 100644
---- a/mobile/contacts/CMakeLists.txt
-+++ b/mobile/contacts/CMakeLists.txt
-@@ -72,6 +72,8 @@ if (RUNTIME_PLUGINS_STATIC)
- add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
- endif (RUNTIME_PLUGINS_STATIC)
-
-+kde4_add_app_icon(kab_mobile_srcs \
"${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-kaddressbook-mobile.png")
-+
- kde4_add_executable(kaddressbook-mobile ${kab_mobile_srcs} )
- if (WINCE)
- SET_TARGET_PROPERTIES(kaddressbook-mobile PROPERTIES LINK_FLAGS " /FIXED:NO")
-diff --git a/mobile/mail/CMakeLists.txt b/mobile/mail/CMakeLists.txt
-index 99affcd..7796f1b 100644
---- a/mobile/mail/CMakeLists.txt
-+++ b/mobile/mail/CMakeLists.txt
-@@ -70,6 +70,8 @@ if (RUNTIME_PLUGINS_STATIC)
- add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
- endif (RUNTIME_PLUGINS_STATIC)
-
-+kde4_add_app_icon(kmail_mobile_srcs \
"${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-kmail-mobile.png")
-+
- kde4_add_executable(kmail-mobile ${kmail_mobile_srcs} )
- if (WINCE)
- SET_TARGET_PROPERTIES(kmail-mobile PROPERTIES LINK_FLAGS " /FIXED:NO")
-diff --git a/mobile/notes/CMakeLists.txt b/mobile/notes/CMakeLists.txt
-index 7221dd4..3933703 100644
---- a/mobile/notes/CMakeLists.txt
-+++ b/mobile/notes/CMakeLists.txt
-@@ -28,6 +28,8 @@ if (RUNTIME_PLUGINS_STATIC)
- add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
- endif (RUNTIME_PLUGINS_STATIC)
-
-+kde4_add_app_icon(notes_mobile_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-notes-mobile.png")
-+
- kde4_add_executable(notes-mobile ${notes_mobile_SRCS} )
- if (WINCE)
- SET_TARGET_PROPERTIES(notes-mobile PROPERTIES LINK_FLAGS " /FIXED:NO")
-diff --git a/mobile/tasks/CMakeLists.txt b/mobile/tasks/CMakeLists.txt
-index 34402bf..5426773 100644
---- a/mobile/tasks/CMakeLists.txt
-+++ b/mobile/tasks/CMakeLists.txt
-@@ -35,6 +35,8 @@ if (RUNTIME_PLUGINS_STATIC)
- add_definitions(-DKCALCORE_SERIALIZER_PLUGIN_STATIC)
- endif (RUNTIME_PLUGINS_STATIC)
-
-+kde4_add_app_icon(mobile_tasks_srcs \
"${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-tasks-mobile.png")
-+
- kde4_add_executable(tasks-mobile ${mobile_tasks_SRCS} )
- if (WINCE)
- SET_TARGET_PROPERTIES(tasks-mobile PROPERTIES LINK_FLAGS " /FIXED:NO")
---
-1.7.2.5
-
diff --git a/portage/kde/kdepim/broken-app-icons-fix.diff \
b/portage/kde/kdepim/broken-app-icons-fix.diff deleted file mode 100644
index df9b1c4..0000000
--- a/portage/kde/kdepim/broken-app-icons-fix.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nru kdepim-4.7.0.orig/akonadiconsole/CMakeLists.txt \
kdepim-4.7.0/akonadiconsole/CMakeLists.txt
---- kdepim-4.7.0.orig/akonadiconsole/CMakeLists.txt 2011-05-21 01:10:45.000000000 \
+0200
-+++ kdepim-4.7.0/akonadiconsole/CMakeLists.txt 2011-08-27 13:04:05.296740400 +0200
-@@ -81,7 +81,7 @@
-
- kde4_add_kcfg_files(akonadiconsole_bin_SRCS settings.kcfgc)
-
--kde4_add_app_icon(akonadiconsole_bin_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-akonadiconsole.png")
-+kde4_add_app_icon(akonadiconsole_bin_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-akonadiconsole.png")
-
- kde4_add_executable(akonadiconsole_bin ${akonadiconsole_bin_SRCS})
- set_target_properties(akonadiconsole_bin PROPERTIES OUTPUT_NAME akonadiconsole)
-diff -Nru kdepim-4.7.0.orig/akregator/src/CMakeLists.txt \
kdepim-4.7.0/akregator/src/CMakeLists.txt
---- kdepim-4.7.0.orig/akregator/src/CMakeLists.txt 2011-06-22 16:45:19.000000000 \
+0200
-+++ kdepim-4.7.0/akregator/src/CMakeLists.txt 2011-08-27 13:03:36.085069600 +0200
-@@ -13,7 +13,7 @@
-
- set(akregator_SRCS main.cpp mainwindow.cpp )
-
--kde4_add_app_icon(akregator_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-akregator.png")
-+kde4_add_app_icon(akregator_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-akregator.png")
-
- kde4_add_executable(akregator ${akregator_SRCS})
-
-diff -Nru kdepim-4.7.0.orig/kalarm/autostart/CMakeLists.txt \
kdepim-4.7.0/kalarm/autostart/CMakeLists.txt
---- kdepim-4.7.0.orig/kalarm/autostart/CMakeLists.txt 2011-05-21 01:10:45.000000000 \
+0200
-+++ kdepim-4.7.0/kalarm/autostart/CMakeLists.txt 2011-08-27 13:06:31.952128600 +0200
-@@ -6,7 +6,7 @@
- autostart.cpp
- )
-
--kde4_add_app_icon(kalarmautostart_SRCS "../ox*-app-kalarm.png")
-+kde4_add_app_icon(kalarmautostart_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/../appicons/ox*-app-kalarm.png")
-
- kde4_add_executable(kalarmautostart ${kalarmautostart_SRCS})
-
-diff -Nru kdepim-4.7.0.orig/knode/CMakeLists.txt kdepim-4.7.0/knode/CMakeLists.txt
---- kdepim-4.7.0.orig/knode/CMakeLists.txt 2011-05-21 01:10:46.000000000 +0200
-+++ kdepim-4.7.0/knode/CMakeLists.txt 2011-08-27 13:02:52.491576100 +0200
-@@ -159,7 +159,7 @@
-
- set(knode_SRCS knode.cpp knapplication.cpp main.cpp )
-
--kde4_add_app_icon(knode_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-knode.png")
-+kde4_add_app_icon(knode_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-knode.png")
-
- kde4_add_executable(knode ${knode_SRCS})
-
-diff -Nru kdepim-4.7.0.orig/korganizer/korgac/CMakeLists.txt \
kdepim-4.7.0/korganizer/korgac/CMakeLists.txt
---- kdepim-4.7.0.orig/korganizer/korgac/CMakeLists.txt 2011-05-21 01:10:46.000000000 \
+0200
-+++ kdepim-4.7.0/korganizer/korgac/CMakeLists.txt 2011-08-27 13:00:51.614662400 \
+0200
-@@ -43,7 +43,7 @@
- add_definitions(-DSERIALIZER_PLUGIN_STATIC)
- endif (RUNTIME_PLUGINS_STATIC)
-
--kde4_add_app_icon(korgac_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/pixmap/hi*-apps-korgac.png")
-+kde4_add_app_icon(korgac_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/pixmap/hi*-apps-korganizer.png")
-
- if(KORGAC_AKONADI_AGENT)
- if(NOT WINCE)
diff --git a/portage/kde/kdepim/kdepim-20110826-2.py \
b/portage/kde/kdepim/kdepim-20110826-2.py index 6a40039..47ab5d3 100644
--- a/portage/kde/kdepim/kdepim-20110826-2.py
+++ b/portage/kde/kdepim/kdepim-20110826-2.py
@@ -9,10 +9,7 @@ class subinfo( info.infoclass ):
self.defaultTarget = 'gitHEAD'
for target in self.targets:
- self.patchToApply[target] = [('disable-crypto-backend.patch', 1),
- ('Add-kde4_app_icon-macro-for-mobile-targets.patch',1),
- ('remove-old-icon-way.diff', 1),
- ('broken-app-icons-fix.diff', 1)]
+ self.patchToApply[target] = [('disable-crypto-backend.patch', 1)]
self.patchToApply['4.7.0'] += [("kdepim-4.7.0-20110823.diff", 1)]
diff --git a/portage/kde/kdepim/remove-old-icon-way.diff \
b/portage/kde/kdepim/remove-old-icon-way.diff deleted file mode 100644
index 4b7b580..0000000
--- a/portage/kde/kdepim/remove-old-icon-way.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nru kdepim-4.7.0.orig/mobile/contacts/CMakeLists.txt \
kdepim-4.7.0/mobile/contacts/CMakeLists.txt
---- kdepim-4.7.0.orig/mobile/contacts/CMakeLists.txt 2011-08-27 20:00:32.774942400 \
+0200
-+++ kdepim-4.7.0/mobile/contacts/CMakeLists.txt 2011-08-27 20:00:05.501382400 +0200
-@@ -64,10 +64,6 @@
- qt4_wrap_ui(kab_mobile_srcs configwidget.ui searchwidget.ui)
- kde4_add_kcfg_files(kab_mobile_srcs settings.kcfgc)
-
--if (WIN32)
-- set(kab_mobile_srcs ${kab_mobile_srcs} kaddressbook-mobile.rc)
--endif (WIN32)
--
- if (RUNTIME_PLUGINS_STATIC)
- add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
- endif (RUNTIME_PLUGINS_STATIC)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic