[csw-devel] SF.net SVN: gar:[20477] csw/mgar/pkg/emacs/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Mon Mar 18 14:47:04 CET 2013
Revision: 20477
http://gar.svn.sourceforge.net/gar/?rev=20477&view=rev
Author: pfelecan
Date: 2013-03-18 13:47:04 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
emacs/trunk: version bump
Modified Paths:
--------------
csw/mgar/pkg/emacs/trunk/Makefile
csw/mgar/pkg/emacs/trunk/checksums
csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch
Removed Paths:
-------------
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 2013-03-18 11:15:57 UTC (rev 20476)
+++ csw/mgar/pkg/emacs/trunk/Makefile 2013-03-18 13:47:04 UTC (rev 20477)
@@ -1,10 +1,8 @@
# $Id$
-# TODO (release-critical prefixed with !, non release-critical with *)
-#
+
NAME = emacs
-VERSION = 24.2
+VERSION = 24.3
GARTYPE = v2
-CATEGORIES = apps
DESCRIPTION = The GNU Emacs editor
define BLURB
@@ -12,7 +10,7 @@
display editor.
endef
-DISTFILES = $(DISTNAME).tar.bz2
+DISTFILES = $(DISTNAME).tar.xz
MASTER_SITES = $(GNU_MIRROR)
# this is necessary because GNU id options dialect is is used; BTW, I
@@ -48,6 +46,7 @@
BUILD_DEP_PKGS += CSWlibncurses-dev
BUILD_DEP_PKGS += CSWlibotf-dev
BUILD_DEP_PKGS += CSWlibpixman-dev
+BUILD_DEP_PKGS += CSWlibpcre-dev
BUILD_DEP_PKGS += CSWlibpng-dev
BUILD_DEP_PKGS += CSWlibpthreadstubs
BUILD_DEP_PKGS += CSWlibrsvg-dev
@@ -75,7 +74,6 @@
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
@@ -86,7 +84,7 @@
EXTRA_CONFIGURE_ARGS_athena += --without-dbus
EXTRA_CONFIGURE_ARGS_athena += --without-gconf
-EXTRA_CONFIGURE_ARGS_gtk = --with-x-toolkit=gtk
+EXTRA_CONFIGURE_ARGS_gtk = --with-x-toolkit=gtk2
EXTRA_CONFIGURE_ARGS_nox = --with-x-toolkit=no
EXTRA_CONFIGURE_ARGS_nox += --without-sound
Modified: csw/mgar/pkg/emacs/trunk/checksums
===================================================================
--- csw/mgar/pkg/emacs/trunk/checksums 2013-03-18 11:15:57 UTC (rev 20476)
+++ csw/mgar/pkg/emacs/trunk/checksums 2013-03-18 13:47:04 UTC (rev 20477)
@@ -1 +1 @@
-1676803a50e8adc817fdaaebb9234f14 emacs-24.2.tar.bz2
+ea9ed000ca165280265aabb55b9afbd7 emacs-24.3.tar.xz
Modified: 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 2013-03-18 11:15:57 UTC (rev 20476)
+++ csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch 2013-03-18 13:47:04 UTC (rev 20477)
@@ -1,6 +1,6 @@
-From bcc80204005ab2cdce7346594ad66c3a0ba6b65a Mon Sep 17 00:00:00 2001
+From 20ef63d6434bab3158919265d81b7f3c928607ee Mon Sep 17 00:00:00 2001
From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 8 Oct 2012 10:47:01 +0200
+Date: Fri, 15 Mar 2013 15:26:01 +0100
Subject: [PATCH] Filter ImageMagik OpenMP compiler flag
---
@@ -8,18 +8,18 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index fb229b7..97e73cd 100755
+index ab5f17f..f467955 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; }
-
+@@ -10601,7 +10601,7 @@ $as_echo_n "checking for $IMAGEMAGICK_MODULE... " >&6; }
+ s/ -I/ $isystem/g
+ s/^ //
+ "
+- IMAGEMAGICK_CFLAGS=`$as_echo "$IMAGEMAGICK_CFLAGS" | sed -e "$edit_cflags"`
++ IMAGEMAGICK_CFLAGS=`$as_echo "$IMAGEMAGICK_CFLAGS" | sed -e "$edit_cflags" | sed -e 's/-xopenmp//'`
+ IMAGEMAGICK_LIBS=`$as_echo "$IMAGEMAGICK_LIBS" | sed -e 's,///*,/,g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$IMAGEMAGICK_CFLAGS' LIBS='$IMAGEMAGICK_LIBS'" >&5
+ $as_echo "yes CFLAGS='$IMAGEMAGICK_CFLAGS' LIBS='$IMAGEMAGICK_LIBS'" >&6; }
--
-1.7.12
+1.8.1.4
Deleted: csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch
===================================================================
--- csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch 2013-03-18 11:15:57 UTC (rev 20476)
+++ csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch 2013-03-18 13:47:04 UTC (rev 20477)
@@ -1,25 +0,0 @@
-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