Revision: 9073
http://gar.svn.sourceforge.net/gar/?rev=9073&view=rev
Author: dmichelsen
Date: 2010-03-10 08:02:31 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
gtk2: Update to 2.19.6, depend on csw X11
Modified Paths:
--------------
csw/mgar/pkg/gtk2/trunk/Makefile
csw/mgar/pkg/gtk2/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/gtk2/trunk/files/fixme.sh
Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-10 07:42:29 UTC (rev 9072)
+++ csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-10 08:02:31 UTC (rev 9073)
@@ -1,5 +1,5 @@
GARNAME = gtk2
-GARVERSION = 2.16.5
+GARVERSION = 2.19.6
CATEGORIES = lib
DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development
@@ -16,14 +16,13 @@
#
# #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
-MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/
+GNOME_PROJ = gtk+
+MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES = gtk+-$(GARVERSION).tar.bz2
+DISTNAME = gtk+-$(GARVERSION)
+DISTFILES = $(DISTNAME).tar.bz2
DISTFILES += CSWgtk2.postinstall
-DISTFILES += fixme.sh
-WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION)
-
PACKAGES = CSWgtk2 CSWgtk2devel CSWgtk2doc
CATALOGNAME_CSWgtk2 = gtk2
@@ -35,8 +34,9 @@
SPKG_DESC_CSWgtk2doc = A feature rich toolkit for creating graphical user interfaces documentation
BUILD_DEP_PKGS = CSWbash
-RUNTIME_DEP_PKGS_CSWgtk2 = CSWjasper CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff CSWzlib
+RUNTIME_DEP_PKGS_CSWgtk2 = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxcomposite CSWlibxcursor CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxrandr
RUNTIME_DEP_PKGS_CSWgtk2devel = CSWgtk2 CSWglib2devel
RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibx11devel CSWlibxrenderdevel CSWpangodevel
@@ -55,6 +55,8 @@
CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
CONFIGURE_ARGS += --disable-cups
+STRIP_LIBTOOL = 1
+
#TEST_TARGET = check
# There is a test failing on Xvfb which may or may not be harmful. Disable for now.
TEST_TARGET =
@@ -69,8 +71,3 @@
ARCHALL_CSWgtk2doc = 1
include gar/category.mk
-
-post-configure-modulated:
- @echo " ==> Fixing libtool files"
- @$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/gtk2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gtk2/trunk/checksums 2010-03-10 07:42:29 UTC (rev 9072)
+++ csw/mgar/pkg/gtk2/trunk/checksums 2010-03-10 08:02:31 UTC (rev 9073)
@@ -1,3 +1,2 @@
-7ff4fdcaa073afc764af7106c0ba441c download/CSWgtk2.postinstall
-34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh
-8d1ea0b9b0400224d25b0cc2750b438d download/gtk+-2.16.5.tar.bz2
+7ff4fdcaa073afc764af7106c0ba441c CSWgtk2.postinstall
+524021c965a0e1a4ebadd58c576926a5 gtk+-2.19.6.tar.bz2
Deleted: csw/mgar/pkg/gtk2/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/fixme.sh 2010-03-10 07:42:29 UTC (rev 9072)
+++ csw/mgar/pkg/gtk2/trunk/files/fixme.sh 2010-03-10 08:02:31 UTC (rev 9073)
@@ -1,51 +0,0 @@
-#!/bin/bash
-####################################################
-#
-# fixme.sh
-# Intended to remove the use of libtool's
-# pseudo-libraries for opencsw builds.
-#
-# Author: Mike Watters mwatters_at_opencsw.org
-# Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
- gecho "USAGE: $(basename $0) WORKSRC"
- exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
- LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
- gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-
- for file in ${LT_FILES}; do
- LIB_NAME=$(ggrep 'dlname=' ${file} | \
- gsed -e "s/.*'\(.*\)'/\1/" \
- -e "s/^lib//" \
- -e "s/\.so.*$//")
- fixpath=$(gecho $file |gsed 's/\//\\\//g')
- gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
- gmv Makefile.new ${mk}
- gchmod +x ${mk}
- done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
- gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
- gmv ${lt}.new ${lt}
- gchmod +x ${lt}
-done
-
-for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do
- gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
- gmv ${LTMAIN}.new ${LTMAIN}
- gchmod +x ${LTMAIN}
-done
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.