Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=1b9b18cdf4c3df4371a57d011d5379f4f5b745e5

commit 1b9b18cdf4c3df4371a57d011d5379f4f5b745e5
Author: James Buren <[email protected]>
Date:   Wed Sep 7 01:54:58 2011 -0500

enna-0.4.1-5-i686
* rebuild with libplayer & libvalhalla & elementary

diff --git a/source/xmultimedia-extra/enna/FrugalBuild 
b/source/xmultimedia-extra/enna/FrugalBuild
index 18a0d0e..35bae5a 100644
--- a/source/xmultimedia-extra/enna/FrugalBuild
+++ b/source/xmultimedia-extra/enna/FrugalBuild
@@ -5,23 +5,25 @@ pkgname=enna
pkgver=0.4.1
pkgrel=5
pkgdesc="A Powerful and Open Media Center"
-depends=('libplayer' 'libvalhalla>=2.0.0-2' 'dbus' 'eet' 'evas' 'ecore>=1.0.0' 
'embryo' \
-       'edje>=0.9.99.49898' 'elementary>=0.7.0.49898' 'eina')
+depends=('libplayer>=2.0.1-2' 'libvalhalla>=2.0.0-5' 'dbus' 'eet' 'evas' 
'ecore>=1.0.0' 'embryo' \
+       'edje>=0.9.99.49898' 'elementary>=0.7.0.55225-2' 'eina')
url=http://enna.geexbox.org/
urldl=http://enna.geexbox.org/releases
replaces=('eclair' 'rage')
#source=($urldl/$pkgname-$pkgver.tar.bz2)
#use a snapshot the time to geebox release a new archive
#stable release don't works with new e17
-source=(http://ftp.frugalware.org/pub/other/people/bouleetbil/sources/$pkgname-$pkgver.tar.gz)
+source=(http://ftp.frugalware.org/pub/other/people/bouleetbil/sources/$pkgname-$pkgver.tar.gz
 $pkgname-curl.patch)
up2date="Flasttar $urldl"
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
-sha1sums=('b63fde36a3d0b16e845291eed814a7e57e9e1dd0')
+sha1sums=('b63fde36a3d0b16e845291eed814a7e57e9e1dd0' \
+          '1e7b8f894a0db8e8ce5487df268f38c12d0ab099')

build() {
Fcd
+       Fsed "eina-0" "eina" configure.ac
Fsed "0.9.93.063" "0.9.9.49539" configure.ac
Fautoreconf
Fbuild
diff --git a/source/xmultimedia-extra/enna/enna-curl.patch 
b/source/xmultimedia-extra/enna/enna-curl.patch
new file mode 100644
index 0000000..fe23a27
--- /dev/null
+++ b/source/xmultimedia-extra/enna/enna-curl.patch
@@ -0,0 +1,49 @@
+diff -aur a/src/bin/url_utils.c b/src/bin/url_utils.c
+--- a/src/bin/url_utils.c      2011-09-06 16:11:10.416405202 -0500
++++ b/src/bin/url_utils.c      2011-09-06 16:11:52.184404115 -0500
+@@ -28,7 +28,6 @@
+ #include <unistd.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <Ecore_File.h>
+diff -aur a/src/modules/activity/photo/photo_slideshow_view.c 
b/src/modules/activity/photo/photo_slideshow_view.c
+--- a/src/modules/activity/photo/photo_slideshow_view.c        2011-09-06 
16:11:10.417405202 -0500
++++ b/src/modules/activity/photo/photo_slideshow_view.c        2011-09-07 
01:48:08.324931631 -0500
+@@ -129,7 +129,6 @@
+ {
+     Smart_Data *sd = data;
+     evas_object_show(sd->controls);
+-    elm_notify_timer_init(sd->controls);
+ }
+
+ static void
+diff -aur a/src/modules/browser/valhalla/valhalla.c 
b/src/modules/browser/valhalla/valhalla.c
+--- a/src/modules/browser/valhalla/valhalla.c  2011-09-06 16:11:10.419405202 
-0500
++++ b/src/modules/browser/valhalla/valhalla.c  2011-09-07 01:26:21.145980232 
-0500
+@@ -282,9 +282,9 @@
+     valhalla_db_stmt_t *stmt;
+     const valhalla_db_metares_t *metares;
+     valhalla_db_restrict_t r1 =
+-        VALHALLA_DB_RESTRICT_STR(EQUAL, "title", NULL, priority);
++        VALHALLA_DB_RESTRICT_STR(EQUAL, "title", NULL, NULL, priority);
+     valhalla_db_restrict_t r2 =
+-        VALHALLA_DB_RESTRICT_STR(EQUAL, "track", NULL, priority);
++        VALHALLA_DB_RESTRICT_STR(EQUAL, "track", NULL, NULL, priority);
+     unsigned int i;
+
+     struct {
+@@ -326,9 +326,9 @@
+     valhalla_db_stmt_t *stmt;
+     const valhalla_db_metares_t *metares;
+     valhalla_db_item_t search =
+-        VALHALLA_DB_SEARCH_TEXT(item->meta, NIL, item->priority);
++        VALHALLA_DB_SEARCH_TEXT(item->meta, NIL, NULL, item->priority);
+     valhalla_db_restrict_t r1 =
+-        VALHALLA_DB_RESTRICT_STR(IN, id->meta, id->data, item->priority);
++        VALHALLA_DB_RESTRICT_STR(IN, id->meta, id->data, NULL, 
item->priority);
+     valhalla_db_restrict_t *r = NULL;
+
+     if (tree_meta[id->it].level > LEVEL_ONE)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to