diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-01-16 21:51:34 +0100 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-01-16 21:51:34 +0100 |
| commit | 04296af5346bd563268cd5ac22b8ccf4d48f1b36 (patch) | |
| tree | 4bd529c9b6bac283cd4233f5202f9b11f913ebe1 /extra/ede | |
| parent | 90c768d60dc3e9786662d1639f1ae38906fe7225 (diff) | |
| download | nutyx-extra-04296af5346bd563268cd5ac22b8ccf4d48f1b36.tar.gz nutyx-extra-04296af5346bd563268cd5ac22b8ccf4d48f1b36.tar.bz2 nutyx-extra-04296af5346bd563268cd5ac22b8ccf4d48f1b36.tar.xz nutyx-extra-04296af5346bd563268cd5ac22b8ccf4d48f1b36.zip | |
Maj ede#2.0-beta-2, attention utiliser LANG=C
Diffstat (limited to 'extra/ede')
| -rw-r--r-- | extra/ede/.footprint | 20 | ||||
| -rw-r--r-- | extra/ede/.md5sum | 1 | ||||
| -rw-r--r-- | extra/ede/Pkgfile | 13 | ||||
| -rw-r--r-- | extra/ede/ede-2.0-beta.jamconfig.patch | 33 |
4 files changed, 64 insertions, 3 deletions
diff --git a/extra/ede/.footprint b/extra/ede/.footprint index 5a6c1fb72..24738bf55 100644 --- a/extra/ede/.footprint +++ b/extra/ede/.footprint @@ -1,3 +1,12 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/ede/ +-rw-r--r-- root/root etc/xdg/ede/ede-conf.conf +-rw-r--r-- root/root etc/xdg/ede/ede-settings.conf +-rw-r--r-- root/root etc/xdg/ede/ede-startup.conf +-rw-r--r-- root/root etc/xdg/ede/wmanager.conf +drwxr-xr-x root/root etc/xdg/menus/ +-rw-r--r-- root/root etc/xdg/menus/ede-applications.menu drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ede-about @@ -1242,3 +1251,14 @@ drwxr-xr-x root/root usr/share/icons/edeneu/64x64/status/ -rw-r--r-- root/root usr/share/icons/edeneu/64x64/status/printer-error.png -rw-r--r-- root/root usr/share/icons/edeneu/64x64/status/user-trash-full.png -rw-r--r-- root/root usr/share/icons/edeneu/index.theme +drwxr-xr-x root/root usr/share/mime/ +drwxr-xr-x root/root usr/share/mime/packages/ +-rw-r--r-- root/root usr/share/mime/packages/x-fluid.xml +drwxr-xr-x root/root usr/usr/ +drwxr-xr-x root/root usr/usr/share/ +drwxr-xr-x root/root usr/usr/share/dbus-1/ +drwxr-xr-x root/root usr/usr/share/dbus-1/services/ +-rw-r--r-- root/root usr/usr/share/dbus-1/services/org.equinoxproject.Launch.service +-rw-r--r-- root/root usr/usr/share/dbus-1/services/org.equinoxproject.StartupNotify.service +drwxr-xr-x root/root usr/usr/share/xsessions/ +-rw-r--r-- root/root usr/usr/share/xsessions/ede.desktop diff --git a/extra/ede/.md5sum b/extra/ede/.md5sum index 04d8f413d..52b0e2107 100644 --- a/extra/ede/.md5sum +++ b/extra/ede/.md5sum @@ -1,3 +1,4 @@ 60aec5c97feea9e72c0edb5a1928b67c ede-2.0-beta.c++.patch 46d056e6e2122f8d3e204535c28a0f6c ede-2.0-beta.edelibinclude.patch +8ea3294fed5d2d9090b509cd8861a4e8 ede-2.0-beta.jamconfig.patch 087584345140104a935ca2da3a2ea651 ede-2.0-beta.tar.gz diff --git a/extra/ede/Pkgfile b/extra/ede/Pkgfile index 30473f739..fba05b26c 100644 --- a/extra/ede/Pkgfile +++ b/extra/ede/Pkgfile @@ -6,15 +6,22 @@ name=ede version=2.0-beta -release=1 +release=2 source=(http://downloads.sourceforge.net/project/ede/$name/2.0-beta/$name-$version.tar.gz\ - ede-2.0-beta.c++.patch ede-2.0-beta.edelibinclude.patch) + ede-2.0-beta.c++.patch \ + ede-2.0-beta.edelibinclude.patch \ + ede-2.0-beta.jamconfig.patch ) build() { cd $name-* patch -Np1 -i ../ede-2.0-beta.c++.patch patch -Np1 -i ../ede-2.0-beta.edelibinclude.patch ./autogen.sh ./configure --prefix=/usr +patch -Np1 -i ../ede-2.0-beta.jamconfig.patch jam -prefix=$PKG/usr jam install +prefix=$PKG/usr sysconfdir=$PKG/etc InstallData=$PKG jam install +mv $PKG/usr/share/mime/packages . +rm -r $PKG/usr/share/mime +mkdir $PKG/usr/share/mime +mv packages $PKG/usr/share/mime/ } diff --git a/extra/ede/ede-2.0-beta.jamconfig.patch b/extra/ede/ede-2.0-beta.jamconfig.patch new file mode 100644 index 000000000..4aef16fa6 --- /dev/null +++ b/extra/ede/ede-2.0-beta.jamconfig.patch @@ -0,0 +1,33 @@ +--- ede-2.0-beta/Jamconfig 2010-01-16 20:57:34.000000000 +0100 ++++ ede-2.0-beta/Jamconfig.new 2010-01-16 20:58:46.000000000 +0100 +@@ -48,8 +48,8 @@ + PREFIX ?= "$(prefix)" ; + EDE_BIN_DIR ?= "$(bindir)" ; + EDE_DATA_DIR ?= "$(datadir)" ; +-EDE_CONFIG_DIR ?= "/etc/xdg/$(EDE_PREFIX_SUBDIR)" ; +-EDE_MENU_DIR ?= "/etc/xdg/menus" ; # use XDG default for menu dir ++EDE_CONFIG_DIR ?= "$(sysconfdir)/xdg/$(EDE_PREFIX_SUBDIR)" ; ++EDE_MENU_DIR ?= "$(sysconfdir)/xdg/menus" ; # use XDG default for menu dir + EDE_ICON_DIR ?= "$(EDE_DATA_DIR)/icons" ; + EDE_MIME_DIR ?= "$(EDE_DATA_DIR)/mime" ; # use XDG mime path + EDE_DOC_DIR ?= "$(docdir)/ede-$(EDE_VERSION)" ; +@@ -134,7 +134,7 @@ + PTHREAD_LIBS ?= ; + } + +-DBUS_SERVICE_DIR ?= /usr/share/dbus-1/services ; ++DBUS_SERVICE_DIR ?= $(prefix)/usr/share/dbus-1/services ; + + # do not touch this + JAMCONFIG_READ = "yes" ; +--- ede-2.0-beta/data/Jamfile 2009-10-08 15:44:25.000000000 +0200 ++++ ede-2.0-beta/data/Jamfile.new 2010-01-16 20:58:55.000000000 +0100 +@@ -16,7 +16,7 @@ + InstallEdeConfigFiles $(CONFS) ; + + # install entry for login/desktop managers +-InstallData /usr/share/xsessions : ede.desktop ; ++InstallData $(prefix)/usr/share/xsessions : ede.desktop ; + Clean distclean : ede.desktop ; + + SubInclude TOP data mime-types ; |