[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.6-2

Maximiliano Curia maxy at moszumanska.debian.org
Wed Feb 12 22:30:59 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=70ccb50

The following commit has been merged in the master branch:
commit 70ccb509c1b40f4402e833f5e0801cdde12509e3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Feb 12 20:07:49 2014 +0100

    New patch: empty_target_kwinglesutils
---
 debian/changelog                          |  1 +
 debian/control                            |  1 +
 debian/patches/empty_target_kwinglesutils | 15 +++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 578e9f0..66f8b68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kde-workspace (4:4.11.6-2) UNRELEASED; urgency=medium
 
   * Update symbols files.
+  * New patch: empty_target_kwinglesutils
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 12 Feb 2014 19:56:48 +0100
 
diff --git a/debian/control b/debian/control
index d01961a..97a8289 100644
--- a/debian/control
+++ b/debian/control
@@ -608,6 +608,7 @@ Package: libkwinglesutils1
 Section: libs
 Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sh4 sparc
 X-Debian-ABI: 0
+X-CMake-Target: kwinglesutils
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library with OpenGL/ES utilities for the KDE window manager
  This package contains a library with OpenGL/ES utilities used by the KDE
diff --git a/debian/patches/empty_target_kwinglesutils b/debian/patches/empty_target_kwinglesutils
new file mode 100644
index 0000000..51a85b1
--- /dev/null
+++ b/debian/patches/empty_target_kwinglesutils
@@ -0,0 +1,15 @@
+Index: kde-workspace/kwin/libkwineffects/CMakeLists.txt
+===================================================================
+--- kde-workspace.orig/kwin/libkwineffects/CMakeLists.txt	2014-01-26 20:57:46.919256130 +0100
++++ kde-workspace/kwin/libkwineffects/CMakeLists.txt	2014-02-12 20:05:05.923466835 +0100
+@@ -73,6 +73,10 @@
+     KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})
+     set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
+     set_target_properties(kwinglesutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glesutils)
++else()
++    kde4_add_library(kwinglesutils SHARED)
++    set_target_properties(kwinglesutils PROPERTIES VERSION 1.0.0 SONAME 1)
++    set_target_properties(kwinglesutils PROPERTIES LINKER_LANGUAGE CXX)
+ endif()
+ if(OPENGL_FOUND)
+     KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY})
diff --git a/debian/patches/series b/debian/patches/series
index ff13579..4171a0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ nlist_ftbfs_krefreebsd.diff
 hurd.diff
 add_kdefakes_for_strlcpy_and_strlcat.diff
 krunner_iceweasel_bookmarks.patch
+empty_target_kwinglesutils

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list