Bug#967779: tome: depends on deprecated GTK 2

2023-11-08 Thread Bastian Germann

I am uploading a NMU to DELAYED/10 in order to fix this.diff -Nru tome-2.41-ah~0.git.20200131/CMakeLists.txt 
tome-2.41-ah~0.git.20200131/CMakeLists.txt
--- tome-2.41-ah~0.git.20200131/CMakeLists.txt  2023-11-08 21:43:48.0 
+0100
+++ tome-2.41-ah~0.git.20200131/CMakeLists.txt  2020-02-02 13:00:22.0 
+0100
@@ -28,7 +28,7 @@
 #
 SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
 SET(CMAKE_C_FLAGS_RELEASE   "-O2")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${SANITIZER_FLAGS}")
 
 #
 # C++ Compiler Flags
@@ -36,7 +36,7 @@
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS}")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSONCONS_NO_DEPRECATED")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
-SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g -D_GLIBCXX_DEBUG 
-D_GLIBCXX_DEBUG_PEDANTIC")
+SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g ${SANITIZER_FLAGS} -D_GLIBCXX_DEBUG 
-D_GLIBCXX_DEBUG_PEDANTIC")
 
 #
 # GCC Flags
@@ -100,7 +100,7 @@
 # Set the path for loading the library bits.
 #
 IF(SYSTEM_INSTALL)
-  SET(DEFAULT_PATH "/var/games/tome")
+  SET(DEFAULT_PATH "${CMAKE_INSTALL_PREFIX}/lib/tome")
 ELSE()
   SET(DEFAULT_PATH "./lib")
 ENDIF()
diff -Nru tome-2.41-ah~0.git.20200131/debian/changelog 
tome-2.41-ah~0.git.20200131/debian/changelog
--- tome-2.41-ah~0.git.20200131/debian/changelog2023-11-08 
21:43:48.0 +0100
+++ tome-2.41-ah~0.git.20200131/debian/changelog2023-11-08 
21:30:58.0 +0100
@@ -1,3 +1,11 @@
+tome (2.41-ah~0.git.20200131-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop GTK 2 binary (Closes: #967779).
+  * Convert to source format 3.0 (Closes: #1055609).
+
+ -- Bastian Germann   Wed, 08 Nov 2023 21:30:58 +0100
+
 tome (2.41-ah~0.git.20200131-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru tome-2.41-ah~0.git.20200131/debian/control 
tome-2.41-ah~0.git.20200131/debian/control
--- tome-2.41-ah~0.git.20200131/debian/control  2023-11-08 21:43:48.0 
+0100
+++ tome-2.41-ah~0.git.20200131/debian/control  2023-11-08 21:30:43.0 
+0100
@@ -7,7 +7,7 @@
 Homepage: https://github.com/tome2/tome2
 Build-Depends: debhelper-compat (= 12), libjansson-dev, cmake,
  libncurses5-dev | libncurses-dev | ncurses-dev, libboost-all-dev,
- libx11-dev, libgtk2.0-dev, dpkg-dev (>= 1.16.0)
+ libx11-dev, dpkg-dev (>= 1.16.0)
 XS-Autobuild: yes
 Standards-Version: 4.3.0
 
diff -Nru tome-2.41-ah~0.git.20200131/debian/patches/debian.patch 
tome-2.41-ah~0.git.20200131/debian/patches/debian.patch
--- tome-2.41-ah~0.git.20200131/debian/patches/debian.patch 1970-01-01 
01:00:00.0 +0100
+++ tome-2.41-ah~0.git.20200131/debian/patches/debian.patch 2023-11-08 
21:30:58.0 +0100
@@ -0,0 +1,126 @@
+--- tome-2.41-ah~0.git.20200131.orig/CMakeLists.txt
 tome-2.41-ah~0.git.20200131/CMakeLists.txt
+@@ -28,7 +28,7 @@ SET(SANITIZER_FLAGS "-fsanitize=undefine
+ #
+ SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
+ SET(CMAKE_C_FLAGS_RELEASE   "-O2")
+-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${SANITIZER_FLAGS}")
++SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+ 
+ #
+ # C++ Compiler Flags
+@@ -36,7 +36,7 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${SA
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS}")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSONCONS_NO_DEPRECATED")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+-SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g ${SANITIZER_FLAGS} -D_GLIBCXX_DEBUG 
-D_GLIBCXX_DEBUG_PEDANTIC")
++SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g -D_GLIBCXX_DEBUG 
-D_GLIBCXX_DEBUG_PEDANTIC")
+ 
+ #
+ # GCC Flags
+@@ -100,7 +100,7 @@ endif(WIN32)
+ # Set the path for loading the library bits.
+ #
+ IF(SYSTEM_INSTALL)
+-  SET(DEFAULT_PATH "${CMAKE_INSTALL_PREFIX}/lib/tome")
++  SET(DEFAULT_PATH "/var/games/tome")
+ ELSE()
+   SET(DEFAULT_PATH "./lib")
+ ENDIF()
+--- tome-2.41-ah~0.git.20200131.orig/src/CMakeLists.txt
 tome-2.41-ah~0.git.20200131/src/CMakeLists.txt
+@@ -166,21 +166,21 @@ IF(X11_FOUND)
+   INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+   ADD_EXECUTABLE(tome-x11 main-x11.cc)
+   TARGET_LINK_LIBRARIES(tome-x11 game_main game squelch ${LIBS} 
${X11_LIBRARIES})
+-  INSTALL(TARGETS tome-x11 RUNTIME DESTINATION bin)
++  INSTALL(TARGETS tome-x11 RUNTIME DESTINATION games)
+ ENDIF()
+ 
+ IF(CURSES_FOUND)
+   INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
+   ADD_EXECUTABLE(tome-gcu main-gcu.cc)
+   TARGET_LINK_LIBRARIES(tome-gcu game_main game squelch ${LIBS} 
${CURSES_LIBRARIES})
+-  INSTALL(TARGETS tome-gcu RUNTIME DESTINATION bin)
++  INSTALL(TARGETS tome-gcu RUNTIME DESTINATION games)
+ ENDIF()
+ 
+ IF(GTK2_FOUND)
+   INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
+   ADD_EXECUTABLE(tome-gtk2 main-gtk2.cc)
+   TARGET_LINK_LIBRARIES(tome-gtk2 game_main game squelch ${LIBS} 
${GTK2_LIBRARIES})
+-  INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION bin)
++  INSTALL(TARGETS tome-gtk2 RUNTIME DESTINATION games)
+ ENDIF()
+ 
+ # test harness e

Bug#967779: tome: depends on deprecated GTK 2

2023-10-23 Thread Bastian Germann

The build dependency can just be dropped, which results in the gtk frontend not 
being built.