rpms
/
gtkd
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.10.0

Browse Source
epel9
František Zatloukal 2 years ago
parent 0d877ab9d5
commit f12c8f5200
5 changed files with 12 additions and 185 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -21,3 +21,4 @@
/gtkd-3.8.4.tar.gz /gtkd-3.8.4.tar.gz
/gtkd-3.8.5.tar.gz /gtkd-3.8.5.tar.gz
/gtkd-3.9.0.tar.gz /gtkd-3.9.0.tar.gz
/gtkd-3.10.0.tar.gz

62
332.patch
Unescape View File

@ -1,62 +0,0 @@
From c0f938bed6fa7b6a3902cc070f3adb4490afb93c Mon Sep 17 00:00:00 2001
From: Dan Printzell <xwildn00bx@gmail.com>
Date: Sat, 1 May 2021 19:50:30 +0200
Subject: [PATCH] Fix building demos with dmd v2.096.0
Fixes the `import '...' is used as a type` error, that in the demos,
by replacing the problematic imports with selective imports.
Signed-off-by: Dan Printzell <xwildn00bx@gmail.com>
---
demos/gtkD/TestWindow/TestAspectFrame.d | 2 +-
demos/gtkD/TestWindow/TestWindow.d | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/demos/gtkD/TestWindow/TestAspectFrame.d b/demos/gtkD/TestWindow/TestAspectFrame.d
index 6d9f26b94..26b9c5ae8 100644
--- a/demos/gtkD/TestWindow/TestAspectFrame.d
+++ b/demos/gtkD/TestWindow/TestAspectFrame.d
@@ -20,7 +20,7 @@ module TestAspectFrame;
private import gtk.AspectFrame;
-private import TestDrawingArea;
+private import TestDrawingArea : TestDrawingArea;
/**
* This tests the DUI aspect frame
diff --git a/demos/gtkD/TestWindow/TestWindow.d b/demos/gtkD/TestWindow/TestWindow.d
index 52323bb44..dc194bac5 100644
--- a/demos/gtkD/TestWindow/TestWindow.d
+++ b/demos/gtkD/TestWindow/TestWindow.d
@@ -40,18 +40,18 @@ import gtk.ApplicationWindow;
import gtk.Adjustment;
import gtk.AccelGroup;
-import TestEntries;
-
-import TestStock;
-import TestDrawingArea;
-import TestScales;
-import TestText;
-import TestTreeView;
-import TestImage;
-import TestThemes;
-import TestAspectFrame;
-import TestIdle;
-import TTextView;
+import TestEntries : TestEntries;
+
+import TestStock : TestStock;
+import TestDrawingArea : TestDrawingArea;
+import TestScales : TestScales;
+import TestText : TestText;
+import TestTreeView : TestTreeView;
+import TestImage : TestImage;
+import TestThemes : TestThemes;
+import TestAspectFrame : TestAspectFrame;
+import TestIdle : TestIdle;
+import TTextView : TTextView;
import gtk.MenuItem;
import gtk.Widget;

112
gtkd-fix-pkgconfig-prefix.patch
Unescape View File

@ -1,112 +0,0 @@
From a9db09117ab27127ca4c3b8d2f308fae483a9199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <filipe.lains@gmail.com>
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 <lains@archlinux.org>
---
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)

20
gtkd.spec
Unescape View File

@ -4,20 +4,14 @@
%global sover 0 %global sover 0
Name: gtkd Name: gtkd
Version: 3.9.0 Version: 3.10.0
Release: 10%{?dist} Release: 1%{?dist}
Summary: D binding and OO wrapper of GTK+ Summary: D binding and OO wrapper of GTK+
License: LGPLv3+ with exceptions License: LGPLv3+ with exceptions
URL: https://github.com/gtkd-developers/GtkD/ URL: https://github.com/gtkd-developers/GtkD/
Source0: https://github.com/gtkd-developers/GtkD/archive/v%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/gtkd-developers/GtkD/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: gtkd-fix-pkgconfig-prefix.patch
# Fix the build with ldc 1.27
# https://github.com/gtkd-developers/GtkD/pull/332
Patch1: 332.patch
ExclusiveArch: %{ldc_arches} ExclusiveArch: %{ldc_arches}
BuildRequires: ldc BuildRequires: ldc
@ -28,7 +22,7 @@ Requires: gdk-pixbuf2%{?_isa}
Requires: gstreamer1%{?_isa} Requires: gstreamer1%{?_isa}
Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-base%{?_isa}
Requires: gtk3%{?_isa} Requires: gtk3%{?_isa}
Requires: gtksourceview3%{?_isa} Requires: gtksourceview4%{?_isa}
Requires: libcurl%{?_isa} Requires: libcurl%{?_isa}
Requires: libpeas%{?_isa} Requires: libpeas%{?_isa}
Requires: libpeas-gtk%{?_isa} Requires: libpeas-gtk%{?_isa}
@ -64,7 +58,7 @@ Summary: Support for enable autocompletion in geany
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
BuildRequires: geany BuildRequires: geany
BuildRequires: make BuildRequires: make
Requires: geany Requires: geany
%description geany-tags %description geany-tags
@ -76,6 +70,9 @@ Active l'autocompletion pour pour la bibliothèque gtkd dans geany (IDE)
%prep %prep
%autosetup -n GtkD-%{version} -p1 %autosetup -n GtkD-%{version} -p1
# Fedora's pkgconfig for gtksourceview is 4, not 4.0
sed -i 's/gtksourceview-4.0/gtksourceview-4/g' GNUmakefile
# temp geany config directory for allow geany to generate tags # temp geany config directory for allow geany to generate tags
mkdir geany_config mkdir geany_config
@ -127,6 +124,9 @@ make %{?_smp_mflags} DC=ldc2 libdir=%{?_lib} DCFLAGS="%{_d_optflags}" LDFLAGS=""
%{_datadir}/geany/tags/gtkd.d.tags %{_datadir}/geany/tags/gtkd.d.tags
%changelog %changelog
* Sat Nov 19 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 3.10.0-1
- Update to 3.10.0
* Wed Jul 27 2022 Kalev Lember <klember@redhat.com> - 3.9.0-10 * Wed Jul 27 2022 Kalev Lember <klember@redhat.com> - 3.9.0-10
- Rebuilt for ldc 1.30 - Rebuilt for ldc 1.30

2
sources
Unescape View File

@ -1 +1 @@
SHA512 (gtkd-3.9.0.tar.gz) = ea83322933958fa62883bc5f9d9c37fca78c369f6567b4fd62bd39d5d41b7caaab186752a836904b70c1dd70370d683bf35ae3e9201cac12410356ad4c020b90 SHA512 (gtkd-3.10.0.tar.gz) = 1e75d6cbd278a065ce26b33320fe06cc7a30af8bd884c3c87abe799afaf9da8339d3c4470163b62ec8b70e8c540285b8c2c409c7b77423142a301f23ba37ff2e

Write Preview
Loading…
Cancel
Save