Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31067
Modified Files:
enlightenment.info enlightenment.patch
Log Message:
Forward-port from 10.3
Index: enlightenment.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/enlightenment.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- enlightenment.info 28 Nov 2006 00:03:26 -0000 1.3
+++ enlightenment.info 12 Jan 2007 20:42:22 -0000 1.4
@@ -1,42 +1,55 @@
Package: enlightenment
-Version: 0.16.5
-Revision: 19
-Depends: imlib-shlibs (>= 1.9.14-2), esound-shlibs, fnlib-shlibs, fnlib-fonts,
libghttp-shlibs, freetype-shlibs | freetype-hinting-shlibs, libpng3-shlibs,
libjpeg-shlibs, libtiff-shlibs
-BuildDepends: imlib (>= 1.9.14-2), fnlib, audiofile, glib, gtk+, libjpeg,
libpng3, libtiff, netpbm, freetype | freetype-hinting, giflib, libghttp,
esound, gettext-dev, gettext-bin, gettext-tools
-Source: mirror:sourceforge:enlightenment/%n-%v.tar.gz
+Version: 0.16.8.5
+Revision: 1
+
+BuildDepends: <<
+ audiofile,
+ esound,
+ freetype219,
+ gettext-bin,
+ gettext-tools,
+ imlib2,
+ libgettext3-dev,
+ libiconv-dev,
+ pkgconfig,
+ x11-dev
+<<
+Depends: <<
+ audiofile-shlibs,
+ esound-shlibs,
+ freetype219-shlibs,
+ imlib2-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ x11
+<<
+
+Source: mirror:sourceforge:enlightenment/e16-%v.tar.gz
+Source-MD5: 1099d7d857e56e40e256e38ed18944d1
+
Patch: %n.patch
-ConfigureParams: --enable-upgrade=no --enable-fsstd=yes --mandir=%p/share/man
--bindir=%p/bin
-SetLIBS: -lintl
-SetCPPFLAGS: -I%p/include/freetype1
+SetCPPFLAGS: -I%p/lib/freetype219/include
+SetLDFLAGS: -L%p/lib/freetype219/lib
+ConfigureParams: --disable-roothacklib --disable-composite
--disable-dependency-tracking --libdir=%p/lib/%n
InstallScript: <<
- make install DESTDIR=%d localedir=%p/share/locale
- chmod -R go-w,go+rX %i/share/%n
+ make install DESTDIR=%d
<<
-DocFiles: README COPYING AUTHORS FAQ
-#
-Description: Themeable, featureful window manager
+DocFiles: AUTHORS COMPLIANCE COPYING ChangeLog NEWS README TODO
+
DescPort: <<
-Uses autoconf. Needs patches for some unguarded LC_MESSAGES
-usage. Needs help to put message catalogs in the right
-directory. bindir is specified so that it gets encoded correctly into
-the enlightenment.install script.
+ Using installed libintl, so don't mix with package's intl/*.h
-The configure script detects that it needs libintl, but doesn't add
-the appropriate library flag. We set LIBS to work around this.
+ Disable roothacklib...it's highly linux-centric
<<
DescPackaging: <<
-Some theme files have inappropriate permissions. The ownership should
-probably be fixed too, but it doesn't hurt enough yet. :-)
-<<
-DescUsage: <<
-If you want to use Enlightenment as a stand-alone desktop environment
-(i.e. without GNOME), you can run 'enlightenment.install' to create
-appropriate X11 startup files (.xsession / .xinitrc).
+ Let fink handle theme ownership
-To use Enlightenment with GNOME, leave .xinitrc alone and instead
-select it in the Window Manager panel of the GNOME Control Center.
+ Make sure ft219 flags appear before others if risk of
+ interference from other ft files
+
+ Disable Xcomposite so that all flavors of x11 give same build
<<
+Description: Themeable, featureful window manager
License: BSD
Homepage: http://www.enlightenment.org/
Maintainer: None <[email protected]>
-Source-MD5: 3902b7c9cfaa8f70ca8079b348de0ed5
Index: enlightenment.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/enlightenment.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- enlightenment.patch 20 Jan 2006 20:34:22 -0000 1.1
+++ enlightenment.patch 12 Jan 2007 20:42:22 -0000 1.2
@@ -1,64 +1,33 @@
-diff -ru enlightenment-0.16.5/dox/file.c
enlightenment-0.16.5-patched/dox/file.c
---- enlightenment-0.16.5/dox/file.c Thu Jun 29 21:29:04 2000
-+++ enlightenment-0.16.5-patched/dox/file.c Sat Oct 13 19:52:12 2001
-@@ -966,7 +966,11 @@
- char *tmp, *lang, *p[3];
- int i;
-
-+#ifdef HAVE_LC_MESSAGES
- if (!(lang = setlocale(LC_MESSAGES, NULL)))
-+#else
-+ if (!(lang = setlocale(LC_ALL, NULL)))
-+#endif
- return 0;
-
- tmp = strdup(fname);
-diff -ru enlightenment-0.16.5/scripts/enlightenment.install.in
enlightenment-0.16.5-patched/scripts/enlightenment.install.in
---- enlightenment-0.16.5/scripts/enlightenment.install.in Thu Sep 14
16:37:51 2000
-+++ enlightenment-0.16.5-patched/scripts/enlightenment.install.in Sat Oct
13 19:55:17 2001
-@@ -24,6 +24,7 @@
- # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- ##############################################################################
-
[EMAIL PROTECTED]@
-
PATH=$PATH:"/usr/local/enlightenment/bin:/usr/enlightenment/bin:/opt/enlightenment/bin:/usr/local/bin:"$EBIN
- export PATH
-
-@@ -68,7 +69,6 @@
- fi
- fi
-
[EMAIL PROTECTED]@
- echo "... Generating login startup files ..."
- echo "#!/bin/sh" >> $HOME"/.xsession"
- echo "# Execute enlightenment. ALWAYS make sure this is at the end of this"
>> $HOME"/.xsession"
-diff -ru enlightenment-0.16.5/src/file.c
enlightenment-0.16.5-patched/src/file.c
---- enlightenment-0.16.5/src/file.c Fri Jul 28 21:13:13 2000
-+++ enlightenment-0.16.5-patched/src/file.c Sat Oct 13 19:52:12 2001
-@@ -1087,7 +1087,11 @@
- char *tmp, *lang, *p[3];
- int i;
-
-+#ifdef HAVE_LC_MESSAGES
- if (!(lang = setlocale(LC_MESSAGES, NULL)))
-+#else
-+ if (!(lang = setlocale(LC_ALL, NULL)))
-+#endif
- return 0;
+diff -Nurd -x'*~' e16-0.16.8.5.orig/src/Makefile.in
e16-0.16.8.5/src/Makefile.in
+--- e16-0.16.8.5.orig/src/Makefile.in 2006-12-16 09:46:36.000000000 -0500
++++ e16-0.16.8.5/src/Makefile.in 2007-01-12 02:40:35.000000000 -0500
+@@ -402,8 +402,8 @@
+ $(LTLIBINTL) \
+ $(LTLIBICONV) \
+ @ecore_libs@ \
+- $(ESD_LIBS) \
+ $(IMLIB2_LIBS) \
++ $(ESD_LIBS) \
+ $(XFT_LIBS) \
+ $(X_PRE_LIBS) \
+ $(X_LIBS) \
+@@ -412,7 +412,7 @@
+ $(E_X_LIBS) \
+ -lX11 -lm
- tmp = strdup(fname);
-diff -ru enlightenment-0.16.5/src/menus.c
enlightenment-0.16.5-patched/src/menus.c
---- enlightenment-0.16.5/src/menus.c Fri Jul 28 19:23:35 2000
-+++ enlightenment-0.16.5-patched/src/menus.c Sat Oct 13 19:52:12 2001
-@@ -1694,7 +1694,11 @@
+-INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/intl
@ecore_cflags@ $(ESD_CFLAGS) $(IMLIB2_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS)
++INCLUDES = -I$(top_builddir) -I$(top_srcdir) @ecore_cflags@ $(IMLIB2_CFLAGS)
$(ESD_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS)
+ all: all-recursive
- EDBUG(5, "CreateMenuFromGnome");
+ .SUFFIXES:
+diff -Nurd -x'*~' e16-0.16.8.5.orig/themes/Makefile.in
e16-0.16.8.5/themes/Makefile.in
+--- e16-0.16.8.5.orig/themes/Makefile.in 2006-12-16 09:46:36.000000000
-0500
++++ e16-0.16.8.5/themes/Makefile.in 2007-01-12 02:41:54.000000000 -0500
+@@ -387,7 +387,6 @@
+ for tf in $(THEME_FILES); do \
+ gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); tar -xmf -); \
+ done
+- -if [ -n "$(USER)" ]; then chown -R $(USER) $(THEME_DIR); else chown -R
root $(THEME_DIR); fi
-+#ifdef HAVE_LC_MESSAGES
- if ((lang = setlocale(LC_MESSAGES, NULL)) != NULL)
-+#else
-+ if ((lang = setlocale(LC_ALL, NULL)) != NULL)
-+#endif
- Esnprintf(name_buf, sizeof(name_buf), "Name[%s]=", lang);
- else
- name_buf[0] = '\0';
+ uninstall-local:
+ -for tf in $(THEME_FILES); do \
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
