[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:18 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=d0970eb
The following commit has been merged in the master branch:
commit d0970eb96fff67ea4b7777c4d9e36395cd0ca99b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Jan 18 23:34:04 2014 +0100
Remove useless d/patches/find-qt5-webkit-5.1.patch
---
debian/patches/find-qt5-webkit-5.1.patch | 21 ---------------------
debian/patches/series | 1 -
2 files changed, 22 deletions(-)
diff --git a/debian/patches/find-qt5-webkit-5.1.patch b/debian/patches/find-qt5-webkit-5.1.patch
deleted file mode 100644
index 4d2f18b..0000000
--- a/debian/patches/find-qt5-webkit-5.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 26 Dec 2013 10:14:12 +0100
-Subject: find-qt5-webkit-5.1
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46e2c60..eaa31d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@ if(Qt5Core_FOUND)
- Location # workaround for 5.1 webkit that tries to find a qtlocation with a matching version if none (with any version) has been found before...
- Designer
- )
-- find_package(Qt5WebKitWidgets 5.0.2 QUIET) # 5.0.[01] has a code generation bug in uic that fails to generate proper code for webkitwidget classes
-+ find_package(Qt5WebKitWidgets QUIET)
-
- include("cmake/ECMQt4To5Porting.cmake")
- # only needed for Qt <= 5.1 and/or some older CMake versions (exact combination unknown unfortunately)
diff --git a/debian/patches/series b/debian/patches/series
index 73cb43e..7075544 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
use-empty-rpath.patch
-find-qt5-webkit-5.1.patch
--
gammaray packaging
More information about the pkg-kde-commits
mailing list