From d5992fa299e33188103b8ea254aeb3291df3457d6c816d2dee73527b4ddb5856 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Fri, 23 Nov 2007 10:12:03 +0000
Subject: [PATCH] updated, added 64bit fixes

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=8
---
 lib64-suffix-0.9.0.patch      | 89 +++++++++++++++++++++++++++++++++++
 man-install-share-0.9.0.patch | 12 +++++
 2 files changed, 101 insertions(+)
 create mode 100644 lib64-suffix-0.9.0.patch
 create mode 100644 man-install-share-0.9.0.patch

diff --git a/lib64-suffix-0.9.0.patch b/lib64-suffix-0.9.0.patch
new file mode 100644
index 0000000..a4135ba
--- /dev/null
+++ b/lib64-suffix-0.9.0.patch
@@ -0,0 +1,89 @@
+diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
+--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
++++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
+@@ -158,12 +158,13 @@
+   # common for MAC and UNIX
+   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
+   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
+-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
++  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
+   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
+   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+ 
+ 
+   IF (UNIX AND NOT APPLE)
++    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
+     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
+     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
+     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
+diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
+--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
++++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
+@@ -225,7 +225,7 @@
+ )
+ 
+ SET_TARGET_PROPERTIES(qgis PROPERTIES
+-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
++  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+   INSTALL_RPATH_USE_LINK_PATH true
+ )
+ 
+diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
+--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
++++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
+@@ -167,7 +167,7 @@
+ 
+ INSTALL(TARGETS qgis_core
+   RUNTIME DESTINATION ${QGIS_BIN_DIR}
+-  LIBRARY DESTINATION lib)
++  LIBRARY DESTINATION lib${LIB_SUFFIX})
+ 
+ 
+ # Added by Tim to install headers
+diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
+--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
++++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
+@@ -29,6 +29,10 @@
+ #include <netinet/in.h>
+ #endif
+ 
++#ifndef LIB_SUFFIX
++#define LIB_SUFFIX ""
++#endif
++
+ QString QgsApplication::mPrefixPath;
+ QString QgsApplication::mPluginPath;
+ QString QgsApplication::mPkgDataPath;
+@@ -69,7 +73,7 @@
+ 	setPluginPath(mPrefixPath + QString("/plugins"));
+ 	setPkgDataPath(mPrefixPath);
+ #else
+-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
++    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
+     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
+ #endif
+   }
+diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
+--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
++++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
+@@ -79,7 +79,7 @@
+ 
+ INSTALL(TARGETS qgis_gui
+   RUNTIME DESTINATION ${QGIS_BIN_DIR}
+-  LIBRARY DESTINATION lib)
++  LIBRARY DESTINATION lib${LIB_SUFFIX})
+ 
+ # for installing headers
+ 
+diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
+--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
++++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
+@@ -49,7 +49,7 @@
+ 
+ INSTALL(TARGETS qgisgrass
+   RUNTIME DESTINATION ${QGIS_BIN_DIR}
+-  LIBRARY DESTINATION lib)
++  LIBRARY DESTINATION lib${LIB_SUFFIX})
+        
+ INSTALL(TARGETS grassprovider
+   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
diff --git a/man-install-share-0.9.0.patch b/man-install-share-0.9.0.patch
new file mode 100644
index 0000000..01ef0a1
--- /dev/null
+++ b/man-install-share-0.9.0.patch
@@ -0,0 +1,12 @@
+diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
+--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
++++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
+@@ -241,7 +241,7 @@
+ 
+ # manual page... install also on windows?
+ INSTALL (FILES qgis.man
+-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
++         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+ 
+ 
+ #############################################################