From e96a2845fefac33b48f7faa1098e38ac87786f4e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 10 Feb 2020 11:41:18 +0100 Subject: [PATCH] Update to 3.9.0 --- .gitignore | 1 + gtkd-fix-pkgconfig-prefix.patch | 112 ++++++++++++++++++++++++++++++++ gtkd.spec | 34 +++++----- sources | 2 +- 4 files changed, 130 insertions(+), 19 deletions(-) create mode 100644 gtkd-fix-pkgconfig-prefix.patch diff --git a/.gitignore b/.gitignore index e7773f1..02f67a3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /gtkd-3.8.3.tar.gz /gtkd-3.8.4.tar.gz /gtkd-3.8.5.tar.gz +/gtkd-3.9.0.tar.gz diff --git a/gtkd-fix-pkgconfig-prefix.patch b/gtkd-fix-pkgconfig-prefix.patch new file mode 100644 index 0000000..f6fc2e3 --- /dev/null +++ b/gtkd-fix-pkgconfig-prefix.patch @@ -0,0 +1,112 @@ +From a9db09117ab27127ca4c3b8d2f308fae483a9199 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Filipe=20La=C3=ADns?= +Date: Fri, 7 Jun 2019 15:21:44 +0100 +Subject: [PATCH] makefile: fix install path for pkconfig files (#273) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +3742eda70ca3e045b6f513a57082d3487c97abe1 introduced a wrong behavior +where the install commands for pkgconfig files were blindly ignoring +$(prefix). This obviously breaks the build and introduces the +possibility of the pkgconfig files not being installed to the system +at all since $(libdir) is not suposed to have a leading /, that is +$(prefix)'s job. All this resulted in a bad makefile being shipped +in the 3.9.0 release. + +Signed-off-by: Filipe Laíns +--- + GNUmakefile | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/GNUmakefile b/GNUmakefile +index a5919f5ee..0f44b4c15 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -378,33 +378,33 @@ install-shared-peas: $(SONAME_PEASD) install-shared-gtkd + + install-headers-gtkd: gtkd-$(MAJOR).pc + install -d $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR) +- install -d $(DESTDIR)$(libdir)/pkgconfig ++ install -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig + (cd generated/gtkd; echo $(SOURCES_GTKD) | sed -e s,generated/gtkd/,,g | xargs tar cf -) | (cd $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR); tar xvf -) +- install -m 644 gtkd-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig ++ install -m 644 gtkd-$(MAJOR).pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig + + install-headers-gtkdgl: gtkdgl-$(MAJOR).pc install-headers-gtkd + (cd generated/gtkdgl; echo $(SOURCES_GTKDGL) | sed -e s,generated/gtkdgl/,,g | xargs tar cf -) | (cd $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR); tar xvf -) +- install -m 644 gtkdgl-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig ++ install -m 644 gtkdgl-$(MAJOR).pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig + + install-headers-gtkdsv: gtkdsv-$(MAJOR).pc install-headers-gtkd + (cd generated/sourceview; echo $(SOURCES_GTKDSV) | sed -e s,generated/sourceview/,,g | xargs tar cf -) | (cd $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR); tar xvf -) +- install -m 644 gtkdsv-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig ++ install -m 644 gtkdsv-$(MAJOR).pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig + + install-headers-gstreamer: gstreamerd-$(MAJOR).pc install-headers-gtkd + (cd generated/gstreamer; echo $(SOURCES_GSTREAMERD) | sed -e s,generated/gstreamer/,,g | xargs tar cf -) | (cd $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR); tar xvf -) +- install -m 644 gstreamerd-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig ++ install -m 644 gstreamerd-$(MAJOR).pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig + + install-headers-vte: vted-$(MAJOR).pc install-headers-gtkd + (cd generated/vte; echo $(SOURCES_VTED) | sed -e s,generated/vte/,,g | xargs tar cf -) | (cd $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR); tar xvf -) +- install -m 644 vted-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig ++ install -m 644 vted-$(MAJOR).pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig + + install-headers-peas: peasd-$(MAJOR).pc install-headers-gtkd + (cd generated/peas; echo $(SOURCES_PEASD) | sed -e s,generated/peas/,,g | xargs tar cf -) | (cd $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR); tar xvf -) +- install -m 644 peasd-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig ++ install -m 644 peasd-$(MAJOR).pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig + + uninstall: uninstall-gtkdgl uninstall-gtkdsv uninstall-gstreamer uninstall-vte uninstall-peas + $(foreach dir,$(shell ls generated/gtkd) , rm -rf $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR)/$(dir)) +- rm -f $(DESTDIR)$(libdir)/pkgconfig/gtkd-$(MAJOR).pc ++ rm -f $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/gtkd-$(MAJOR).pc + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(LIBNAME_GTKD) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GTKD) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GTKD).$(SO_VERSION) +@@ -412,7 +412,7 @@ uninstall: uninstall-gtkdgl uninstall-gtkdsv uninstall-gstreamer uninstall-vte u + + uninstall-gtkdgl: + $(foreach dir,$(shell ls generated/gtkdgl), rm -rf $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR)/$(dir)) +- rm -f $(DESTDIR)$(libdir)/pkgconfig/gtkdgl-$(MAJOR).pc ++ rm -f $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/gtkdgl-$(MAJOR).pc + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(LIBNAME_GTKDGL) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GTKDGL) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GTKDGL).$(SO_VERSION) +@@ -420,7 +420,7 @@ uninstall-gtkdgl: + + uninstall-gtkdsv: + $(foreach dir,$(shell ls generated/sourceview), rm -rf $(DESTDIR)$(prefix)/include/d/$(dir)) +- rm -f $(DESTDIR)$(libdir)/pkgconfig/gtkdsv-$(MAJOR).pc ++ rm -f $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/gtkdsv-$(MAJOR).pc + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(LIBNAME_GTKDSV) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GTKDSV) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GTKDSV).$(SO_VERSION) +@@ -428,7 +428,7 @@ uninstall-gtkdsv: + + uninstall-gstreamer: + $(foreach dir,$(shell ls generated/gstreamer), rm -rf $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR)/$(dir)) +- rm -f $(DESTDIR)$(libdir)/pkgconfig/gstreamerd-$(MAJOR).pc ++ rm -f $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/gstreamerd-$(MAJOR).pc + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(LIBNAME_GSTREAMERD) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GSTREAMERD) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_GSTREAMERD).$(SO_VERSION) +@@ -436,7 +436,7 @@ uninstall-gstreamer: + + uninstall-vte: + $(foreach dir,$(shell ls generated/vte), rm -rf $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR)/$(dir)) +- rm -f $(DESTDIR)$(libdir)/pkgconfig/vted-$(MAJOR).pc ++ rm -f $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/vted-$(MAJOR).pc + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(LIBNAME_VTED) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_VTED) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_VTED).$(SO_VERSION) +@@ -444,7 +444,7 @@ uninstall-vte: + + uninstall-peas: + $(foreach dir,$(shell ls generated/peas), rm -rf $(DESTDIR)$(prefix)/include/d/gtkd-$(MAJOR)/$(dir)) +- rm -f $(DESTDIR)$(libdir)/pkgconfig/peasd-$(MAJOR).pc ++ rm -f $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/peasd-$(MAJOR).pc + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(LIBNAME_PEASD) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_PEASD) + rm -f $(DESTDIR)$(prefix)/$(libdir)/$(SONAME_PEASD).$(SO_VERSION) diff --git a/gtkd.spec b/gtkd.spec index 446798c..a31cc7f 100644 --- a/gtkd.spec +++ b/gtkd.spec @@ -4,13 +4,14 @@ %global sover 0 Name: gtkd -Version: 3.8.5 -Release: 7%{?dist} +Version: 3.9.0 +Release: 1%{?dist} Summary: D binding and OO wrapper of GTK+ License: LGPLv3+ with exceptions URL: https://github.com/gtkd-developers/GtkD/ Source0: https://github.com/gtkd-developers/GtkD/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: gtkd-fix-pkgconfig-prefix.patch ExclusiveArch: %{ldc_arches} @@ -67,28 +68,22 @@ Enable autocompletion for gtkd library in geany (IDE) Active l'autocompletion pour pour la bibliothèque gtkd dans geany (IDE) %prep -%setup -q -n GtkD-%{version} +%autosetup -n GtkD-%{version} -p1 # temp geany config directory for allow geany to generate tags mkdir geany_config %build make %{?_smp_mflags} DC=ldc2 libdir=%{?_lib} DCFLAGS="%{_d_optflags}" LDFLAGS="" \ - shared-gstreamer \ shared-gtkdgl \ - shared-libs \ - shared-peas \ - shared-vte + shared-libs # generate geany tags geany -c geany_config -g gtkd.d.tags $(find src* -name "*.d") %install -make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{?_lib} datadir=%{_datadir} \ - install-shared-gstreamer install-headers-gstreamer \ +make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{?_lib} \ install-shared-gtkdgl install-headers-gtkdgl \ - install-shared install-headers \ - install-shared-peas install-headers-peas \ - install-shared-vte install-headers-vte + install-shared install-headers # geany tags mkdir -p %{buildroot}%{_datadir}/geany/tags/ @@ -115,17 +110,20 @@ make %{?_smp_mflags} DC=ldc2 libdir=%{?_lib} DCFLAGS="%{_d_optflags}" LDFLAGS="" %{_libdir}/libgtkdsv-3.so %{_libdir}/libpeasd-3.so %{_libdir}/libvted-3.so -%{_datadir}/pkgconfig/gstreamerd-3.pc -%{_datadir}/pkgconfig/gtkd-3.pc -%{_datadir}/pkgconfig/gtkdgl-3.pc -%{_datadir}/pkgconfig/gtkdsv-3.pc -%{_datadir}/pkgconfig/peasd-3.pc -%{_datadir}/pkgconfig/vted-3.pc +%{_libdir}/pkgconfig/gstreamerd-3.pc +%{_libdir}/pkgconfig/gtkd-3.pc +%{_libdir}/pkgconfig/gtkdgl-3.pc +%{_libdir}/pkgconfig/gtkdsv-3.pc +%{_libdir}/pkgconfig/peasd-3.pc +%{_libdir}/pkgconfig/vted-3.pc %files geany-tags %{_datadir}/geany/tags/gtkd.d.tags %changelog +* Mon Feb 10 2020 Kalev Lember - 3.9.0-1 +- Update to 3.9.0 + * Wed Jan 29 2020 Fedora Release Engineering - 3.8.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index fee482c..e675ea4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gtkd-3.8.5.tar.gz) = b75f8cb46de371a1f0ea344f0471b89667f84581e318daa30333a4646c132fe5431e58b9d31a2cfc789ddfc50d0cf9dc8d8a7e349823392c15a2eae5cecc88d1 +SHA512 (gtkd-3.9.0.tar.gz) = ea83322933958fa62883bc5f9d9c37fca78c369f6567b4fd62bd39d5d41b7caaab186752a836904b70c1dd70370d683bf35ae3e9201cac12410356ad4c020b90