[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

Stefan Wold ratler at lunar-linux.org
Wed Oct 29 22:42:45 CET 2014


commit f380ceb745f051d3b281ef7a2933c56ac1a966fd
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Wed, 29 Oct 2014 22:42:36 +0100
URL: https://github.com/lunar-linux/moonbase-other/commit/f380ceb745f051d3b281ef7a2933c56ac1a966fd

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  audio/gmpc-plugins/DEPENDS     | +1/-1     
  chat/telepathy-glib/DETAILS    | +3/-3     
  compilers/camlp4/BUILD         | +2/-0     
  compilers/camlp4/DEPENDS       | +1/-0     
  compilers/camlp4/DETAILS       | +15/-0    
  compilers/camlp5/BUILD         | +0/-6     
  compilers/camlp5/DETAILS       | +4/-7     
  compilers/coq/DETAILS          | +3/-3     
  compilers/coq/PRE_BUILD        | +3/-0     
  compilers/ruby/DETAILS         | +3/-3     
  crypto/xca/BUILD               | +3/-7     
  crypto/xca/DETAILS             | +5/-2     
  docs/hevea/DETAILS             | +3/-3     
  graphics/gimp/DEPENDS          | +1/-1     
  libs/eet/DEPENDS               | +1/-0     
  libs/eet/DETAILS               | +16/-0    
  libs/eina/DETAILS              | +24/-0    
  libs/lablgtk/DEPENDS           | +2/-0     
  libs/lablgtk/DETAILS           | +5/-4     
  libs/libzeitgeist/BUILD        | +7/-0     
  utils/zeitgeist/BUILD          | +6/-5     
  utils/zeitgeist/DEPENDS        | +8/-0     
  utils/zeitgeist/DETAILS        | +4/-4     
  web/firefox-bin/DETAILS        | +3/-3     
  web/firefox-bin/DETAILS.x86_64 | +3/-3     
  web/midori/DEPENDS             | +1/-0     
  web/midori/DETAILS             | +0/-1     
  27 files changed, 127 insertions(+), 56 deletions(-)

--- a/audio/gmpc-plugins/DEPENDS
+++ b/audio/gmpc-plugins/DEPENDS
@@ -6,5 +6,5 @@ optional_depends taglib "--enable-tagedit" "--disable-tagedit" "build tagedit pl
 optional_depends lirc "--enable-lirc" "--disable-lirc" "build lirc plugin"
 optional_depends avahi "--enable-avahi --enable-libnotify" "--disable-avahi --disable-libnotify" "build avahi plugin"
 optional_depends libmicrohttpd "--enable-mserver" "--disable-mserver" "build mserver plugin"
-optional_depends webkit "--enable-wikipedia" "--disable-wikipedia" "build wikipedia plugin"
+optional_depends webkitgtk3 "--enable-wikipedia" "--disable-wikipedia" "build wikipedia plugin"
 optional_depends dbus-glib "--enable-awn --enable-mmkeys" "--disable-awn --disable-mmkeys" "build mmkeys and awn plugins"
--- a/chat/telepathy-glib/DETAILS
+++ b/chat/telepathy-glib/DETAILS
@@ -1,11 +1,11 @@
           MODULE=telepathy-glib
-         VERSION=0.24.0
+         VERSION=0.24.1
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://telepathy.freedesktop.org/releases/$MODULE
-      SOURCE_VFY=sha1:43a3e9f3e08725b689aba3baa487c9711d436888
+      SOURCE_VFY=sha1:7451f3d3a7b82e2c4aba87fae77fd079577443a2
         WEB_SITE=http://telepathy.freedesktop.org/wiki
          ENTERED=20071029
-         UPDATED=20140412
+         UPDATED=20141028
            SHORT="unified framework for realtime conversations"
 
 cat << EOF
--- /dev/null
+++ b/compilers/camlp4/BUILD
@@ -0,0 +1,2 @@
+ ./configure $OPTS &&
+ default_make
--- /dev/null
+++ b/compilers/camlp4/DEPENDS
@@ -0,0 +1 @@
+depends ocaml
--- /dev/null
+++ b/compilers/camlp4/DETAILS
@@ -0,0 +1,15 @@
+          MODULE=camlp4
+         VERSION=4.02.0+1
+          SOURCE=$MODULE-$VERSION.tar.gz
+ SOURCE_URL_FULL=https://github.com/ocaml/camlp4/archive/$VERSION.tar.gz
+      SOURCE_VFY=sha256:f626486ad4b6872e22baf55edcdbc3023f4c721d18f6808a7d59a01f2571a500
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-${VERSION/+/-}
+        WEB_SITE=https://github.com/ocaml/camlp4
+         ENTERED=20141029
+         UPDATED=20141029
+           SHORT="Camlp4 is a preprocessor-pretty-printer of OCaml."
+cat << EOF
+Camlp4 is a preprocessor-pretty-printer of OCaml that lives
+independently from (and is incompatible with) the Camlp5 project.
+EOF
+
--- a/compilers/camlp5/BUILD
+++ b/compilers/camlp5/BUILD
@@ -1,10 +1,4 @@
-(
-
- patch_it $SOURCE2 0 &&
-
  ./configure -prefix /usr -mandir /usr/share/man/man1 $OPTS &&
  make world.opt  &&
  prepare_install &&
  make install
-
-) > $C_FIFO 2>&1
--- a/compilers/camlp5/DETAILS
+++ b/compilers/camlp5/DETAILS
@@ -1,14 +1,11 @@
           MODULE=camlp5
-         VERSION=6.08
+         VERSION=6.12
           SOURCE=$MODULE-$VERSION.tgz
-	 SOURCE2=patch-$VERSION-1
       SOURCE_URL=http://pauillac.inria.fr/~ddr/camlp5/distrib/src/
-     SOURCE2_URL=$SOURCE_URL
-      SOURCE_VFY=sha1:6cdfc29a9bd23dcee7775996ac29f2a457119d4b
-     SOURCE2_VFY=sha1:a55556c29f6248023a93d5606c788ab3ca302489
-        WEB_SITE=http://pauillac.inria.fr/~ddr/camlp5/
+      SOURCE_VFY=sha256:b716c8b248289205bc76823000bc0b0988517cfcfd9c2eb1a3c43cc2cd7d5c02
+        WEB_SITE=http://camlp5.gforge.inria.fr
          ENTERED=20110829
-         UPDATED=20130322
+         UPDATED=20141010
            SHORT="Camlp5 is a preprocessor-pretty-printer of OCaml."
 cat << EOF
 Camlp5 is a preprocessor-pretty-printer of OCaml.
--- a/compilers/coq/DETAILS
+++ b/compilers/coq/DETAILS
@@ -1,11 +1,11 @@
           MODULE=coq
-         VERSION=8.4pl2
+         VERSION=8.4pl5
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://coq.inria.fr/distrib/V${VERSION}/files/
-      SOURCE_VFY=sha1:adcef430b8e27663e8ea075e646112f7d4d51fa6
+      SOURCE_VFY=sha256:35815ab78a58d72799eacaab155427620ab071677882ca6c98d7bfec97d25245
         WEB_SITE=http://coq.inria.fr/
          ENTERED=20110829
-         UPDATED=20130504
+         UPDATED=20141029
            SHORT="COQ is an interactive proof assistant"
 
 cat << EOF
--- /dev/null
+++ b/compilers/coq/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+
+sedit 's/{w|/{ w|/' kernel/univ.ml
--- a/compilers/ruby/DETAILS
+++ b/compilers/ruby/DETAILS
@@ -1,13 +1,13 @@
           MODULE=ruby
-         VERSION=2.1.3
+         VERSION=2.1.4
           SOURCE=$MODULE-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$MODULE/${VERSION%.*}
    SOURCE_URL[1]=http://gd.tuwien.ac.at/languages/$MODULE
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha256:36ce72f84ae4129f6cc66e33077a79d87b018ea7bf1dbc3d353604bf006f76d6
+      SOURCE_VFY=sha256:f37f11a8c75ab9215bb9f61246ef98e0e57e1409f0872e5cf59033edcf5b8d2a
         WEB_SITE=http://www.ruby-lang.org/en
          ENTERED=20020106
-         UPDATED=20140920
+         UPDATED=20141029
            SHORT="A scripting language"
 
 cat << EOF
--- a/crypto/xca/BUILD
+++ b/crypto/xca/BUILD
@@ -1,10 +1,6 @@
-(
 
-  sedit 's#for lib in lib lib64 lib32 out; do#for lib in lib lib64 lib32 lib/qt4 out; do#' configure  &&
-  sedit 's#prefix=${prefix:=/usr/local}#prefix=${prefix:=/usr}#' configure  &&
-
-  ./configure  &&
+  patch_it $SOURCE2 1 &&
 
+  qmake -o makefile &&
+  prefix=/usr docdir=/usr/share/doc/xca ./configure &&
   default_make
-
-) > $C_FIFO 2>&1
--- a/crypto/xca/DETAILS
+++ b/crypto/xca/DETAILS
@@ -1,13 +1,16 @@
           MODULE=xca
          VERSION=0.9.3
           SOURCE=${MODULE}-${VERSION}.tar.gz
+         SOURCE2=0001-Fix-for-openssl-1.0.1i.patch
       SOURCE_URL=$SFORGE_URL/$MODULE
+     SOURCE2_URL=http://sourceforge.net/p/xca/patches/14/attachment/
       SOURCE_VFY=sha1:3d9bcadb7064316b084532472229da9d4b0631e3
+     SOURCE2_VFY=sha1:64f3c58ca641c1461a845e97895c2930c224d51e
         WEB_SITE=http://xca.sourceforge.net/
          ENTERED=20120513
-         UPDATED=20120513
+         UPDATED=20141029
            SHORT="Certificate and Key management interface"
-cat <<EOF
+cat << EOF
 This application is intended for creating and managing X.509
 certificates, certificate requests, RSA, DSA and EC private
 keys, Smartcards and CRLs. Everything that is needed for a CA is
--- a/docs/hevea/DETAILS
+++ b/docs/hevea/DETAILS
@@ -1,11 +1,11 @@
           MODULE=hevea
-         VERSION=2.04
+         VERSION=2.18
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://hevea.inria.fr/distri/
-      SOURCE_VFY=sha1:f3d333bea7cda67cd95ca39f0039d82d1f732719
+      SOURCE_VFY=sha256:be665556a62cc80d6e159c59b7f2e5137c0e104f49aa54eaf7b025935150feaf
         WEB_SITE=http://hevea.inria.fr/
          ENTERED=20121013
-         UPDATED=20130322
+         UPDATED=20141010
            SHORT="LaTeX to HTML translator"
 cat << EOF
 HeVeA is a LaTeX to html translator.
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -35,7 +35,7 @@ optional_depends  "gvfs"                    \
                   "--without-gvfs"          \
                   "for remote file support"
 
-optional_depends  "webkit"                  \
+optional_depends  "webkitgtk3"              \
                   ""                        \
                   "--without-webkit"        \
                   "for help browser support"
--- /dev/null
+++ b/libs/eet/DEPENDS
@@ -0,0 +1 @@
+depends eina
--- /dev/null
+++ b/libs/eet/DETAILS
@@ -0,0 +1,16 @@
+          MODULE=eet
+         VERSION=1.7.10
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://download.enlightenment.org/releases/
+      SOURCE_VFY=sha1:3ca915debfb9f563785424485b0f5c74d6caa0da
+        WEB_SITE=http://enlightenment.org/p.php?p=about/efl/eet
+         ENTERED=20141024
+         UPDATED=20141024
+           SHORT="data encoding, decoding and storage library"
+
+cat << EOF
+Eet is primarily a data encoding, decoding and storage library. It is meant to be very programmer 
+friendly, removing lots of work from loading and saving data held in data structures. It can store 
+multiple chunks of data in a single file and random-access retrieve the data very efficiently, 
+encode and decode image data and any other kind of data.
+EOF
--- /dev/null
+++ b/libs/eina/DETAILS
@@ -0,0 +1,24 @@
+          MODULE=eina
+         VERSION=1.7.10
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://download.enlightenment.org/releases/
+      SOURCE_VFY=sha1:f8c254a9029ef73fa4ee4b4ca88094acbb7597b9
+        WEB_SITE=http://enlightenment.org/
+         ENTERED=20141024
+         UPDATED=20141024
+           SHORT="providing data structure utilities for EFL"
+
+cat << EOF
+Eina is a library providing data structure utilities for EFL that are meant
+to be lean, efficient and tailored to EFL's needs. This saves each
+library implementing its own custom datatype handling and duplicating
+the code. Some of the datatypes handles are:
+  Arrays (variable sized, including inline members)
+  Hash tables
+  Inlined linked lists
+  Linked lists
+  Matricies
+  Quadtrees
+  Red/black trees
+  Stringbuffers (expandable string buffers)
+EOF
--- a/libs/lablgtk/DEPENDS
+++ b/libs/lablgtk/DEPENDS
@@ -1,5 +1,7 @@
 depends ocaml
 
+depends camlp4
+
 optional_depends  "libglade"  ""  "--without-glade"  "for libglade support"
 optional_depends  "librsvg"   ""  "--without-rsvg"   "for librsvg support"
 
--- a/libs/lablgtk/DETAILS
+++ b/libs/lablgtk/DETAILS
@@ -1,11 +1,12 @@
           MODULE=lablgtk
-         VERSION=2.16.0
+         VERSION=2.18.3
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=https://forge.ocamlcore.org/frs/download.php/979/
-      SOURCE_VFY=sha1:3dec411a410fbb38d6e2e5a43a4ebfb2e407e7e6
+      SOURCE_URL=https://forge.ocamlcore.org/frs/download.php/1456/
+      SOURCE_VFY=sha256:deedce9f934821196f9a4d0fc85cad12f59ec82298b908d12cf76cb015d13939
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-2.18.2
         WEB_SITE=http://lablgtk.forge.ocamlcore.org/
          ENTERED=20050109
-         UPDATED=20121013
+         UPDATED=20141029
            SHORT="Objective Caml interface to gtk+"
 PSAFE=no
 
--- /dev/null
+++ b/libs/libzeitgeist/BUILD
@@ -0,0 +1,7 @@
+
+   sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+       -e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
+       -i configure.ac &&
+
+  autoreconf -fi &&
+  default_build
--- a/utils/zeitgeist/BUILD
+++ b/utils/zeitgeist/BUILD
@@ -1,7 +1,8 @@
-(
 
-  sedit "156,163d" configure.ac &&
-  autoreconf -i &&
-  default_build
+  sedit "271,278d" configure.ac &&
+
+  autoreconf -fi &&
 
-) > $C_FIFO 2>&1
+  OPTS+=" --enable-datahub --enable-fts --enable-explain-queries --disable-telepathy" &&
+
+  default_build
--- a/utils/zeitgeist/DEPENDS
+++ b/utils/zeitgeist/DEPENDS
@@ -1,4 +1,12 @@
+depends sqlite
 depends rdflib
 depends XML-Parser
 depends raptor
 depends xapian-core
+depends vala
+depends libzeitgeist
+
+optional_depends "gobject-introspection" "--enable-introspection" "--disable-introspection" "For introspection support" y
+
+# Borks the make
+#optional_depends "telepathy-glib"        "--enable-telepathy"     "--disable-telepathy"     "For telepathy glib bindings support" y
--- a/utils/zeitgeist/DETAILS
+++ b/utils/zeitgeist/DETAILS
@@ -1,11 +1,11 @@
           MODULE=zeitgeist
-         VERSION=0.9.5
-          SOURCE=$MODULE-$VERSION.tar.bz2
+         VERSION=0.9.14
+          SOURCE=$MODULE-$VERSION.tar.xz
       SOURCE_URL=https://launchpad.net/zeitgeist/${VERSION%.*}/$VERSION/+download/
-      SOURCE_VFY=sha1:86d5b37a3bb6ebc191c73337ad30bd587e4fa8e4
+      SOURCE_VFY=sha1:aa925457f14761d8c2759d98d48d701ba87e59f6
         WEB_SITE=http://zeitgeist-project.com/about/
          ENTERED=20110411
-         UPDATED=20121002
+         UPDATED=20141029
            SHORT="service which logs the users? activities and events"
 
 cat << EOF
--- a/web/firefox-bin/DETAILS
+++ b/web/firefox-bin/DETAILS
@@ -1,13 +1,13 @@
           MODULE=firefox-bin
-         VERSION=33.0.1
+         VERSION=33.0.2
           SOURCE=firefox-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$VERSION/linux-i686/en-US
    SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/en-US
    SOURCE_URL[2]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/en-US
-      SOURCE_VFY=sha256:9f25ae5cd71d6b3c06621a8ff720a4f055256ebc62b1fb772bbb8d86ff889567
+      SOURCE_VFY=sha256:8aa227374a3e65c06b97663940b439fc9af85cdde446096dfe88b55208519a7d
         WEB_SITE=http://www.mozilla.org/projects/firefox
          ENTERED=20091207
-         UPDATED=20141026
+         UPDATED=20141029
          ARCHIVE=off
            SHORT="A speedy, full-featured web browser"
 
--- a/web/firefox-bin/DETAILS.x86_64
+++ b/web/firefox-bin/DETAILS.x86_64
@@ -1,13 +1,13 @@
           MODULE=firefox-bin
-         VERSION=33.0.1
+         VERSION=33.0.2
           SOURCE=firefox-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$VERSION/linux-x86_64/en-US
    SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/firefox/releases/$VERSION/linux-x86_64/en-US
    SOURCE_URL[2]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/firefox/releases/$VERSION/linux-x86_64/en-US
-      SOURCE_VFY=sha256:47941f905de91b7c0e71e802e3dda07774bb4e762ee0ec120fbb601332cba373
+      SOURCE_VFY=sha256:5d577a970b2adc81dcca0827a828bd8539577bf68f4d8ee4e635a0d983acb638
         WEB_SITE=http://www.mozilla.org/projects/firefox
          ENTERED=20091207
-         UPDATED=20141026
+         UPDATED=20141029
          ARCHIVE=off
            SHORT="A speedy, full-featured web browser"
 
--- a/web/midori/DEPENDS
+++ b/web/midori/DEPENDS
@@ -6,6 +6,7 @@ depends  libxml2
 depends  libsoup
 depends  sqlite
 depends  libnotify4
+depends  gsettings-desktop-schemas
 
 optional_depends gtk-doc    "-DUSE_APIDOCS=1"   "-DUSE_APIDOCS=0"   "build API documentation"
 optional_depends zeitgeist  "-DUSE_ZEITGEIST=1" "-DUSE_ZEITGEIST=0" "for zeitgeist support"
--- a/web/midori/DETAILS
+++ b/web/midori/DETAILS
@@ -7,7 +7,6 @@
          ENTERED=20070921
          UPDATED=20140704
            SHORT="A lightweight WebKit/Gtk+-2 based browser"
-
 cat << EOF
 Midori is a lightweight web browser.
   * Full integration with GTK+2




More information about the Lunar-commits mailing list