pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
plasma-desktop: SUBST rather than patches
Module Name: pkgsrc-wip
Committed By: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By: markd
Date: Tue Jan 30 23:15:40 2018 +1300
Changeset: 1b5fa57164e99d039e93742d152d3652ea834905
Modified Files:
plasma-desktop/Makefile
plasma-desktop/distinfo
Removed Files:
plasma-desktop/patches/patch-kcms_colors_CMakeLists.txt
plasma-desktop/patches/patch-kcms_cursortheme_CMakeLists.txt
plasma-desktop/patches/patch-kcms_desktoptheme_CMakeLists.txt
plasma-desktop/patches/patch-kcms_emoticons_CMakeLists.txt
plasma-desktop/patches/patch-kcms_icons_CMakeLists.txt
plasma-desktop/patches/patch-kcms_kfontinst_kcmfontinst_CMakeLists.txt
plasma-desktop/patches/patch-kcms_lookandfeel_CMakeLists.txt
Log Message:
plasma-desktop: SUBST rather than patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1b5fa57164e99d039e93742d152d3652ea834905
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
plasma-desktop/Makefile | 13 +++++++++++++
plasma-desktop/distinfo | 7 -------
plasma-desktop/patches/patch-kcms_colors_CMakeLists.txt | 15 ---------------
.../patches/patch-kcms_cursortheme_CMakeLists.txt | 13 -------------
.../patches/patch-kcms_desktoptheme_CMakeLists.txt | 15 ---------------
.../patches/patch-kcms_emoticons_CMakeLists.txt | 12 ------------
plasma-desktop/patches/patch-kcms_icons_CMakeLists.txt | 14 --------------
.../patch-kcms_kfontinst_kcmfontinst_CMakeLists.txt | 15 ---------------
.../patches/patch-kcms_lookandfeel_CMakeLists.txt | 15 ---------------
9 files changed, 13 insertions(+), 106 deletions(-)
diffs:
diff --git a/plasma-desktop/Makefile b/plasma-desktop/Makefile
index 19e3d712b2..4d2c38e76e 100644
--- a/plasma-desktop/Makefile
+++ b/plasma-desktop/Makefile
@@ -19,6 +19,19 @@ USE_TOOLS+= msgmerge pkg-config
CMAKE_ARGS+= -DKAUTH_DBUS_DIR=${PREFIX}/share/examples/plasma-desktop
+SUBST_CLASSES+= xdg
+SUBST_STAGE.xdg= post-patch
+SUBST_MESSAGE.xdg= Install via examples dir.
+SUBST_FILES.xdg= kcms/colors/CMakeLists.txt
+SUBST_FILES.xdg+= kcms/cursortheme/CMakeLists.txt
+SUBST_FILES.xdg+= kcms/desktoptheme/CMakeLists.txt
+SUBST_FILES.xdg+= kcms/emoticons/CMakeLists.txt
+SUBST_FILES.xdg+= kcms/icons/CMakeLists.txt
+SUBST_FILES.xdg+= kcms/kfontinst/kcmfontinst/CMakeLists.txt
+SUBST_FILES.xdg+= kcms/lookandfeel/CMakeLists.txt
+SUBST_SED.xdg= -e 's:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+SUBST_SED.xdg+= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/colorschemes.knsrc \
${PKG_SYSCONFDIR}/xdg/colorschemes.knsrc
diff --git a/plasma-desktop/distinfo b/plasma-desktop/distinfo
index 4413d63584..1a5bdb7faf 100644
--- a/plasma-desktop/distinfo
+++ b/plasma-desktop/distinfo
@@ -4,10 +4,3 @@ SHA1 (plasma-desktop-5.11.5.tar.xz) = 4cdcffce4fff25178671e19e1bcc36bbe9aaf31f
RMD160 (plasma-desktop-5.11.5.tar.xz) = ab2310ed499ec99f33f598158bdd654c282dc74b
SHA512 (plasma-desktop-5.11.5.tar.xz) = 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7
Size (plasma-desktop-5.11.5.tar.xz) = 8534060 bytes
-SHA1 (patch-kcms_colors_CMakeLists.txt) = 6bb4ac9cd63ed4b411d5eb5cd6f919330fe1e3fb
-SHA1 (patch-kcms_cursortheme_CMakeLists.txt) = 870898ecfab73acf05935958ddf31f24c1631381
-SHA1 (patch-kcms_desktoptheme_CMakeLists.txt) = 18f73dcc1b00f71f7485c8154d9a8840a9964373
-SHA1 (patch-kcms_emoticons_CMakeLists.txt) = d2edd60b36e27102efdb0d78986483c4c782633c
-SHA1 (patch-kcms_icons_CMakeLists.txt) = b6433da0618da4e099e88b06a359db698e9820b6
-SHA1 (patch-kcms_kfontinst_kcmfontinst_CMakeLists.txt) = a54f4f140227e15134d5b3d231c1f35652921df4
-SHA1 (patch-kcms_lookandfeel_CMakeLists.txt) = 69c453e8f8201b85674ad1267500b1fd8c1859b6
diff --git a/plasma-desktop/patches/patch-kcms_colors_CMakeLists.txt b/plasma-desktop/patches/patch-kcms_colors_CMakeLists.txt
deleted file mode 100644
index 9e5f9b456c..0000000000
--- a/plasma-desktop/patches/patch-kcms_colors_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcms/colors/CMakeLists.txt.orig 2016-04-19 11:15:58.000000000 +0000
-+++ kcms/colors/CMakeLists.txt
-@@ -24,7 +24,7 @@ endif()
-
- install(TARGETS kcm_colors DESTINATION ${PLUGIN_INSTALL_DIR})
- install( FILES colors.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--install( FILES colorschemes.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
-+install( FILES colorschemes.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR} )
-
- # built-in color schemes
- file(GLOB schemefiles schemes/*.colors)
diff --git a/plasma-desktop/patches/patch-kcms_cursortheme_CMakeLists.txt b/plasma-desktop/patches/patch-kcms_cursortheme_CMakeLists.txt
deleted file mode 100644
index c3f6e5bf3d..0000000000
--- a/plasma-desktop/patches/patch-kcms_cursortheme_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcms/cursortheme/CMakeLists.txt.orig 2016-04-19 11:15:58.000000000 +0000
-+++ kcms/cursortheme/CMakeLists.txt
-@@ -56,5 +56,5 @@ install(TARGETS kcm_cursortheme DESTINA
- ########### install files ###############
-
- install( FILES cursortheme.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--install( FILES xcursor/xcursor.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
-+install( FILES xcursor/xcursor.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR} )
-
diff --git a/plasma-desktop/patches/patch-kcms_desktoptheme_CMakeLists.txt b/plasma-desktop/patches/patch-kcms_desktoptheme_CMakeLists.txt
deleted file mode 100644
index 235a102d48..0000000000
--- a/plasma-desktop/patches/patch-kcms_desktoptheme_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcms/desktoptheme/CMakeLists.txt.orig 2018-01-02 16:45:43.807463748 +0000
-+++ kcms/desktoptheme/CMakeLists.txt
-@@ -21,7 +21,7 @@ kcoreaddons_desktop_to_json(kcm_desktopt
-
- #this desktop file is installed only for retrocompatibility with sycoca
- install(FILES kcm_desktoptheme.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--install(FILES plasma-themes.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-+install(FILES plasma-themes.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
- install(TARGETS kcm_desktoptheme DESTINATION ${PLUGIN_INSTALL_DIR}/kcms)
-
- kpackage_install_package(package kcm_desktoptheme kcms)
diff --git a/plasma-desktop/patches/patch-kcms_emoticons_CMakeLists.txt b/plasma-desktop/patches/patch-kcms_emoticons_CMakeLists.txt
deleted file mode 100644
index 5923396892..0000000000
--- a/plasma-desktop/patches/patch-kcms_emoticons_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcms/emoticons/CMakeLists.txt.orig 2016-04-19 11:15:58.000000000 +0000
-+++ kcms/emoticons/CMakeLists.txt
-@@ -14,4 +14,4 @@ install(TARGETS kcm_emoticons DESTINATI
-
- ########### install files ###############
- install( FILES emoticons.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
-+install( FILES emoticons.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR} )
diff --git a/plasma-desktop/patches/patch-kcms_icons_CMakeLists.txt b/plasma-desktop/patches/patch-kcms_icons_CMakeLists.txt
deleted file mode 100644
index e8b8e36e92..0000000000
--- a/plasma-desktop/patches/patch-kcms_icons_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcms/icons/CMakeLists.txt.orig 2018-01-02 16:45:43.811463778 +0000
-+++ kcms/icons/CMakeLists.txt
-@@ -36,6 +36,6 @@ install(TARGETS kcm_icons DESTINATION $
- install( FILES icons.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/icons.knsrc ${CMAKE_BINARY_DIR}/icons.knsrc)
--install( FILES ${CMAKE_BINARY_DIR}/icons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
-+install( FILES ${CMAKE_BINARY_DIR}/icons.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR} )
-
- install(TARGETS plasma-changeicons DESTINATION ${LIBEXEC_INSTALL_DIR} )
diff --git a/plasma-desktop/patches/patch-kcms_kfontinst_kcmfontinst_CMakeLists.txt b/plasma-desktop/patches/patch-kcms_kfontinst_kcmfontinst_CMakeLists.txt
deleted file mode 100644
index 63a21aca7a..0000000000
--- a/plasma-desktop/patches/patch-kcms_kfontinst_kcmfontinst_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcms/kfontinst/kcmfontinst/CMakeLists.txt.orig 2016-04-19 11:15:58.000000000 +0000
-+++ kcms/kfontinst/kcmfontinst/CMakeLists.txt
-@@ -21,7 +21,7 @@ target_link_libraries(kcm_fontinst
-
- install(TARGETS kcm_fontinst DESTINATION ${PLUGIN_INSTALL_DIR} )
- install( FILES fontinst.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--install( FILES kfontinst.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
-+install( FILES kfontinst.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR} )
-
- ecm_install_icons( ICONS
- 16-actions-addfont.png
diff --git a/plasma-desktop/patches/patch-kcms_lookandfeel_CMakeLists.txt b/plasma-desktop/patches/patch-kcms_lookandfeel_CMakeLists.txt
deleted file mode 100644
index 8fd6e2285b..0000000000
--- a/plasma-desktop/patches/patch-kcms_lookandfeel_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcms/lookandfeel/CMakeLists.txt.orig 2018-01-02 16:45:43.855464107 +0000
-+++ kcms/lookandfeel/CMakeLists.txt
-@@ -49,7 +49,7 @@ kcoreaddons_desktop_to_json(kcm_lookandf
- #this desktop file is installed only for retrocompatibility with sycoca
- install(FILES kcm_lookandfeel.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- install(TARGETS kcm_lookandfeel DESTINATION ${PLUGIN_INSTALL_DIR}/kcms)
--install(FILES lookandfeel.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
-+install(FILES lookandfeel.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
-
- if(BUILD_TESTING)
- find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
Home |
Main Index |
Thread Index |
Old Index