[neon/kde/kajongg/Neon/release] debian: remove useless patch

Harald Sitter null at kde.org
Mon Nov 22 07:10:32 GMT 2021


Git commit c27d65c70be1389915aa606d910edfe9bbc1065f by Harald Sitter.
Committed on 22/11/2021 at 07:10.
Pushed by sitter into branch 'Neon/release'.

remove useless patch

this patch was incorrectly updated causing a result inversion because
the original fix is upstream now. i.e. instead of following destdir at
install time it was following it at configure time again

upstream code looks correct now so drop the patch + adjust
install_bindir to be relative so the upstream code correctly handles it
(arguably there should be handling for when BIN_INSTALL_DIR is absolute
though :|)

BUG: 445858

D  +0    -34   debian/patches/Use-DESTDIR-on-install.patch
M  +0    -1    debian/patches/series
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/kajongg/commit/c27d65c70be1389915aa606d910edfe9bbc1065f

diff --git a/debian/patches/Use-DESTDIR-on-install.patch b/debian/patches/Use-DESTDIR-on-install.patch
deleted file mode 100644
index ffb9b8f..0000000
--- a/debian/patches/Use-DESTDIR-on-install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Mon, 4 Sep 2017 22:46:32 +0200
-Subject: Use DESTDIR on install
-
----
- cmake-modules/KDEPython.cmake | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: kajongg-20.04.0/cmake-modules/KDEPython.cmake
-===================================================================
---- kajongg-20.04.0.orig/cmake-modules/KDEPython.cmake
-+++ kajongg-20.04.0/cmake-modules/KDEPython.cmake
-@@ -106,15 +106,15 @@ MACRO(KDE_ADD_PYTHON_EXECUTABLE _pyname
-     endif(NOT PROJECT_NAME)
- 
-     set(TARGET ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/${PROJECT_NAME}/${_pyname})
--    set(LINK_NAME ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}/${_exename})
-+    set(LINK_NAME ${BIN_INSTALL_DIR}/${_exename})
- 
-     GET_FILENAME_COMPONENT(abs_link_name ${LINK_NAME} ABSOLUTE)
-     GET_FILENAME_COMPONENT(link_path ${LINK_NAME} PATH)
--    GET_FILENAME_COMPONENT(abs_link_path ${link_path} ABSOLUTE)
--    GET_FILENAME_COMPONENT(abs_target ${TARGET} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(abs_link_name ${LINK_NAME} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(link_path ${LINK_NAME} PATH)
- 
--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory \$ENV\{DESTDIR\}${abs_link_path})")
--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} \$ENV\{DESTDIR\}${abs_link_name})")
--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod a+x \$ENV\{DESTDIR\}/${abs_target})")
-+    INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${abs_link_path})")
-+    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} \$ENV{DESTDIR}/${abs_link_name})")
-+    INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod a+x \$ENV{DESTDIR}/${abs_target})")
- 
- ENDMACRO(KDE_ADD_PYTHON_EXECUTABLE)
diff --git a/debian/patches/series b/debian/patches/series
index 1e0ec07..7816d35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 Fix-icons-path.patch
-Use-DESTDIR-on-install.patch
diff --git a/debian/rules b/debian/rules
index dfb5769..bfb83cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DKDE_INSTALL_BINDIR=/usr/games
+	$(overridden_command) -- -DKDE_INSTALL_BINDIR=games
 
 override_dh_python3:
 	$(overridden_command) /usr/share/kajongg


More information about the Neon-commits mailing list