Accepting request 102290 from home:adra:branches:KDE:Extra

Updated no-copy-dt-needed-entries.patch to fix a new linking error with libX11

OBS-URL: https://build.opensuse.org/request/show/102290
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/subtitlecomposer?expand=0&rev=5
This commit is contained in:
Asterios Dramis 2012-01-31 19:55:27 +00:00 committed by Git OBS Bridge
parent 5b4f3b0d7e
commit 019ba09fbb
3 changed files with 23 additions and 1 deletions

View File

@ -6,3 +6,19 @@
FIND_PACKAGE( GLIB2 REQUIRED )
FIND_PACKAGE( LibXml2 REQUIRED )
--- src/player/xine/CMakeLists.txt.orig 2009-02-26 00:46:16.000000000 +0200
+++ src/player/xine/CMakeLists.txt 2012-01-29 16:42:26.646039339 +0200
@@ -1,3 +1,5 @@
+FIND_PACKAGE( X11 REQUIRED )
+
SET( players_xine_INCLUDE_DIR
${XINE_INCLUDE_DIR}
CACHE INTERNAL EXPORTEDVARIABLE
@@ -10,6 +12,7 @@
SET( players_xine_LIBS
${XINE_LIBRARY}
+ ${X11_X11_LIB}
CACHE INTERNAL EXPORTEDVARIABLE
)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jan 29 15:08:50 UTC 2012 - asterios.dramis@gmail.com
- Updated no-copy-dt-needed-entries.patch to fix a new linking error with
libX11.
-------------------------------------------------------------------
Mon Dec 5 21:47:07 UTC 2011 - asterios.dramis@gmail.com

View File

@ -31,7 +31,7 @@ Patch1: subtitlecomposer-0.5.3-scripting_api.patch
Patch2: subtitlecomposer-0.5.3-gcc45.patch
# PATCH-FIX-UPSTREAM scripting_examples_installation.patch asterios.dramis@gmail.com -- Fix installation of python scripting examples
Patch3: scripting_examples_installation.patch
# PATCH-FIX-OPENSUSE no-copy-dt-needed-entries.patch asterios.dramis@gmail.com -- Fix linking with --no-copy-dt-needed-entries
# PATCH-FIX-UPSTREAM no-copy-dt-needed-entries.patch asterios.dramis@gmail.com -- Fix linking with --no-copy-dt-needed-entries
Patch4: no-copy-dt-needed-entries.patch
BuildRequires: fdupes
BuildRequires: gstreamer-0_10-plugins-base-devel