[csw-devel] SF.net SVN: gar:[19400] csw/mgar/pkg/emacs/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Tue Oct 9 16:23:51 CEST 2012
Revision: 19400
http://gar.svn.sourceforge.net/gar/?rev=19400&view=rev
Author: pfelecan
Date: 2012-10-09 14:23:51 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
emacs/trunk: bump version as in upstream
Modified Paths:
--------------
csw/mgar/pkg/emacs/trunk/Makefile
csw/mgar/pkg/emacs/trunk/checksums
csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch
Added Paths:
-----------
csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch
csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch
Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile 2012-10-09 13:10:26 UTC (rev 19399)
+++ csw/mgar/pkg/emacs/trunk/Makefile 2012-10-09 14:23:51 UTC (rev 19400)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = emacs
-VERSION = 23.4
+VERSION = 24.2
GARTYPE = v2
CATEGORIES = apps
@@ -62,10 +62,16 @@
BUILD_DEP_PKGS += CSWpkgconfig
BUILD_DEP_PKGS += CSWsunx11devel
+LINKER_MAPS =
+LINKER_DIRECT =
+LINKER_IGNORE =
+
PACKAGING_PLATFORMS = solaris10-sparc
PACKAGING_PLATFORMS += solaris10-i386
PATCHFILES += 0001-activate-Xft-for-configure.patch
+PATCHFILES += 0002-Filter-ImageMagik-OpenMP-compiler-flag.patch
+PATCHFILES += 0003-Satisfy-micro-tasking-library.patch
EXTRA_MODULATORS = FEATURES
MODULATIONS_FEATURES = athena
@@ -117,9 +123,6 @@
SPKG_DESC_CSWemacs-common = $(DESCRIPTION) - architecture neutral common components
CATALOGNAME_CSWemacs-common = emacs_common
CHECKPKG_OVERRIDES_CSWemacs-common += missing-dependency|CSWemacscommon
-CHECKPKG_OVERRIDES_CSWemacs-common += archall-with-arch-paths|/opt/csw/libexec/emacs/23.4/i386-pc-solaris2.10
-CHECKPKG_OVERRIDES_CSWemacs-common += archall-with-arch-paths|/opt/csw/libexec/emacs/23.4/i386-pc-solaris2.10/rcs2log
-CHECKPKG_OVERRIDES_CSWemacs-common += archall-with-arch-paths|/opt/csw/libexec/emacs/23.4/i386-pc-solaris2.10/vcdiff
CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus
CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp-3
CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs-6
@@ -221,13 +224,7 @@
PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ebrowse
PKGFILES_CSWemacs-bin-common += /opt/csw/bin/emacsclient
PKGFILES_CSWemacs-bin-common += /opt/csw/bin/etags
-PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/digest-doc
-PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/fakemail
-PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/hexl
-PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/movemail
-PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/profile
-PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/sorted-doc
-PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/update-game-score
+PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/.*
PACKAGES += CSWemacs
SPKG_DESC_CSWemacs = $(DESCRIPTION) - metapackage for generic dependencies
@@ -379,8 +376,8 @@
CATALOGNAME_CSWemacsnox = emacs_nox_stub
RUNTIME_DEP_PKGS_CSWemacs-nox = CSWemacs-common
RUNTIME_DEP_PKGS_CSWemacs-nox += CSWemacs-bin-common
-CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-23.4-nox
-CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-23.4-nox
+CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-nox
+CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-nox
CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-nox
CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-nox
CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-bin-common
Modified: csw/mgar/pkg/emacs/trunk/checksums
===================================================================
--- csw/mgar/pkg/emacs/trunk/checksums 2012-10-09 13:10:26 UTC (rev 19399)
+++ csw/mgar/pkg/emacs/trunk/checksums 2012-10-09 14:23:51 UTC (rev 19400)
@@ -1 +1 @@
-070c68ad8e3c31fb3cb2414feaf5e6f0 emacs-23.4.tar.bz2
+1676803a50e8adc817fdaaebb9234f14 emacs-24.2.tar.bz2
Modified: csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch
===================================================================
--- csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch 2012-10-09 13:10:26 UTC (rev 19399)
+++ csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch 2012-10-09 14:23:51 UTC (rev 19400)
@@ -1,17 +1,17 @@
-From 2bf4fad0be05e3b11a3f233c16f0f681a11641bd Mon Sep 17 00:00:00 2001
+From 904e9283e718e1b14276ee8f7047f9106c48b6bc Mon Sep 17 00:00:00 2001
From: Peter Felecan <pfelecan at opencsw.org>
-Date: Tue, 22 May 2012 14:04:49 +0200
+Date: Fri, 5 Oct 2012 11:41:59 +0200
Subject: [PATCH] activate Xft for configure
---
- configure | 3 +++
+ configure | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure b/configure
-index d894fe6..affbb9f 100755
+index 3e3cec2..fb229b7 100755
--- a/configure
+++ b/configure
-@@ -589,6 +589,9 @@ ac_includes_default="\
+@@ -597,6 +597,9 @@ ac_includes_default="\
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -20,7 +20,7 @@
+# include <X11/Xlib.h>
#endif"
- ac_config_libobj_dir=src
+ ac_header_list=
--
-1.7.10
+1.7.12
Added: csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch
===================================================================
--- csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch (rev 0)
+++ csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch 2012-10-09 14:23:51 UTC (rev 19400)
@@ -0,0 +1,25 @@
+From bcc80204005ab2cdce7346594ad66c3a0ba6b65a Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Mon, 8 Oct 2012 10:47:01 +0200
+Subject: [PATCH] Filter ImageMagik OpenMP compiler flag
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index fb229b7..97e73cd 100755
+--- a/configure
++++ b/configure
+@@ -10902,7 +10902,7 @@ $as_echo "yes" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking IMAGEMAGICK_CFLAGS" >&5
+ $as_echo_n "checking IMAGEMAGICK_CFLAGS... " >&6; }
+- IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g'`
++ IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g' | sed -e 's/-xopenmp//'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IMAGEMAGICK_CFLAGS" >&5
+ $as_echo "$IMAGEMAGICK_CFLAGS" >&6; }
+
+--
+1.7.12
+
Added: csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch
===================================================================
--- csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch (rev 0)
+++ csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch 2012-10-09 14:23:51 UTC (rev 19400)
@@ -0,0 +1,25 @@
+From 245630d8dac76f63102503ca388c51ff45afba2e Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 9 Oct 2012 11:43:31 +0200
+Subject: [PATCH] Satisfy micro-tasking library
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9a9be4f..08c1aed 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -314,7 +314,7 @@ epaths-force: FRC
+ # running more than 1 process in the leim directory, especially for
+ # the $TIT files there.
+ leim: src Makefile FRC
+- (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \
++ (export PARALLEL; PARALLEL=1; cd $@; $(MAKE) all $(MFLAGS) \
+ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
+ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}')
+
+--
+1.7.12
+
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