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

app-cdr/qlscribe: Bump

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@900 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-03-25 07:38:33 +00:00
parent c556642fe1
commit 4cd02a6d68
5 changed files with 94 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app-cdr/qlscribe/files/qlscribe-0.10-gentoo-3.patch Normal file
View File

@@ -0,0 +1,40 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-03-25
Initial Package Version: 0.10
Origin: me
Upstream Status: unknwon
Description: dont install dbus files in two places
diff -Naur qlscribe-0.10.orig/lscribed/CMakeLists.txt qlscribe-0.10/lscribed/CMakeLists.txt
--- qlscribe-0.10.orig/lscribed/CMakeLists.txt 2009-03-25 03:06:28.000000000 +0000
+++ qlscribe-0.10/lscribed/CMakeLists.txt 2009-03-25 07:09:45.735238647 +0000
@@ -36,11 +36,21 @@
IF (DBUS_SYSTEM_POLICY_DIR)
INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
-endif (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.")
+ MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
+ MESSAGE(STATUS "Normally this is /etc/dbus-1/system.d on a Linux system")
+ INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION share/qlscribe )
+ENDIF (DBUS_SYSTEM_POLICY_DIR)
IF (DBUS_SYSTEM_SERVICE_DIR)
INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${DBUS_SYSTEM_SERVICE_DIR})
-endif (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.")
+ MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
+ MESSAGE(STATUS "Normally this is /usr/share/dbus-1/services on a Linux system")
+ INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )
+ENDIF (DBUS_SYSTEM_SERVICE_DIR)
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
introspecthandler.cpp )
@@ -54,5 +64,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 )

22
app-cdr/qlscribe/files/qlscribe-0.9-gentoo-1.patch
View File

@@ -1,22 +0,0 @@
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 liblightscribe in opt
diff -Naur qlscribe-0.9.orig/cmake/FindLightScribe.cmake qlscribe-0.9/cmake/FindLightScribe.cmake
--- qlscribe-0.9.orig/cmake/FindLightScribe.cmake 2009-03-21 11:53:47.855760793 +0000
+++ qlscribe-0.9/cmake/FindLightScribe.cmake 2009-03-21 11:54:35.472058563 +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 )