[SCM] subtitlecomposer packaging branch, master, updated. upstream/0.5.3-9-gad00c79
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Mon Oct 14 13:51:52 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=604c876
The following commit has been merged in the master branch:
commit 604c87679ff24ebdafd6887ec5e157a585e54165
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Mon Oct 14 15:29:39 2013 +0200
Add link_against_x11.diff.
---
debian/changelog | 1 +
debian/patches/link_against_x11.diff | 16 ++++++++++++++++
debian/patches/series | 1 +
3 files changed, 18 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 810fa10..3b6169a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ subtitlecomposer (0.5.3-4) UNRELEASED; urgency=low
* Point debian/control Vcs fields to the new Git repository.
* Build depend on libxine2-dev instead of libxine-dev (Closes:
#724751).
+ * Add link_against_x11.diff.
-- José Manuel Santamaría Lema <panfaust at gmail.com> Tue, 23 Mar 2010 21:02:29 +0100
diff --git a/debian/patches/link_against_x11.diff b/debian/patches/link_against_x11.diff
new file mode 100644
index 0000000..7912958
--- /dev/null
+++ b/debian/patches/link_against_x11.diff
@@ -0,0 +1,16 @@
+--- a/src/player/xine/CMakeLists.txt
++++ b/src/player/xine/CMakeLists.txt
+@@ -1,3 +1,5 @@
++find_package(X11)
++
+ SET( players_xine_INCLUDE_DIR
+ ${XINE_INCLUDE_DIR}
+ CACHE INTERNAL EXPORTEDVARIABLE
+@@ -10,6 +12,7 @@ SET( players_xine_DEFS
+
+ SET( players_xine_LIBS
+ ${XINE_LIBRARY}
++ ${X11_LIBRARIES}
+ CACHE INTERNAL EXPORTEDVARIABLE
+ )
+
diff --git a/debian/patches/series b/debian/patches/series
index 5c29d68..a195907 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02_link_krosscore.diff
03_link_phonon.diff
04_fix_ftbfs_gcc_4_5.diff
+link_against_x11.diff
--
subtitlecomposer packaging
More information about the pkg-kde-commits
mailing list