Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

14 files changed, 86 insertions, 20 deletions

diff --git a/extra/conky/Pkgfile b/extra/conky/Pkgfile
index 6d9fedd65..bdc5dfb14 100644
--- a/extra/conky/Pkgfile
+++ b/extra/conky/Pkgfile
@@ -2,12 +2,12 @@
 # URL: http://conky.sourceforge.net
 # Maintainer: NuTyX core team
 # Packager: geantbrun at gmail dot com
-# Depends on: lua, curl, imlib2
+# Depends on: lua, curl, imlib2, xorg-libxdamage, xorg-libxft
 # Run on: lua,curl
 
 name=conky
 version=1.8.1
-release=1
+release=2
 source=(http://freefr.dl.sourceforge.net/sourceforge/conky/$name-$version.tar.gz)
 
 build() {
diff --git a/extra/gobject-introspection/.md5sum.i686 b/extra/gobject-introspection/.md5sum.i686
index f3b4f52fe..99c60e6d5 100644
--- a/extra/gobject-introspection/.md5sum.i686
+++ b/extra/gobject-introspection/.md5sum.i686
@@ -1 +1 @@
-6622131845e0908415345dc67b4a3775  gobject-introspection-0.10.2.tar.bz2
+39147ea80600ee33efaa299439c24713  gobject-introspection-0.10.4.tar.bz2
diff --git a/extra/gobject-introspection/.md5sum.x86_64 b/extra/gobject-introspection/.md5sum.x86_64
index f3b4f52fe..99c60e6d5 100644
--- a/extra/gobject-introspection/.md5sum.x86_64
+++ b/extra/gobject-introspection/.md5sum.x86_64
@@ -1 +1 @@
-6622131845e0908415345dc67b4a3775  gobject-introspection-0.10.2.tar.bz2
+39147ea80600ee33efaa299439c24713  gobject-introspection-0.10.4.tar.bz2
diff --git a/extra/gobject-introspection/Pkgfile b/extra/gobject-introspection/Pkgfile
index 1764d733c..cf0954af1 100644
--- a/extra/gobject-introspection/Pkgfile
+++ b/extra/gobject-introspection/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: cairo
 
 name=gobject-introspection
-version=0.10.2
+version=0.10.4
 release=1
 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
 
diff --git a/extra/pekwm/.footprint.i686 b/extra/pekwm/.footprint.i686
index bb545e66f..37e1a667b 100644
--- a/extra/pekwm/.footprint.i686
+++ b/extra/pekwm/.footprint.i686
@@ -19,5 +19,38 @@ drwxr-xr-x	root/root	usr/share/pekwm/scripts/
 -rwxr-xr-x	root/root	usr/share/pekwm/scripts/pekwm_themeset.sh
 -rwxr-xr-x	root/root	usr/share/pekwm/scripts/pekwm_ws_menu.sh
 drwxr-xr-x	root/root	usr/share/pekwm/themes/
+drwxr-xr-x	root/root	usr/share/pekwm/themes/default-plain/
+-rw-r--r--	root/root	usr/share/pekwm/themes/default-plain/theme
 drwxr-xr-x	root/root	usr/share/pekwm/themes/default/
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/arrow.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/arrow_focus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-left.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-left_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-right.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-right_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button_hover.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button_press.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/item.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/item_focus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/left-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/left-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/menu-bottom.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/menu-bottom_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/menuline.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/right-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/right-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/tab-separator.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/tab-separator_unfocus.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/theme
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/title.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/title_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-left.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-left_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-right.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-right_unfocus.png
diff --git a/extra/pekwm/.footprint.x86_64 b/extra/pekwm/.footprint.x86_64
index bb545e66f..37e1a667b 100644
--- a/extra/pekwm/.footprint.x86_64
+++ b/extra/pekwm/.footprint.x86_64
@@ -19,5 +19,38 @@ drwxr-xr-x	root/root	usr/share/pekwm/scripts/
 -rwxr-xr-x	root/root	usr/share/pekwm/scripts/pekwm_themeset.sh
 -rwxr-xr-x	root/root	usr/share/pekwm/scripts/pekwm_ws_menu.sh
 drwxr-xr-x	root/root	usr/share/pekwm/themes/
+drwxr-xr-x	root/root	usr/share/pekwm/themes/default-plain/
+-rw-r--r--	root/root	usr/share/pekwm/themes/default-plain/theme
 drwxr-xr-x	root/root	usr/share/pekwm/themes/default/
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/arrow.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/arrow_focus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-left.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-left_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-right.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-right_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button_hover.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button_press.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/item.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/item_focus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/left-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/left-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/menu-bottom.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/menu-bottom_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/menuline.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/right-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/right-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/tab-separator.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/tab-separator_unfocus.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/theme
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/title.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/title_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-border.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-border_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-left.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-left_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-right.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-right_unfocus.png
diff --git a/extra/pekwm/.md5sum.i686 b/extra/pekwm/.md5sum.i686
index 77c544311..35a355458 100644
--- a/extra/pekwm/.md5sum.i686
+++ b/extra/pekwm/.md5sum.i686
@@ -1,2 +1,2 @@
-13aab792a5eb25673f4e61d8a0016edb  pekwm-0.1.9.tar.bz2
+1f7f9ed32cc03f565a3ad30fd6045c1f  pekwm-0.1.12.tar.gz
 4133fb5eb7113d01ce53c4eb812dbb34  pekwm.desktop
diff --git a/extra/pekwm/.md5sum.x86_64 b/extra/pekwm/.md5sum.x86_64
index 77c544311..35a355458 100644
--- a/extra/pekwm/.md5sum.x86_64
+++ b/extra/pekwm/.md5sum.x86_64
@@ -1,2 +1,2 @@
-13aab792a5eb25673f4e61d8a0016edb  pekwm-0.1.9.tar.bz2
+1f7f9ed32cc03f565a3ad30fd6045c1f  pekwm-0.1.12.tar.gz
 4133fb5eb7113d01ce53c4eb812dbb34  pekwm.desktop
diff --git a/extra/pekwm/Pkgfile b/extra/pekwm/Pkgfile
index d77b0c31c..056dbc83a 100644
--- a/extra/pekwm/Pkgfile
+++ b/extra/pekwm/Pkgfile
@@ -6,11 +6,11 @@
 # Run on: imlib2
  
 name=pekwm
-version=0.1.9
+version=0.1.12
 release=1
  
-source=(http://pekwm.org/projects/3/files/pekwm-0.1.9.tar.bz2\
- pekwm.desktop)
+source=(http://pekwm.org/projects/3/files/$name-$version.tar.gz \
+ 	pekwm.desktop)
  
  
 build() {
@@ -22,7 +22,7 @@ build() {
 		--enable-xft \
 		--enable-pcre \
 		--enable-imlib2 \
-               --disable-xft \
+                --disable-xft \
 		--disable-xinerama
 
 	make
diff --git a/extra/poppler/.footprint.i686 b/extra/poppler/.footprint.i686
index 3c2039943..d56f68086 100644
--- a/extra/poppler/.footprint.i686
+++ b/extra/poppler/.footprint.i686
@@ -143,9 +143,9 @@ lrwxrwxrwx	root/root	usr/lib/libpoppler-cpp.so -> libpoppler-cpp.so.0.2.0
 lrwxrwxrwx	root/root	usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.2.0
 -rwxr-xr-x	root/root	usr/lib/libpoppler-cpp.so.0.2.0
 -rwxr-xr-x	root/root	usr/lib/libpoppler.la
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so.12 -> libpoppler.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libpoppler.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.13.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so.13 -> libpoppler.so.13.0.0
+-rwxr-xr-x	root/root	usr/lib/libpoppler.so.13.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cairo.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cpp.pc
diff --git a/extra/poppler/.footprint.x86_64 b/extra/poppler/.footprint.x86_64
index 3c2039943..d56f68086 100644
--- a/extra/poppler/.footprint.x86_64
+++ b/extra/poppler/.footprint.x86_64
@@ -143,9 +143,9 @@ lrwxrwxrwx	root/root	usr/lib/libpoppler-cpp.so -> libpoppler-cpp.so.0.2.0
 lrwxrwxrwx	root/root	usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.2.0
 -rwxr-xr-x	root/root	usr/lib/libpoppler-cpp.so.0.2.0
 -rwxr-xr-x	root/root	usr/lib/libpoppler.la
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so.12 -> libpoppler.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libpoppler.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.13.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so.13 -> libpoppler.so.13.0.0
+-rwxr-xr-x	root/root	usr/lib/libpoppler.so.13.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cairo.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cpp.pc
diff --git a/extra/poppler/.md5sum.i686 b/extra/poppler/.md5sum.i686
index 16de99fc8..3792593dd 100644
--- a/extra/poppler/.md5sum.i686
+++ b/extra/poppler/.md5sum.i686
@@ -1,2 +1,2 @@
-0e68e4a894a4234d5468560bcd79baa9  poppler-0.16.2.tar.gz
+42227f1a1498089213a07533596b22f4  poppler-0.16.3.tar.gz
 f3a1afa9218386b50ffd262c00b35b31  poppler-data-0.4.4.tar.gz
diff --git a/extra/poppler/.md5sum.x86_64 b/extra/poppler/.md5sum.x86_64
index 16de99fc8..3792593dd 100644
--- a/extra/poppler/.md5sum.x86_64
+++ b/extra/poppler/.md5sum.x86_64
@@ -1,2 +1,2 @@
-0e68e4a894a4234d5468560bcd79baa9  poppler-0.16.2.tar.gz
+42227f1a1498089213a07533596b22f4  poppler-0.16.3.tar.gz
 f3a1afa9218386b50ffd262c00b35b31  poppler-data-0.4.4.tar.gz
diff --git a/extra/poppler/Pkgfile b/extra/poppler/Pkgfile
index 19270c5bc..7b87f9227 100755
--- a/extra/poppler/Pkgfile
+++ b/extra/poppler/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: fontconfig,libjpeg,cairo,libxml2,openjpeg
 
 name=poppler
-version=0.16.2
+version=0.16.3
 release=1
 source=(http://poppler.freedesktop.org/$name-$version.tar.gz \
 	http://poppler.freedesktop.org/poppler-data-0.4.4.tar.gz)