[csw-devel] SF.net SVN: gar:[21964] csw/mgar/pkg/librecad/trunk

[cgrzemba at users.sourceforge.net]

Revision: 21964
          http://gar.svn.sourceforge.net/gar/?rev=21964&view=rev
Author:   cgrzemba
Date:     2013-09-19 08:01:20 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
librecad/trunk: update csw customizing for new version

Modified Paths:
--------------
    csw/mgar/pkg/librecad/trunk/Makefile
    csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch

Added Paths:
-----------
    csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch

Modified: csw/mgar/pkg/librecad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librecad/trunk/Makefile	2013-09-18 18:00:24 UTC (rev 21963)
+++ csw/mgar/pkg/librecad/trunk/Makefile	2013-09-19 08:01:20 UTC (rev 21964)
@@ -30,10 +30,11 @@
 # prefix = $(BUILD_PREFIX)/gxx
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
-PATCHFILES += 0000-adjust-for-csw-environment.patch
+# PATCHFILES += 0000-adjust-for-csw-environment.patch
 PATCHFILES += 0000-add-csw-settings.patch
 PATCHFILES += 0001-adjust-rs_system-forcsw.patch
 PATCHFILES += 0002-set-version-from-git.patch
+PATCHFILES += 0003-fix-postprocessing.patch
 
 BUILD_DEP_PKGS += CSWqt4-dev
 BUILD_DEP_PKGS += CSWmuparser-dev

Modified: csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch	2013-09-18 18:00:24 UTC (rev 21963)
+++ csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch	2013-09-19 08:01:20 UTC (rev 21964)
@@ -4,19 +4,18 @@
 Subject: [PATCH] add csw settings
 
 ---
- settings_csw.pro |   15 +++++++++++++++
- 1 Datei geändert, 15 Zeilen hinzugefügt(+)
- create mode 100644 settings_csw.pro
+ custom.pro |   13 +++++++++++++++
+ 1 Datei geändert, 13 Zeilen hinzugefügt(+)
+ create mode 100644 custom.pro
 
-diff --git a/settings_csw.pro b/settings_csw.pro
+diff --git a/custom.pro b/custom.pro
 new file mode 100644
 index 0000000..9f6b517
 --- /dev/null
-+++ b/settings_csw.pro
-@@ -0,0 +1,15 @@
++++ b/custom.pro
+@@ -0,0 +1,13 @@
 +
 +
-+SUBDIRS += ttff2lff
 +INSTALLDIR = ../../unix
 +
 +
@@ -24,11 +23,10 @@
 +# add csw muparser include dir
 +#
 +
-+exists("/opt/csw/gxx/include") {
-+   INCLUDEPATH += "/opt/csw/include"
-+   INCLUDEPATH += "/opt/csw/gxx/include/boost"
-+   INCLUDEPATH += "/opt/csw/include/freetype2"
-+}
++INCLUDEPATH += "/opt/csw/include"
++INCLUDEPATH += "/opt/csw/include/freetype2"
++BOOST_DIR += "/opt/csw/gxx"
++QMAKE_LFLAGS += -Bdirect -zignore
 -- 
 1.7.10.2
 

Added: csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch	                        (rev 0)
+++ csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch	2013-09-19 08:01:20 UTC (rev 21964)
@@ -0,0 +1,20 @@
+--- a/scripts/postprocess-unix.sh
++++ b/scripts/postprocess-unix.sh
+@@ -10,7 +10,7 @@ SPTDIR="${LCDIR}/support"
+ DOCDIR="${SPTDIR}/doc"
+ LRELEASE="lrelease"
+ 
+-[ "$( which lrelease-qt4 )" ] && LRELEASE="lrelease-qt4"
++# [ "$( which lrelease-qt4 )" ] && LRELEASE="lrelease-qt4"
+ 
+ # Generate Help Files
+ cd "${DOCDIR}"
+@@ -27,7 +27,7 @@ cp "${SPTDIR}"/fonts/*.lff* "${RESOURCEDIR}"/fonts
+ cp "${SPTDIR}"/doc/*.qch "${RESOURCEDIR}"/doc
+ cp "${SPTDIR}"/doc/*.qhc "${RESOURCEDIR}"/doc
+ find "${SPTDIR}"/library -type d | sed 's:^.*support/::' | xargs -IFILES  mkdir "${RESOURCEDIR}"/FILES
+-find "${SPTDIR}"/library -type f -iname *.dxf | sed 's/^.*support//' | xargs -IFILES  cp "${SPTDIR}"/FILES "${RESOURCEDIR}"/FILES
++gfind "${SPTDIR}"/library -type f -iname *.dxf | sed 's/^.*support//' | xargs -IFILES  cp "${SPTDIR}"/FILES "${RESOURCEDIR}"/FILES
+ 
+ # Generate translations
+ ${LRELEASE} "${LCDIR}"/src/src.pro

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.