Merge branch '2.5' into 2.6
Conflicts: git/Pkgfile ncurses-ruby/Pkgfile
This commit is contained in:
commit
6424eba3a7
@ -1,7 +1,7 @@
|
||||
# Description: xterm replacement with transparency and fading
|
||||
# URL: http://aterm.sourceforge.net
|
||||
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
|
||||
# Depends on: xorg-libxext, xorg-libsm, xorg-libxt
|
||||
# Depends on: xorg-libxext xorg-libsm xorg-libxt xorg-font-misc-misc xorg-font-alias
|
||||
|
||||
name=aterm
|
||||
version=1.0.1
|
||||
|
@ -1,3 +1,3 @@
|
||||
8fd9256c635cce2289b648a01d54202c evilwm-1.0.1.tar.gz
|
||||
2c8beeb2ebc6aacb9053c2b6dc796145 evilwm-config.patch
|
||||
a06a1167dac39392859b5e0da96f13ed evilwm-config.patch
|
||||
99456f8f44a7918c27ec40425bef2a10 evilwm-maximise.patch
|
||||
|
@ -1,18 +1,18 @@
|
||||
# Description: The minimalist window manager
|
||||
# URL: http://www.6809.org.uk/evilwm/
|
||||
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
|
||||
# Depends on: xorg-libxext, xorg-libxrandr
|
||||
# Depends on: xorg-libxext xorg-libxrandr xorg-font-misc-misc xorg-font-alias
|
||||
|
||||
name=evilwm
|
||||
version=1.0.1
|
||||
release=1
|
||||
release=2
|
||||
source=(http://www.6809.org.uk/$name/$name-$version.tar.gz \
|
||||
$name-config.patch $name-maximise.patch)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
patch -p1 < $SRC/$name-config.patch
|
||||
patch -p1 < $SRC/$name-maximise.patch
|
||||
patch -p1 -i $SRC/$name-config.patch
|
||||
patch -p1 -i $SRC/$name-maximise.patch
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -Nru evilwm-1.0.0.orig/Makefile evilwm-1.0.0/Makefile
|
||||
--- evilwm-1.0.0.orig/Makefile 2007-06-30 19:22:32.000000000 +0200
|
||||
+++ evilwm-1.0.0/Makefile 2007-06-30 19:22:44.000000000 +0200
|
||||
diff -Nru evilwm-1.0.1.orig/Makefile evilwm-1.0.1/Makefile
|
||||
--- evilwm-1.0.1.orig/Makefile 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/Makefile 2009-06-23 10:28:34.000000000 +0200
|
||||
@@ -71,7 +71,7 @@
|
||||
#DEFINES += -DXDEBUG # show some X calls
|
||||
|
||||
@ -22,9 +22,9 @@ diff -Nru evilwm-1.0.0.orig/Makefile evilwm-1.0.0/Makefile
|
||||
#gzip -9 $(prefix)/share/man/man1/evilwm.1
|
||||
|
||||
dist:
|
||||
diff -Nru evilwm-1.0.0.orig/evilwm.1 evilwm-1.0.0/evilwm.1
|
||||
--- evilwm-1.0.0.orig/evilwm.1 2007-06-30 19:22:32.000000000 +0200
|
||||
+++ evilwm-1.0.0/evilwm.1 2007-06-30 19:22:44.000000000 +0200
|
||||
diff -Nru evilwm-1.0.1.orig/evilwm.1 evilwm-1.0.1/evilwm.1
|
||||
--- evilwm-1.0.1.orig/evilwm.1 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/evilwm.1 2009-06-23 10:28:34.000000000 +0200
|
||||
@@ -70,7 +70,7 @@
|
||||
bottom-right of screen.
|
||||
.IP I
|
||||
@ -34,9 +34,21 @@ diff -Nru evilwm-1.0.0.orig/evilwm.1 evilwm-1.0.0/evilwm.1
|
||||
Maximise current window vertically (toggle).
|
||||
.IP X
|
||||
Maximise current window (toggle).
|
||||
diff -Nru evilwm-1.0.0.orig/keymap.h evilwm-1.0.0/keymap.h
|
||||
--- evilwm-1.0.0.orig/keymap.h 2007-06-30 19:22:32.000000000 +0200
|
||||
+++ evilwm-1.0.0/keymap.h 2007-06-30 19:22:44.000000000 +0200
|
||||
diff -Nru evilwm-1.0.1.orig/evilwm.h evilwm-1.0.1/evilwm.h
|
||||
--- evilwm-1.0.1.orig/evilwm.h 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/evilwm.h 2009-06-23 10:33:36.000000000 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
/* default settings */
|
||||
|
||||
-#define DEF_FONT "variable"
|
||||
+#define DEF_FONT "fixed"
|
||||
#define DEF_FG "goldenrod"
|
||||
#define DEF_BG "grey50"
|
||||
#define DEF_BW 1
|
||||
diff -Nru evilwm-1.0.1.orig/keymap.h evilwm-1.0.1/keymap.h
|
||||
--- evilwm-1.0.1.orig/keymap.h 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/keymap.h 2009-06-23 10:28:34.000000000 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
#define KEY_LOWER XK_Insert
|
||||
#define KEY_ALTLOWER XK_KP_Insert
|
||||
|
@ -1 +1 @@
|
||||
40487f6619522eb60eede529747d7a69 foomatic-filters-4.0.1.tar.gz
|
||||
9d3a938be1c9ea00add9c7c467653861 foomatic-filters-4.0.2.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: ghostscript
|
||||
|
||||
name=foomatic-filters
|
||||
version=4.0.1
|
||||
version=4.0.2
|
||||
release=1
|
||||
source=(http://www.linuxprinting.org/download/foomatic/$name-$version.tar.gz)
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
149948ff33fb7d8cf9eef925e6c08157 git-1.6.3.2.tar.bz2
|
||||
2fb5ba5cabe0057470d577d2d4ff4816 git-manpages-1.6.3.2.tar.bz2
|
||||
91ae46ac01dadab1962beb064abd5b60 git-1.6.3.3.tar.bz2
|
||||
36be16310d1e24f23c966c8e17a499d7 git-manpages-1.6.3.3.tar.bz2
|
||||
|
@ -5,8 +5,8 @@
|
||||
# Nice to have: tk
|
||||
|
||||
name=git
|
||||
version=1.6.3.2
|
||||
release=2
|
||||
version=1.6.3.3
|
||||
release=1
|
||||
source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
|
@ -7,9 +7,9 @@ drwxr-xr-x root/root usr/include/ogg/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libogg.a
|
||||
-rwxr-xr-x root/root usr/lib/libogg.la
|
||||
lrwxrwxrwx root/root usr/lib/libogg.so -> libogg.so.0.5.3
|
||||
lrwxrwxrwx root/root usr/lib/libogg.so.0 -> libogg.so.0.5.3
|
||||
-rwxr-xr-x root/root usr/lib/libogg.so.0.5.3
|
||||
lrwxrwxrwx root/root usr/lib/libogg.so -> libogg.so.0.6.0
|
||||
lrwxrwxrwx root/root usr/lib/libogg.so.0 -> libogg.so.0.6.0
|
||||
-rwxr-xr-x root/root usr/lib/libogg.so.0.6.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/ogg.pc
|
||||
drwxr-xr-x root/root usr/share/
|
||||
|
@ -1 +1 @@
|
||||
eaf7dc6ebbff30975de7527a80831585 libogg-1.1.3.tar.gz
|
||||
10200ec22543841d9d1c23e0aed4e5e9 libogg-1.1.4.tar.gz
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
|
||||
|
||||
name=libogg
|
||||
version=1.1.3
|
||||
version=1.1.4
|
||||
release=1
|
||||
source=(http://downloads.xiph.org/releases/ogg/$name-$version.tar.gz)
|
||||
|
||||
|
@ -7,19 +7,19 @@ drwxr-xr-x root/root usr/include/vorbis/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libvorbis.a
|
||||
-rwxr-xr-x root/root usr/lib/libvorbis.la
|
||||
lrwxrwxrwx root/root usr/lib/libvorbis.so -> libvorbis.so.0.4.0
|
||||
lrwxrwxrwx root/root usr/lib/libvorbis.so.0 -> libvorbis.so.0.4.0
|
||||
-rwxr-xr-x root/root usr/lib/libvorbis.so.0.4.0
|
||||
lrwxrwxrwx root/root usr/lib/libvorbis.so -> libvorbis.so.0.4.2
|
||||
lrwxrwxrwx root/root usr/lib/libvorbis.so.0 -> libvorbis.so.0.4.2
|
||||
-rwxr-xr-x root/root usr/lib/libvorbis.so.0.4.2
|
||||
-rw-r--r-- root/root usr/lib/libvorbisenc.a
|
||||
-rwxr-xr-x root/root usr/lib/libvorbisenc.la
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisenc.so -> libvorbisenc.so.2.0.3
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisenc.so.2 -> libvorbisenc.so.2.0.3
|
||||
-rwxr-xr-x root/root usr/lib/libvorbisenc.so.2.0.3
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisenc.so -> libvorbisenc.so.2.0.5
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisenc.so.2 -> libvorbisenc.so.2.0.5
|
||||
-rwxr-xr-x root/root usr/lib/libvorbisenc.so.2.0.5
|
||||
-rw-r--r-- root/root usr/lib/libvorbisfile.a
|
||||
-rwxr-xr-x root/root usr/lib/libvorbisfile.la
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisfile.so -> libvorbisfile.so.3.2.0
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisfile.so.3 -> libvorbisfile.so.3.2.0
|
||||
-rwxr-xr-x root/root usr/lib/libvorbisfile.so.3.2.0
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisfile.so -> libvorbisfile.so.3.3.1
|
||||
lrwxrwxrwx root/root usr/lib/libvorbisfile.so.3 -> libvorbisfile.so.3.3.1
|
||||
-rwxr-xr-x root/root usr/lib/libvorbisfile.so.3.3.1
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/vorbis.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/vorbisenc.pc
|
||||
|
@ -1 +1 @@
|
||||
478646358c49f34aedcce58948793619 libvorbis-1.2.0.tar.gz
|
||||
7a38198f40efb9e463af5d29083f1a23 libvorbis-1.2.2.tar.bz2
|
||||
|
@ -4,9 +4,9 @@
|
||||
# Depends on: libogg
|
||||
|
||||
name=libvorbis
|
||||
version=1.2.0
|
||||
version=1.2.2
|
||||
release=1
|
||||
source=(http://downloads.xiph.org/releases/vorbis/$name-$version.tar.gz)
|
||||
source=(http://downloads.xiph.org/releases/vorbis/$name-$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
@ -1 +1 @@
|
||||
33d56195f00b9bf1dac0bb3318fd7404 ncurses-ruby-1.2.2.tar.bz2
|
||||
e00bc593fc0dbc6e311e3b6836bb5801 ncurses-ruby-1.2.3.tar.bz2
|
||||
|
@ -4,8 +4,8 @@
|
||||
# Depends on: ruby
|
||||
|
||||
name=ncurses-ruby
|
||||
version=1.2.2
|
||||
release=2
|
||||
version=1.2.3
|
||||
release=1
|
||||
source=(http://download.berlios.de/$name/$name-$version.tar.bz2)
|
||||
|
||||
build () {
|
||||
|
@ -2,7 +2,7 @@
|
||||
# URL: http://dickey.his.com/xterm/xterm.html
|
||||
# Maintainer: Jose V Beneyto, sepen at crux dot nu
|
||||
# Packager: Han Boetes, han at mijncomputer dot nl
|
||||
# Depends on: xorg-libxaw
|
||||
# Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc
|
||||
|
||||
name=xterm
|
||||
version=243
|
||||
|
Loading…
x
Reference in New Issue
Block a user