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

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Mon Apr 8 14:11:28 CEST 2013 

Revision: 20649
          http://gar.svn.sourceforge.net/gar/?rev=20649&view=rev
Author:   cgrzemba
Date:     2013-04-08 12:11:27 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
librecad/trunk: bump version, build with qt4.8.1

Modified Paths:
--------------
    csw/mgar/pkg/librecad/trunk/Makefile
    csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch
    csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch

Added Paths:
-----------
    csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch

Modified: csw/mgar/pkg/librecad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librecad/trunk/Makefile	2013-04-08 09:26:04 UTC (rev 20648)
+++ csw/mgar/pkg/librecad/trunk/Makefile	2013-04-08 12:11:27 UTC (rev 20649)
@@ -1,9 +1,8 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = libreCAD
-GITNAME = LibreCAD
-VERSION = 2.0.0beta1
+NAME = LibreCAD
+VERSION = 2.0.0beta2
 # GIT_VERSION = 216dc66b2a
 GARTYPE = v2
 CATEGORIES = gnome
@@ -23,40 +22,41 @@
 # https://github.com/LibreCAD/LibreCAD/tarball/master
 MASTER_SITES = 
 # DISTFILES  = $(DISTNAME).tar.gz
-GIT_REPOS = http://github.com/$(GITNAME)/$(GITNAME).git
+GIT_REPOS = http://github.com/$(NAME)/$(NAME).git
 GIT_USE_PROXY = 1
 # GIT_TREEISH_LibreCAD.git = $(GIT_VERSION)
 
 GARCOMPILER = GNU
-prefix = $(BUILD_PREFIX)/gxx
+# prefix = $(BUILD_PREFIX)/gxx
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
 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
 
-BUILD_DEP_PKGS += CSWqt4-gxx-dev
+BUILD_DEP_PKGS += CSWqt4-dev
 BUILD_DEP_PKGS += CSWmuparser-dev
 BUILD_DEP_PKGS += CSWboost-gcc-dev
 BUILD_DEP_PKGS += CSWlibfreetype-dev
 
-PACKAGES = CSWlibrecad
-CATALOGNAME_CSWlibrecad = librecad
-SPKG_DESC_CSWlibrecad = $(DESCRIPTION)
-# PKGFILES_CSWlibrecad += $(call baseisadirs,$(bindir),.*)
-# PKGFILES_CSWlibrecad += $(datadir)/$(call tolower,$(NAME))/.*
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqthelp4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsvg4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibmuparser2-gxx
-# RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsql4-gxx
-# it had never exists: remove that as soon checkpkg could forget this
-OBSOLETED_BY_CSWlibrecad = CSWLibreCAD
+PACKAGES += CSWlibreCAD
+CATALOGNAME_CSWlibreCAD = libreCAD
+PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*)
+PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.*
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsvg4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibmuparser2
+# RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4
+CHECKPKG_OVERRIDES_CSWlibreCAD += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad
+CHECKPKG_OVERRIDES_CSWlibreCAD += catalogname-not-lowercase
 
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 CONFIGURE_SCRIPTS = custom
@@ -73,10 +73,10 @@
 	ginstall -d $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources
 	gcp -rfp  $(WORKSRC)/unix/resources/* \
                   $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources
-	ginstall -d $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibrecad)
-	$(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibrecad);)
+	ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibreCAD)
+	$(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibreCAD);)
 	@$(MAKECOOKIE)
 
 include gar/category.mk
 
-PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin:/opt/csw/gxx/bin
+PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin

Modified: csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch	2013-04-08 09:26:04 UTC (rev 20648)
+++ csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch	2013-04-08 12:11:27 UTC (rev 20649)
@@ -1,27 +1,3 @@
-From 9ae6c98ce011215619dd63c1060a8f836fce5b8b Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Thu, 24 May 2012 15:48:53 +0200
-Subject: [PATCH] adjust for csw environment
-
----
- librecad/src/src.pro |    1 -
- settings.pro         |    4 +++-
- 2 Dateien geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
-
-diff --git a/librecad/src/src.pro b/librecad/src/src.pro
-index 4e1a0d3..e6a1ea8 100755
---- a/librecad/src/src.pro
-+++ b/librecad/src/src.pro
-@@ -38,7 +38,6 @@ DESTDIR = $${INSTALLDIR}
- 
- # Make translations at the end of the process
- unix {
--    SCMREVISION=$$system([ "$(which git)x" != "x" -a -d ../../.git ] && echo "$(git describe --tags)" || echo "$${SCMREVISION}")
- 
-     DEFINES += QC_SCMREVISION=\"$$SCMREVISION\"
-     macx {
-diff --git a/settings.pro b/settings.pro
-index b120052..b5354ea 100644
 --- a/settings.pro
 +++ b/settings.pro
 @@ -5,6 +5,6 @@ unix {

Modified: csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch	2013-04-08 09:26:04 UTC (rev 20648)
+++ csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch	2013-04-08 12:11:27 UTC (rev 20649)
@@ -4,7 +4,7 @@
  
          // Others, RVT April 25, 2011 removed, doesn anybody use that still?
          // dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
-+        dirList.append("/opt/csw/gxx/share/" + appDirName + "/" + subDirectory);
++        dirList.append("/opt/csw/share/" + appDirName + "/" + subDirectory);
  
  
  #ifdef Q_OS_MAC
@@ -12,7 +12,7 @@
          // Add support directory if librecad is run-in-place,
          // not for Apple because it uses resources this is more for unix systems
          dirList.append(appDir + "/resources/" + subDirectory);
-+        dirList.append("/opt/csw/gxx/lib/"+ appDirName + "/resources/" + subDirectory);
++        dirList.append("/opt/csw/lib/"+ appDirName + "/resources/" + subDirectory);
  #endif
  
      // Individual directories:

Added: csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch	                        (rev 0)
+++ csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch	2013-04-08 12:11:27 UTC (rev 20649)
@@ -0,0 +1,11 @@
+--- a/librecad/src/src.pro
++++ b/librecad/src/src.pro
+@@ -37,7 +37,7 @@ DESTDIR = $${INSTALLDIR}
+ 
+ # Make translations at the end of the process
+ unix {
+-    SCMREVISION=$$system([ "$(which git)x" != "x" -a -d ../../.git ] && echo "$(git describe --tags)" || echo "$${SCMREVISION}")
++    SCMREVISION=$$system(echo "$(git describe --tags)" || echo "$${SCMREVISION}")
+ 
+     DEFINES += QC_SCMREVISION=\"$$SCMREVISION\"
+     macx {

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

More information about the devel mailing list