pkgsrc-WIP-changes archive

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

gnucash-devel: use upstream patch to fix Makefile install



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Mar 7 15:55:48 2018 +0100
Changeset:	131a2365782ff7611ab34cc44476fd39d2170316

Modified Files:
	gnucash-devel/Makefile
	gnucash-devel/distinfo
Added Files:
	gnucash-devel/patches/patch-data_pixmaps_CMakeLists.txt

Log Message:
gnucash-devel: use upstream patch to fix Makefile install

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

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

diffstat:
 gnucash-devel/Makefile                             |  1 -
 gnucash-devel/distinfo                             |  1 +
 .../patches/patch-data_pixmaps_CMakeLists.txt      | 24 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diffs:
diff --git a/gnucash-devel/Makefile b/gnucash-devel/Makefile
index 3b3cd6cb5c..f878f306d0 100644
--- a/gnucash-devel/Makefile
+++ b/gnucash-devel/Makefile
@@ -57,7 +57,6 @@ INSTALLATION_DIRS=	share/examples/gnucash
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/etc/gnucash/environment ${DESTDIR}${PREFIX}/share/examples/gnucash/environment
-	${RM} -f ${DESTDIR}${PREFIX}/share/gnucash/pixmaps/Makefile
 
 .include "options.mk"
 
diff --git a/gnucash-devel/distinfo b/gnucash-devel/distinfo
index 7d2e8dffa3..8ccb0c0c0b 100644
--- a/gnucash-devel/distinfo
+++ b/gnucash-devel/distinfo
@@ -8,4 +8,5 @@ SHA1 (googletest-1.8.0.tar.gz) = e7e646a6204638fe8e87e165292b8dd9cd4c36ed
 RMD160 (googletest-1.8.0.tar.gz) = b0a9e48874df3291a261ed85a0c0a4d677b01dc1
 SHA512 (googletest-1.8.0.tar.gz) = 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 Size (googletest-1.8.0.tar.gz) = 1281617 bytes
+SHA1 (patch-data_pixmaps_CMakeLists.txt) = 34a560e80d9ad336e6a1e0a0baa4e404a1797eca
 SHA1 (patch-gnucash_gnucash-bin.c) = 4178d8f06685b42bd4ac9c4290085257b78935c8
diff --git a/gnucash-devel/patches/patch-data_pixmaps_CMakeLists.txt b/gnucash-devel/patches/patch-data_pixmaps_CMakeLists.txt
new file mode 100644
index 0000000000..30b0c2bfdb
--- /dev/null
+++ b/gnucash-devel/patches/patch-data_pixmaps_CMakeLists.txt
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Avoid installing a Makefile.
+https://github.com/Gnucash/gnucash/commit/2acb6da2b846e06e345b92f50a30d2d998bbeeb0
+
+--- data/pixmaps/CMakeLists.txt.orig	2018-02-24 22:14:00.000000000 +0000
++++ data/pixmaps/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ 
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash
+-    PATTERN Makefile.* EXCLUDE
++    PATTERN Makefile* EXCLUDE
+     PATTERN CMake* EXCLUDE
+     PATTERN CTest* EXCLUDE
+     PATTERN cmake* EXCLUDE
+@@ -8,7 +8,7 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE
+ )
+ FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
+     DESTINATION ${DATADIR_BUILD}/gnucash
+-    PATTERN Makefile.* EXCLUDE
++    PATTERN Makefile* EXCLUDE
+     PATTERN CMake* EXCLUDE
+     PATTERN CTest* EXCLUDE
+     PATTERN cmake* EXCLUDE


Home | Main Index | Thread Index | Old Index