[SCM] gammaray packaging branch, master, updated. debian/1.3.0-1-30-g8272acb
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Sat Jan 18 23:09:15 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=9eebcf5
The following commit has been merged in the master branch:
commit 9eebcf56ddcb6252f0a9a6c3b1be79a7786d30eb
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Dec 21 09:33:19 2013 +0100
Refreshed patches
---
debian/changelog | 8 ++-
...find-widget-export-actions-when-attaching.patch | 26 ----------
.../patches/gammaray-probe-versioned-soname.patch | 59 ----------------------
debian/patches/harfbuzz-search-path.patch | 23 ---------
debian/patches/series | 4 --
debian/patches/use-empty-rpath.patch | 41 +++++++--------
.../patches/widget-export-actions-location.patch | 51 -------------------
7 files changed, 25 insertions(+), 187 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5e63d33..eafa2c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
gammaray (1.9.95-1) UNRELEASED; urgency=low
* New upstream release.
- * Refreshed d/patches/widget-export-actions-location.patch and
- d/patches/gammaray-probe-versioned-soname.patch.
+ * Refreshed d/patches/use-empty-rpath.patch.
+ * Removed no longer needed patches:
+ - widget-export-actions-location.patch
+ - harfbuzz-search-path.patch
+ - find-widget-export-actions-when-attaching.patch
+ - gammaray-probe-versioned-soname.patch.
* Use xz for orig tarball compression.
-- Jakub Adam <jakub.adam at ktknet.cz> Sat, 21 Dec 2013 09:25:42 +0100
diff --git a/debian/patches/find-widget-export-actions-when-attaching.patch b/debian/patches/find-widget-export-actions-when-attaching.patch
deleted file mode 100644
index b083117..0000000
--- a/debian/patches/find-widget-export-actions-when-attaching.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 8 Jul 2012 15:36:59 +0200
-Subject: find-widget-export-actions-when-attaching
-
-The library search path is hand over to the forked process by setting
-GAMMARAY_PROBE_PATH environment variable. This doesn't work when Gammaray
-attaches to a running Qt application. As we know the exact location on
-a Debian system, we don't have to rely on env variables and use
-hardcoded GAMMARAY_LIB_INSTALL_DIR instead, which works in all cases.
----
- core/tools/widgetinspector/widgetinspector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/tools/widgetinspector/widgetinspector.cpp b/core/tools/widgetinspector/widgetinspector.cpp
-index 1fafc92..234933c 100644
---- a/core/tools/widgetinspector/widgetinspector.cpp
-+++ b/core/tools/widgetinspector/widgetinspector.cpp
-@@ -246,7 +246,7 @@ void WidgetInspector::callExternalExportAction(const char *name,
- {
- if (!m_externalExportActions.isLoaded()) {
- const QString probePath =
-- QString::fromLocal8Bit(qgetenv("GAMMARAY_PROBE_PATH") + "/gammaray");
-+ QString::fromLocal8Bit(GAMMARAY_LIB_INSTALL_DIR "/gammaray");
-
- m_externalExportActions.setFileName(
- probePath + QLatin1String("/libgammaray_widget_export_actions"));
diff --git a/debian/patches/gammaray-probe-versioned-soname.patch b/debian/patches/gammaray-probe-versioned-soname.patch
deleted file mode 100644
index 948aba6..0000000
--- a/debian/patches/gammaray-probe-versioned-soname.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 8 Jul 2012 17:36:36 +0200
-Subject: gammaray-probe-versioned-soname
-
----
- CMakeLists.txt | 1 +
- config-gammaray.h.cmake | 1 +
- core/CMakeLists.txt | 2 +-
- launcher/probefinder.cpp | 2 +-
- 4 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ce0cee..b3b6684 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,6 +28,7 @@ set(GAMMARAY_VERSION_MINOR "3")
- set(GAMMARAY_VERSION_PATCH "1")
- set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMMARAY_VERSION_PATCH}")
- set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
-+set(GAMMARAY_PROBE_SOVERSION "${GAMMARAY_VERSION_STRING}")
-
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-diff --git a/config-gammaray.h.cmake b/config-gammaray.h.cmake
-index 11c8cc3..b79c05d 100644
---- a/config-gammaray.h.cmake
-+++ b/config-gammaray.h.cmake
-@@ -1,5 +1,6 @@
- #define GAMMARAY_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}"
- #define GAMMARAY_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}"
-+#define GAMMARAY_PROBE_SOVERSION "${GAMMARAY_PROBE_SOVERSION}"
- // for finding the probe during automatic tests
- #define GAMMARAY_BUILD_DIR "${CMAKE_BINARY_DIR}"
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 3831d1a..5f4ec80 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -194,6 +194,6 @@ endif()
- if(NOT WIN32)
- target_link_libraries(gammaray_probe dl)
- endif()
--set_target_properties(gammaray_probe PROPERTIES PREFIX "")
-+set_target_properties(gammaray_probe PROPERTIES SOVERSION ${GAMMARAY_PROBE_SOVERSION})
-
- install(TARGETS gammaray_probe ${INSTALL_TARGETS_DEFAULT_ARGS})
-diff --git a/launcher/probefinder.cpp b/launcher/probefinder.cpp
-index 7590e47..a6a8b44 100644
---- a/launcher/probefinder.cpp
-+++ b/launcher/probefinder.cpp
-@@ -50,7 +50,7 @@ QString findProbe(const QString &baseName)
- #ifdef Q_OS_MAC
- QFile plfile(QLatin1Literal("preloads:") % baseName % QLatin1Literal(".dylib"));
- #else
-- QFile plfile(QLatin1Literal("preloads:") % baseName % QLatin1Literal(".so"));
-+ QFile plfile(QLatin1Literal("preloads:") % QLatin1Literal("lib") % baseName % QLatin1Literal(".so." GAMMARAY_PROBE_SOVERSION));
- #endif
- if (plfile.exists()) {
- return plfile.fileName();
diff --git a/debian/patches/harfbuzz-search-path.patch b/debian/patches/harfbuzz-search-path.patch
deleted file mode 100644
index 488a84a..0000000
--- a/debian/patches/harfbuzz-search-path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 8 Jul 2012 14:47:26 +0200
-Subject: harfbuzz-search-path
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 126dfb3..70208fa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,8 +114,8 @@ if(QT_PRIVATE_INCLUDE_DIR)
- # not enough, some of them include harfbuzz headers, so we need to find those as well
- # for now we assume a regular Qt4 source build layout, but that probably should be generalized
- find_path(
-- HARFBUZZ_INCLUDE_DIR harfbuzz.h
-- PATH ${QT_PRIVATE_INCLUDE_DIR}/../../src/3rdparty/harfbuzz/src
-+ HARFBUZZ_INCLUDE_DIR harfbuzz-shaper.h
-+ PATH ${QT_PRIVATE_INCLUDE_DIR}/../../src/corelib/tools
- )
- endif()
-
diff --git a/debian/patches/series b/debian/patches/series
index beb6757..7075544 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-widget-export-actions-location.patch
-harfbuzz-search-path.patch
-find-widget-export-actions-when-attaching.patch
-gammaray-probe-versioned-soname.patch
use-empty-rpath.patch
diff --git a/debian/patches/use-empty-rpath.patch b/debian/patches/use-empty-rpath.patch
index 94a3e48..a11e94f 100644
--- a/debian/patches/use-empty-rpath.patch
+++ b/debian/patches/use-empty-rpath.patch
@@ -3,34 +3,31 @@ Date: Thu, 10 Jan 2013 20:16:29 +0100
Subject: use-empty-rpath
---
- CMakeLists.txt | 2 --
- plugins/kjobtracker/CMakeLists.txt | 3 +++
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 2 --
+ hooking/CMakeLists.txt | 3 ---
+ 2 files changed, 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01dc3ac..f5df540 100644
+index deb9683..90fa14c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -30,8 +30,6 @@ set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMM
- set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
- set(GAMMARAY_PROBE_SOVERSION "${GAMMARAY_VERSION_STRING}")
+@@ -32,8 +32,6 @@ set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
+ set(GAMMARAY_SOVERSION "2.0.0")
+ set(GAMMARAY_PLUGIN_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
-
enable_testing()
-diff --git a/plugins/kjobtracker/CMakeLists.txt b/plugins/kjobtracker/CMakeLists.txt
-index f2ade54..b32d1c6 100644
---- a/plugins/kjobtracker/CMakeLists.txt
-+++ b/plugins/kjobtracker/CMakeLists.txt
-@@ -39,6 +39,9 @@ qt4_wrap_ui(gammaray_kjob_plugin_srcs
- kjobtracker.ui
- )
-+# Override value set in FindKDE4Internal.cmake
-+unset(CMAKE_INSTALL_RPATH)
-+
- gammaray_add_plugin(gammaray_kjobtracker_plugin
- gammaray_kjobtracker.desktop
- ${gammaray_kjob_plugin_srcs}
+ if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+diff --git a/hooking/CMakeLists.txt b/hooking/CMakeLists.txt
+index f3e08d4..846521a 100644
+--- a/hooking/CMakeLists.txt
++++ b/hooking/CMakeLists.txt
+@@ -1,6 +1,3 @@
+-# Enable RPATH, make gammaray_probe find gammaray_core (same directory)
+-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
+-
+ include_directories(
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR} # config-gammaray.h
diff --git a/debian/patches/widget-export-actions-location.patch b/debian/patches/widget-export-actions-location.patch
deleted file mode 100644
index 883fca7..0000000
--- a/debian/patches/widget-export-actions-location.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 5 Jan 2012 00:57:49 +0100
-Subject: widget-export-actions-location
-
-Install libgammaray_widget_export_actions.so to /usr/lib/gammaray
-as it is application private library. Fixes lintian warnings/errors:
-
-package-name-doesnt-match-sonames
-shlib-without-versioned-soname
-postinst-must-call-ldconfig
----
- CMakeLists.txt | 1 +
- core/tools/widgetinspector/CMakeLists.txt | 2 +-
- core/tools/widgetinspector/widgetinspector.cpp | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index af187d6..52db6dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -132,6 +132,7 @@ if(Qt5Core_FOUND)
- else()
- set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt4/plugins")
- endif()
-+set(MODULE_INSTALL_DIR "${LIB_INSTALL_DIR}/gammaray")
-
- set(
- INSTALL_TARGETS_DEFAULT_ARGS
-diff --git a/core/tools/widgetinspector/CMakeLists.txt b/core/tools/widgetinspector/CMakeLists.txt
-index 2dfdf22..8effc9a 100644
---- a/core/tools/widgetinspector/CMakeLists.txt
-+++ b/core/tools/widgetinspector/CMakeLists.txt
-@@ -18,4 +18,4 @@ target_link_libraries(gammaray_widget_export_actions
- ${EXTRA_LIBS}
- )
-
--install(TARGETS gammaray_widget_export_actions ${INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS gammaray_widget_export_actions DESTINATION ${MODULE_INSTALL_DIR})
-diff --git a/core/tools/widgetinspector/widgetinspector.cpp b/core/tools/widgetinspector/widgetinspector.cpp
-index 6d9bded..9af5048 100644
---- a/core/tools/widgetinspector/widgetinspector.cpp
-+++ b/core/tools/widgetinspector/widgetinspector.cpp
-@@ -279,7 +279,7 @@ void WidgetInspector::callExternalExportAction(const char *name,
- {
- if (!m_externalExportActions.isLoaded()) {
- const QString probePath =
-- QString::fromLocal8Bit(qgetenv("GAMMARAY_PROBE_PATH"));
-+ QString::fromLocal8Bit(qgetenv("GAMMARAY_PROBE_PATH") + "/gammaray");
-
- m_externalExportActions.setFileName(
- probePath + QLatin1String("/libgammaray_widget_export_actions"));
--
gammaray packaging
More information about the pkg-kde-commits
mailing list