Backport an upstream patch to fix the build with ldc 1.27

epel9
Kalev Lember 3 years ago
parent c96620af5b
commit b8cc9fd87e

@ -0,0 +1,62 @@
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;

@ -5,14 +5,19 @@
Name: gtkd
Version: 3.9.0
Release: 6%{?dist}
Release: 7%{?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
# Fix the build with ldc 1.27
# https://github.com/gtkd-developers/GtkD/pull/332
Patch1: 332.patch
ExclusiveArch: %{ldc_arches}
BuildRequires: ldc
@ -122,6 +127,9 @@ make %{?_smp_mflags} DC=ldc2 libdir=%{?_lib} DCFLAGS="%{_d_optflags}" LDFLAGS=""
%{_datadir}/geany/tags/gtkd.d.tags
%changelog
* Tue Aug 17 2021 Kalev Lember <klember@redhat.com> - 3.9.0-7
- Backport an upstream patch to fix the build with ldc 1.27
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Loading…
Cancel
Save