Source: ares
Version: 132-1
Followup-For: Bug #866070
Control: tags -1 patch
I've updated the patch for ares.
Helmut
diff --minimal -Nru ares-132/debian/changelog ares-132/debian/changelog
--- ares-132/debian/changelog 2023-07-22 17:16:04.000000000 +0200
+++ ares-132/debian/changelog 2023-08-27 20:04:03.000000000 +0200
@@ -1,3 +1,13 @@
+ares (132-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Pass the compiler via the non-standard $(compiler) variable.
+ + cross.patch: Honour PKG_CONFIG.
+ + cross.patch: Don't relink during install.
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 27 Aug 2023 20:04:03 +0200
+
ares (132-1) unstable; urgency=medium
[ Debian Janitor ]
diff --minimal -Nru ares-132/debian/patches/cross.patch
ares-132/debian/patches/cross.patch
--- ares-132/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ ares-132/debian/patches/cross.patch 2023-08-27 20:04:03.000000000 +0200
@@ -0,0 +1,127 @@
+--- ares-132.orig/hiro/GNUmakefile
++++ ares-132/hiro/GNUmakefile
+@@ -1,3 +1,5 @@
++PKG_CONFIG ?= pkg-config
++
+ ifeq ($(platform),windows)
+ ifeq ($(hiro),)
+ hiro := windows
+@@ -9,13 +11,13 @@
+ endif
+
+ ifeq ($(hiro),gtk2)
+- hiro.flags = $(flags.cpp) -DHIRO_GTK=2 $(shell pkg-config --cflags
gtk+-2.0) -Wno-deprecated-declarations
+- hiro.options = $(shell pkg-config --libs gtk+-2.0)
++ hiro.flags = $(flags.cpp) -DHIRO_GTK=2 $(shell $(PKG_CONFIG) --cflags
gtk+-2.0) -Wno-deprecated-declarations
++ hiro.options = $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+ endif
+
+ ifeq ($(hiro),gtk3)
+- hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell pkg-config --cflags
gtk+-3.0) -Wno-deprecated-declarations
+- hiro.options = $(shell pkg-config --libs gtk+-3.0)
++ hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell $(PKG_CONFIG) --cflags
gtk+-3.0) -Wno-deprecated-declarations
++ hiro.options = $(shell $(PKG_CONFIG) --libs gtk+-3.0)
+ endif
+ endif
+
+@@ -36,37 +38,37 @@
+ endif
+
+ ifeq ($(hiro),gtk2)
+- hiro.flags = $(flags.cpp) -DHIRO_GTK=2 $(shell pkg-config --cflags
gtk+-2.0) -Wno-deprecated-declarations
+- hiro.options = -L/usr/local/lib -lX11 $(shell pkg-config --libs gtk+-2.0)
++ hiro.flags = $(flags.cpp) -DHIRO_GTK=2 $(shell $(PKG_CONFIG) --cflags
gtk+-2.0) -Wno-deprecated-declarations
++ hiro.options = -L/usr/local/lib -lX11 $(shell $(PKG_CONFIG) --libs
gtk+-2.0)
+ endif
+
+ ifeq ($(hiro),gtk2-se)
+ flags += -DHiro_SourceEdit
+- hiro.flags = $(flags.cpp) -DHIRO_GTK=2 $(shell pkg-config --cflags
gtk+-2.0 gtksourceview-2.0) -Wno-deprecated-declarations
+- hiro.options = -L/usr/local/lib -lX11 $(shell pkg-config --libs gtk+-2.0
gtksourceview-2.0)
++ hiro.flags = $(flags.cpp) -DHIRO_GTK=2 $(shell $(PKG_CONFIG) --cflags
gtk+-2.0 gtksourceview-2.0) -Wno-deprecated-declarations
++ hiro.options = -L/usr/local/lib -lX11 $(shell $(PKG_CONFIG) --libs
gtk+-2.0 gtksourceview-2.0)
+ endif
+
+ ifeq ($(hiro),gtk3)
+- hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell pkg-config --cflags
gtk+-3.0) -Wno-deprecated-declarations
+- hiro.options = -L/usr/local/lib -lX11 $(shell pkg-config --libs gtk+-3.0)
++ hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell $(PKG_CONFIG) --cflags
gtk+-3.0) -Wno-deprecated-declarations
++ hiro.options = -L/usr/local/lib -lX11 $(shell $(PKG_CONFIG) --libs
gtk+-3.0)
+ endif
+
+ ifeq ($(hiro),gtk3-se)
+ flags += -DHiro_SourceEdit
+- hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell pkg-config --cflags
gtk+-3.0 gtksourceview-3.0) -Wno-deprecated-declarations
+- hiro.options = -L/usr/local/lib -lX11 $(shell pkg-config --libs gtk+-3.0
gtksourceview-3.0)
++ hiro.flags = $(flags.cpp) -DHIRO_GTK=3 $(shell $(PKG_CONFIG) --cflags
gtk+-3.0 gtksourceview-3.0) -Wno-deprecated-declarations
++ hiro.options = -L/usr/local/lib -lX11 $(shell $(PKG_CONFIG) --libs
gtk+-3.0 gtksourceview-3.0)
+ endif
+
+ ifeq ($(hiro),qt4)
+ moc = /usr/local/lib/qt4/bin/moc
+- hiro.flags = $(flags.cpp) -DHIRO_QT=4 $(shell pkg-config --cflags
QtCore QtGui)
+- hiro.options = -L/usr/local/lib -lX11 $(shell pkg-config --libs QtCore
QtGui)
++ hiro.flags = $(flags.cpp) -DHIRO_QT=4 $(shell $(PKG_CONFIG) --cflags
QtCore QtGui)
++ hiro.options = -L/usr/local/lib -lX11 $(shell $(PKG_CONFIG) --libs QtCore
QtGui)
+ endif
+
+ ifeq ($(hiro),qt5)
+- moc = $(shell pkg-config --variable=host_bins Qt5Core)/moc
+- hiro.flags = $(flags.cpp) -DHIRO_QT=5 -fPIC $(shell pkg-config --cflags
Qt5Core Qt5Gui Qt5Widgets)
+- hiro.options = -L/usr/local/lib -lX11 $(shell pkg-config --libs Qt5Core
Qt5Gui Qt5Widgets)
++ moc = $(shell $(PKG_CONFIG) --variable=host_bins Qt5Core)/moc
++ hiro.flags = $(flags.cpp) -DHIRO_QT=5 -fPIC $(shell $(PKG_CONFIG)
--cflags Qt5Core Qt5Gui Qt5Widgets)
++ hiro.options = -L/usr/local/lib -lX11 $(shell $(PKG_CONFIG) --libs
Qt5Core Qt5Gui Qt5Widgets)
+ endif
+ endif
+
+--- ares-132.orig/ruby/GNUmakefile
++++ ares-132/ruby/GNUmakefile
+@@ -1,3 +1,5 @@
++PKG_CONFIG ?= pkg-config
++
+ ifeq ($(ruby),)
+ ifeq ($(platform),windows)
+ ruby += video.direct3d9 video.gdi
+@@ -11,7 +13,7 @@
+ ruby += audio.openal
+ ruby += input.quartz #input.carbon
+ else ifeq ($(platform),linux)
+- pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
++ pkg_check = $(if $(shell $(PKG_CONFIG) $1 && echo 1),$2)
+ ruby += video.glx video.glx2 video.xshm
+ ruby += $(call pkg_check,xv,video.xvideo)
+ ruby += audio.oss audio.alsa
+@@ -23,7 +25,7 @@
+ ruby += $(call pkg_check,libudev,input.udev)
+ ruby += $(call pkg_check,sdl2,input.sdl)
+ else ifeq ($(platform),bsd)
+- pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
++ pkg_check = $(if $(shell $(PKG_CONFIG) $1 && echo 1),$2)
+ ruby += video.glx video.glx2 video.xshm
+ ruby += $(call pkg_check,xv,video.xvideo)
+ ruby += audio.oss
+--- ares-132.orig/desktop-ui/GNUmakefile
++++ ares-132/desktop-ui/GNUmakefile
+@@ -73,9 +73,7 @@
+
+ $(all.objects): | $(object.path)
+
+-all: $(all.objects) | $(output.path)
+- $(info Linking $(output.path)/$(name)$(extension) ...)
+- +@$(compiler) -o $(output.path)/$(name)$(extension) $(all.objects)
$(all.options)
++all: $(output.path)/$(name)$(extension)
+ $(call copy,../LICENSE,$(output.path)/LICENSE.txt)
+ ifeq ($(platform),macos)
+ # Apply workaround for buggy linker in Xcode < 11.4.1
+@@ -103,6 +101,10 @@
+ $(call rcopy,$(mia.path)/Database/*,$(output.path)/Database/)
+ endif
+
++$(output.path)/$(name)$(extension): $(all.objects) | $(output.path)
++ $(info Linking $@ ...)
++ +@$(compiler) -o $@ $(all.objects) $(all.options)
++
+ verbose: nall.verbose ruby.verbose hiro.verbose all;
+
+ clean:
diff --minimal -Nru ares-132/debian/patches/series
ares-132/debian/patches/series
--- ares-132/debian/patches/series 2023-07-22 17:16:04.000000000 +0200
+++ ares-132/debian/patches/series 2023-08-27 20:01:00.000000000 +0200
@@ -7,3 +7,4 @@
menu-color.patch
no-optional-extensions.patch
ftbfs-gcc-13.patch
+cross.patch
diff --minimal -Nru ares-132/debian/rules ares-132/debian/rules
--- ares-132/debian/rules 2023-07-22 17:16:04.000000000 +0200
+++ ares-132/debian/rules 2023-08-27 20:03:57.000000000 +0200
@@ -16,7 +16,7 @@
dh $@ --sourcedirectory=desktop-ui
override_dh_auto_build:
- dh_auto_build -- $(BUILDOPT)
+ dh_auto_build -- $(BUILDOPT) compiler='$$(CXX)'
override_dh_auto_install:
dh_auto_install -- prefix=../debian/tmp/usr
