pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

drkonqi: handle LOGGINGCATEGORIESDIR via SUBST rather than patch.



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Thu Aug 29 11:50:08 2019 +1200
Changeset:	5ee350a28443aac7901818799ea6b462686622e9

Modified Files:
	drkonqi/Makefile
	drkonqi/distinfo
Removed Files:
	drkonqi/patches/patch-CMakeLists.txt

Log Message:
drkonqi: handle LOGGINGCATEGORIESDIR via SUBST rather than patch.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5ee350a28443aac7901818799ea6b462686622e9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 drkonqi/Makefile                     |  6 ++++++
 drkonqi/distinfo                     |  1 -
 drkonqi/patches/patch-CMakeLists.txt | 15 ---------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diffs:
diff --git a/drkonqi/Makefile b/drkonqi/Makefile
index 306bdfe450..b7fe4a490e 100644
--- a/drkonqi/Makefile
+++ b/drkonqi/Makefile
@@ -11,6 +11,12 @@ LICENSE=	gnu-lgpl-v2
 
 USE_TOOLS+=	msgmerge
 
+SUBST_CLASSES+=		qlc
+SUBST_STAGE.qlc=	pre-configure
+SUBST_MESSAGE.qlc=	Move to new KDE location
+SUBST_FILES.qlc=	CMakeLists.txt
+SUBST_SED.qlc=		-e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_LOGGINGCATEGORIESDIR}:'
+
 .include "../../devel/kidletime/buildlink3.mk"
 .include "../../net/kxmlrpcclient/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/drkonqi/distinfo b/drkonqi/distinfo
index d763750790..075025406f 100644
--- a/drkonqi/distinfo
+++ b/drkonqi/distinfo
@@ -4,4 +4,3 @@ SHA1 (drkonqi-5.16.4.tar.xz) = 4d91cf77fa6dcf786ea4de18009313feccfc7359
 RMD160 (drkonqi-5.16.4.tar.xz) = 5a16fc229b160dda3e9b5b5d432b8828369662e3
 SHA512 (drkonqi-5.16.4.tar.xz) = 8623981b26cceea0238c7aa265453125970093d7edefe2cf2865b2e9384f59f44bd2f103c64f05c074c3f49d6691c22735d1884f86bead59f564544064b39f15
 Size (drkonqi-5.16.4.tar.xz) = 744380 bytes
-SHA1 (patch-CMakeLists.txt) = a290949951d6d8cb1409ab709d6151359292c64d
diff --git a/drkonqi/patches/patch-CMakeLists.txt b/drkonqi/patches/patch-CMakeLists.txt
deleted file mode 100644
index 5f6d6f9984..0000000000
--- a/drkonqi/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install .categories file in the new location
-
---- CMakeLists.txt.orig	2019-08-28 20:34:40.497636561 +0000
-+++ CMakeLists.txt
-@@ -77,7 +77,7 @@ add_definitions(-DQT_NO_NARROWING_CONVER
- 
- add_subdirectory(src)
- 
--install( FILES drkonqi.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install( FILES drkonqi.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} )
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 


Home | Main Index | Thread Index | Old Index