dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app-cdr/qlscribe: install dbus files in right dir

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@893 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-03-21 14:53:44 +00:00
parent 6a57c4b2a0
commit 807e2e6c5f
4 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app-cdr/qlscribe/ChangeLog
View File

@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
21 Mar 2009; Mario Fetka <mario.fetka@gmail.com>
+files/qlscribe-0.9-gentoo-2.patch, qlscribe-0.9.ebuild:
install dbus files in right dir
21 Mar 2009; Mario Fetka <mario.fetka@gmail.com> +metadata.xml:
Initial checkin

5
app-cdr/qlscribe/Manifest
View File

@ -1,5 +1,6 @@
AUX qlscribe-0.9-gentoo-1.patch 1053 RMD160 9fc2c8dc2607b967bf33239fe04a995bdefc1f2b SHA1 fdfd5c58753b2d82d87004a0b028106af189f457 SHA256 882b5bd26599328c5ce96e4de69a2636d26de0d99cb2c93c1fdf4a2ab0d5f573
AUX qlscribe-0.9-gentoo-2.patch 2677 RMD160 174d1990547d034ccc129e5b1b2a453203ba5e85 SHA1 951f475479291e5b57d57e4b878662c8dfde2ca6 SHA256 d30fdfbefecdb813deecff48a585751c48c4598035c6d2490c6f99fbda0d8fee
DIST qlscribe-0.9.tar.gz 88106 RMD160 68fdff43e8f09654a3c3e70f4c9fdd7f0b7f5990 SHA1 7eb24180003629e02e6c783cd00013d038ecb505 SHA256 8f77ba545e95d9684530bfc4998ebc913fcfad912a66b7201eaff5279145cbeb
EBUILD qlscribe-0.9.ebuild 841 RMD160 d2f6f03c1ea10bad59739f54f06ba26120a39bfe SHA1 35a3477ed2821b3a3636c305666512b1700f7443 SHA256 e89ecc248171fce3657a853d1d1b8f85e49f525e93dc015965023cb2e3bf71ad
MISC ChangeLog 202 RMD160 6f630f2a6e9a6ca0b6cde83ac8fb96a549ea01b1 SHA1 ae00db6b347414ea6117f01b26f2b3c95666b092 SHA256 4115214131a34a99f6431b398295dcccee6b950726f5c40d5753d9524ddf49e4
EBUILD qlscribe-0.9.ebuild 967 RMD160 63eb8ff858deb86a2a77da8623869be3cf783635 SHA1 5fc3361e2e304fd0139ae2580287dfdf5cdc0d97 SHA256 1a39a612e5fbe0ac0007607170436ad63ff42431073f7099a6d94d87591d562f
MISC ChangeLog 347 RMD160 cb8f5dfa9b842003853e021cac5a64e4f151df5b SHA1 783d5ed58a2b29e660f6071f507f58a10c1600bf SHA256 37d7fe0c562b1deb9ca5da06fd859f16f501140a2a198c2c0c0a88db00937d70
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

50
app-cdr/qlscribe/files/qlscribe-0.9-gentoo-2.patch Normal file
View File

@ -0,0 +1,50 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-03-21
Initial Package Version: 0.9
Origin: me
Upstream Status: unknown
Description: find lightscribe in opt and install dbus files in right dir
diff -Naur qlscribe-0.9.orig/cmake/FindLightScribe.cmake qlscribe-0.9/cmake/FindLightScribe.cmake
--- qlscribe-0.9.orig/cmake/FindLightScribe.cmake 2009-03-11 00:51:03.000000000 +0000
+++ qlscribe-0.9/cmake/FindLightScribe.cmake 2009-03-21 08:44:39.000000000 +0000
@@ -18,9 +18,9 @@
#
# $Id: FindLightScribe.cmake 72 2009-02-22 01:27:45Z ruglory $
-FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include $ENV{LIGHTSCRIBEDIR}/include )
+FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include /usr/include/lightsribe $ENV{LIGHTSCRIBEDIR}/include )
-FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib $ENV{LIGHTSCRIBEDIR}/lib )
+FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib /opt/lightscribe/lib /opt/lightscribe/lib32 $ENV{LIGHTSCRIBEDIR}/lib )
if( LSCRIBE_INCLUDE_DIR AND LSCRIBE_LIBRARY )
SET( LSCRIBE_FOUND TRUE )
diff -Naur qlscribe-0.9.orig/lscribed/CMakeLists.txt qlscribe-0.9/lscribed/CMakeLists.txt
--- qlscribe-0.9.orig/lscribed/CMakeLists.txt 2009-03-11 00:51:04.000000000 +0000
+++ qlscribe-0.9/lscribed/CMakeLists.txt 2009-03-21 14:44:03.289663341 +0000
@@ -34,6 +34,18 @@
SET( CMAKE_EXE_LINKER_FLAGS "-m32 -pthread ${CMAKE_EXE_LINKER_FLAGS}" )
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
+IF (DBUS_SYSTEM_POLICY_DIR)
+ INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
+ELSE (DBUS_SYSTEM_POLICY_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client policy file for Qt Lightscribe is installed as DBUS_SYSTEM_POLICY_DIR. Normally this is /etc/dbus-1/system.d on a Linux system")
+endif (DBUS_SYSTEM_POLICY_DIR)
+
+IF (DBUS_SYSTEM_SERVICE_DIR)
+ INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${DBUS_SYSTEM_SERVICE_DIR})
+ELSE (DBUS_SYSTEM_SERVICE_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client service file for Qt Lightscribe is installed as DBUS_SYSTEM_SERVICE_DIR. Normally this is /usr/share/dbus-1/services on a Linux system")
+endif (DBUS_SYSTEM_SERVICE_DIR)
+
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
introspecthandler.cpp )
@@ -46,5 +58,4 @@
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
INSTALL( TARGETS lscribed DESTINATION sbin )
-INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )

5
app-cdr/qlscribe/qlscribe-0.9.ebuild
View File

@ -20,8 +20,11 @@ DEPEND="x11-libs/qt-gui:4
RDEPEND="${DEPEND}
dev-util/cmake[qt4]"
mycmakeargs="-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-DDBUS_SYSTEM_SERVICE_DIR=/usr/share/dbus-1/services"
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo-1.patch || die "Error applying patch"
epatch "${FILESDIR}"/${P}-gentoo-2.patch || die "Error applying patch"
}
src_compile() {