[packages/phonon] - leave /usr munging to internal hackery, just add x32 to the mix - rel 5

baggins baggins at pld-linux.org
Sat Apr 4 15:37:54 CEST 2015


commit 0c3f61e332a0fdeb8ad154f9c443f91d4932752d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 4 15:37:30 2015 +0200

    - leave /usr munging to internal hackery, just add x32 to the mix
    - rel 5

 cmake-dirs.patch | 19 -------------------
 phonon.spec      |  4 ++--
 x32.patch        | 11 +++++++++++
 3 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/phonon.spec b/phonon.spec
index d7b0a68..dfbdab0 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -10,13 +10,13 @@ Summary:	Phonon: multimedia API for Qt4/KDE4
 Summary(pl.UTF-8):	Phonon - biblioteka multimedialna dla Qt4/KDE4
 Name:		phonon
 Version:	4.8.3
-Release:	4
+Release:	5
 License:	LGPL v2.1 or LGPL v3
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/%{name}-%{version}.tar.xz
 # Source0-md5:	88bb9867261803eed61ff53a7c026338
 Patch0:		%{name}-pkg.patch
-Patch1:		cmake-dirs.patch
+Patch1:		x32.patch
 URL:		http://phonon.kde.org/
 %if %{with qt5}
 BuildRequires:	Qt5Core-devel >= %{qt5_ver}
diff --git a/cmake-dirs.patch b/cmake-dirs.patch
deleted file mode 100644
index db89e3f..0000000
--- a/cmake-dirs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- phonon-4.8.3/cmake/FindPhononInternal.cmake.orig	2014-12-04 10:30:26.000000000 +0100
-+++ phonon-4.8.3/cmake/FindPhononInternal.cmake	2015-04-04 14:40:09.316552962 +0200
-@@ -171,12 +171,12 @@
- 
- include(GNUInstallDirs)
- 
--set(SHARE_INSTALL_PREFIX        "share")  #              CACHE PATH "Base directory for files which go to share/")
--set(INCLUDE_INSTALL_DIR         "include" ) #           CACHE PATH "The subdirectory to the header prefix")
-+set(SHARE_INSTALL_PREFIX        "${CMAKE_INSTALL_DATADIR}" )  #              CACHE PATH "Base directory for files which go to share/")
-+set(INCLUDE_INSTALL_DIR         "${CMAKE_INSTALL_INCLUDEDIR}" ) #           CACHE PATH "The subdirectory to the header prefix")
- if (PHONON_BUILD_PHONON4QT5)
--    set(INCLUDE_INSTALL_DIR         "include/${PHONON_LIB_SONAME}" ) #           CACHE PATH "The subdirectory to the header prefix")
-+	set(INCLUDE_INSTALL_DIR         "${CMAKE_INSTALL_INCLUDEDIR}/${PHONON_LIB_SONAME}" ) #           CACHE PATH "The subdirectory to the header prefix")
- endif (PHONON_BUILD_PHONON4QT5)
--set(BIN_INSTALL_DIR             "bin"     ) #         CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
-+set(BIN_INSTALL_DIR             "${CMAKE_INSTALL_BINDIR}" ) #         CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
- set(LIB_INSTALL_DIR             "${CMAKE_INSTALL_LIBDIR}" ) #  CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed"
- set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/kde4"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
- if (PHONON_BUILD_PHONON4QT5)
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..11ec22d
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- phonon-4.8.3/CMakeLists.txt~	2014-12-04 10:30:26.000000000 +0100
++++ phonon-4.8.3/CMakeLists.txt	2015-04-04 15:36:05.699861998 +0200
+@@ -242,7 +242,7 @@
+ # to it for the 4.x series.
+ # The set variable is used by the PhononConfig.cmake.in to use a refined rootDir
+ # resolution when installed to /usr/lib
+-if("${absInstallDir}" MATCHES "^(/usr)?/lib(64)?/.+")
++if("${absInstallDir}" MATCHES "^(/usr)?/lib(64|x32)?/.+")
+     # Handle "/usr move" symlinks created by some Linux distros.
+     set(USR_SYMLINK_RESOLVER "
+         # Use original install prefix when loaded through a \"/usr move\"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phonon.git/commitdiff/0c3f61e332a0fdeb8ad154f9c443f91d4932752d



More information about the pld-cvs-commit mailing list