diff -pruN 1.02+ds-1/debian/changelog 1.02+ds-2/debian/changelog --- 1.02+ds-1/debian/changelog 2025-02-12 12:23:03.000000000 +0000 +++ 1.02+ds-2/debian/changelog 2025-11-07 01:28:00.000000000 +0000 @@ -1,3 +1,12 @@ +boulder-game (1.02+ds-2) unstable; urgency=medium + + * Add patch to use PKG_CONFIG variable in build and + add patch to use CXX and not CC for g++ (Closes: #1119124) + * Convert watch file to version 5 + * Upgrade Standards Version to 4.7.2 (No changes required) + + -- Andreas Rönnquist Fri, 07 Nov 2025 02:28:00 +0100 + boulder-game (1.02+ds-1) unstable; urgency=medium * New upstream version 1.02+ds diff -pruN 1.02+ds-1/debian/control 1.02+ds-2/debian/control --- 1.02+ds-1/debian/control 2025-02-12 12:22:44.000000000 +0000 +++ 1.02+ds-2/debian/control 2025-11-07 01:28:00.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Andreas Rönnquist +Date: Fri, 31 Oct 2025 15:02:50 +0100 +Subject: Add PKG_CONFIG variable + +--- + build/linux/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/linux/Makefile b/build/linux/Makefile +index 423df9f..1dbd306 100755 +--- a/build/linux/Makefile ++++ b/build/linux/Makefile +@@ -16,6 +16,7 @@ TARGET_ARCH = $(shell uname -m) + #setup + + CC = g++ ++PKG_CONFIG ?= pkg-config + COMPILERFLAGS = -Wall + + ifeq ($(TARGET_OS),Linux) diff -pruN 1.02+ds-1/debian/patches/Use-CXX-and-not-CC-for-g.patch 1.02+ds-2/debian/patches/Use-CXX-and-not-CC-for-g.patch --- 1.02+ds-1/debian/patches/Use-CXX-and-not-CC-for-g.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.02+ds-2/debian/patches/Use-CXX-and-not-CC-for-g.patch 2025-10-31 15:50:53.000000000 +0000 @@ -0,0 +1,69 @@ +From: =?utf-8?q?Andreas_R=C3=B6nnquist?= +Date: Fri, 31 Oct 2025 16:50:49 +0100 +Subject: Use CXX and not CC for g++ + +--- + build/linux/Makefile | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/build/linux/Makefile b/build/linux/Makefile +index 21c406d..fc8d4a1 100755 +--- a/build/linux/Makefile ++++ b/build/linux/Makefile +@@ -15,7 +15,7 @@ TARGET_ARCH = $(shell uname -m) + ######### + #setup + +-CC = g++ ++CXX = g++ + PKG_CONFIG ?= pkg-config + COMPILERFLAGS = -Wall + +@@ -60,16 +60,16 @@ FNT_COMP_OBJECTS = ../../other/fnt_comp/fnt_comp.o ../../src/common/fileresource + # fix so that a new or renamed .h file will cause a rebuild + # and finally fix paths in the .d file + %.o: %.cpp +- $(CC) -c $(LOCAL_CPPFLAGS) $(LOCAL_CXXFLAGS) $*.cpp -o $*.o +- $(CC) -MM $(LOCAL_CPPFLAGS) $(LOCAL_CXXFLAGS) $*.cpp > $*.d ++ $(CXX) -c $(LOCAL_CPPFLAGS) $(LOCAL_CXXFLAGS) $*.cpp -o $*.o ++ $(CXX) -MM $(LOCAL_CPPFLAGS) $(LOCAL_CXXFLAGS) $*.cpp > $*.d + @mv -f $*.d $*.d.tmp + @sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d + @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d + @rm -f $*.d.tmp + + %.o: %.c +- $(CC) -c $(LOCAL_CPPFLAGS) $(LOCAL_CFLAGS) $*.c -o $*.o +- $(CC) -MM $(LOCAL_CPPFLAGS) $(LOCAL_CFLAGS) $*.c > $*.d ++ $(CXX) -c $(LOCAL_CPPFLAGS) $(LOCAL_CFLAGS) $*.c -o $*.o ++ $(CXX) -MM $(LOCAL_CPPFLAGS) $(LOCAL_CFLAGS) $*.c > $*.d + @mv -f $*.d $*.d.tmp + @sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d + @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d +@@ -105,21 +105,21 @@ install: + #private + + boulder: $(BOULDER_OBJECTS) +- $(CC) -o ./boulder $(BOULDER_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX) ++ $(CXX) -o ./boulder $(BOULDER_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX) + -include $(BOULDER_OBJECTS:.o=.d) + + mapeditor: $(EDITOR_OBJECTS) +- $(CC) -o ./mapeditor $(EDITOR_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX) ++ $(CXX) -o ./mapeditor $(EDITOR_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX) + -include $(EDITOR_OBJECTS:.o=.d) + + ../../utils/res_comp/res_comp: $(RES_COMP_OBJECTS) +- $(CC) -o ../../utils/res_comp/res_comp $(RES_COMP_OBJECTS) $(LDFLAGS_PLAIN) ++ $(CXX) -o ../../utils/res_comp/res_comp $(RES_COMP_OBJECTS) $(LDFLAGS_PLAIN) + -include $(RES_COMP_OBJECTS:.o=.d) + + ../../utils/img_cut/img_cut: $(IMG_CUT_OBJECTS) +- $(CC) -o ../../utils/img_cut/img_cut $(IMG_CUT_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX) ++ $(CXX) -o ../../utils/img_cut/img_cut $(IMG_CUT_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX) + -include $(IMG_CUT_OBJECTS:.o=.d) + + ../../utils/fnt_comp/fnt_comp: $(FNT_COMP_OBJECTS) +- $(CC) -o ../../utils/fnt_comp/fnt_comp $(FNT_COMP_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX_GL) ++ $(CXX) -o ../../utils/fnt_comp/fnt_comp $(FNT_COMP_OBJECTS) $(LDFLAGS_PLAIN) $(LDFLAGS_GFX_GL) + -include $(FNT_COMP_OBJECTS:.o=.d) diff -pruN 1.02+ds-1/debian/patches/build_with_system_SDL.patch 1.02+ds-2/debian/patches/build_with_system_SDL.patch --- 1.02+ds-1/debian/patches/build_with_system_SDL.patch 2025-02-12 11:59:07.000000000 +0000 +++ 1.02+ds-2/debian/patches/build_with_system_SDL.patch 2025-10-31 15:50:53.000000000 +0000 @@ -7,12 +7,12 @@ Subject: Build with system packaged SDL 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/build/linux/Makefile b/build/linux/Makefile -index 423df9f..b11f3bb 100755 +index 1dbd306..94a42bf 100755 --- a/build/linux/Makefile +++ b/build/linux/Makefile -@@ -17,29 +17,19 @@ TARGET_ARCH = $(shell uname -m) - +@@ -18,29 +18,19 @@ TARGET_ARCH = $(shell uname -m) CC = g++ + PKG_CONFIG ?= pkg-config COMPILERFLAGS = -Wall - -ifeq ($(TARGET_OS),Linux) @@ -41,12 +41,12 @@ index 423df9f..b11f3bb 100755 +ifeq ($(TARGET_OS),Linux) + LDFLAGS_PLAIN = -lpthread + EXE_PATH = ../../exe/linux_x64/ -+ LDFLAGS_GFX += `pkg-config --libs sdl2` '-Wl,-R,$$ORIGIN/.' ++ LDFLAGS_GFX += `$(PKG_CONFIG) --libs sdl2` '-Wl,-R,$$ORIGIN/.' + + LDFLAGS_GFX_GL = -lGL -L/usr/X11R6/lib -lX11 -+ LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` ++ LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` + LOCAL_CPPFLAGS = $(CPPFLAGS) -+ LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` ++ LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` +endif + +######### diff -pruN 1.02+ds-1/debian/patches/build_with_system_stb.patch 1.02+ds-2/debian/patches/build_with_system_stb.patch --- 1.02+ds-1/debian/patches/build_with_system_stb.patch 2025-02-12 11:59:07.000000000 +0000 +++ 1.02+ds-2/debian/patches/build_with_system_stb.patch 2025-10-31 15:50:53.000000000 +0000 @@ -8,18 +8,18 @@ Subject: Use system stb_vorbis 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/linux/Makefile b/build/linux/Makefile -index b11f3bb..5a42806 100755 +index 94a42bf..598538e 100755 --- a/build/linux/Makefile +++ b/build/linux/Makefile -@@ -24,9 +24,9 @@ ifeq ($(TARGET_OS),Linux) - LDFLAGS_GFX += `pkg-config --libs sdl2` '-Wl,-R,$$ORIGIN/.' +@@ -25,9 +25,9 @@ ifeq ($(TARGET_OS),Linux) + LDFLAGS_GFX += `$(PKG_CONFIG) --libs sdl2` '-Wl,-R,$$ORIGIN/.' LDFLAGS_GFX_GL = -lGL -L/usr/X11R6/lib -lX11 -- LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` -+ LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` `pkg-config --cflags stb` +- LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` ++ LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` `$(PKG_CONFIG) --cflags stb` LOCAL_CPPFLAGS = $(CPPFLAGS) -- LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` -+ LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` `pkg-config --cflags stb` +- LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` ++ LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` `$(PKG_CONFIG) --cflags stb` endif ######### diff -pruN 1.02+ds-1/debian/patches/fix_bindnow_flags.patch 1.02+ds-2/debian/patches/fix_bindnow_flags.patch --- 1.02+ds-1/debian/patches/fix_bindnow_flags.patch 2025-02-12 11:59:07.000000000 +0000 +++ 1.02+ds-2/debian/patches/fix_bindnow_flags.patch 2025-10-31 15:50:53.000000000 +0000 @@ -3,23 +3,19 @@ Date: Fri, 22 Nov 2024 18:37:29 +0100 Subject: Include LDFLAGS from system in build --- - build/linux/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + build/linux/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/linux/Makefile b/build/linux/Makefile -index 5a42806..73babc9 100755 +index 598538e..21c406d 100755 --- a/build/linux/Makefile +++ b/build/linux/Makefile -@@ -16,10 +16,10 @@ TARGET_ARCH = $(shell uname -m) - #setup - - CC = g++ --COMPILERFLAGS = -Wall -+COMPILERFLAGS = -Wall +@@ -20,7 +20,7 @@ PKG_CONFIG ?= pkg-config + COMPILERFLAGS = -Wall ifeq ($(TARGET_OS),Linux) - LDFLAGS_PLAIN = -lpthread + LDFLAGS_PLAIN = -lpthread $(LDFLAGS) EXE_PATH = ../../exe/linux_x64/ - LDFLAGS_GFX += `pkg-config --libs sdl2` '-Wl,-R,$$ORIGIN/.' + LDFLAGS_GFX += `$(PKG_CONFIG) --libs sdl2` '-Wl,-R,$$ORIGIN/.' diff -pruN 1.02+ds-1/debian/patches/series 1.02+ds-2/debian/patches/series --- 1.02+ds-1/debian/patches/series 2025-02-12 11:59:07.000000000 +0000 +++ 1.02+ds-2/debian/patches/series 2025-10-31 15:50:53.000000000 +0000 @@ -1,5 +1,7 @@ dont_copy_SDL_library.patch +Add-PKG_CONFIG-variable.patch build_with_system_SDL.patch build_with_system_stb.patch load_data_from_system.patch fix_bindnow_flags.patch +Use-CXX-and-not-CC-for-g.patch diff -pruN 1.02+ds-1/debian/watch 1.02+ds-2/debian/watch --- 1.02+ds-1/debian/watch 2025-02-12 12:11:32.000000000 +0000 +++ 1.02+ds-2/debian/watch 2025-11-07 01:28:00.000000000 +0000 @@ -1,10 +1,6 @@ -version=4 -opts="\ - searchmode=plain, \ - repack, \ - repacksuffix=+ds, \ - dversionmangle=auto, \ - filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%boulder-$1.tar.gz%,\ - " \ -https://api.github.com/repos/rh-galaxy/boulder/releases \ -https://github.com/rh-galaxy/boulder/releases/download\/v?[\d.]+\/boulder_@ANY_VERSION@_src_plain.tar.gz +Version: 5 +Template: Github +Owner: rh-galaxy +Project: boulder +Dversion-Mangle: auto +