November 2013 - crux-commits

ports/opt (3.0): qemu-all: 1.6.1 -> 1.7.0
by crux＠crux.nu 29 Nov '13

29 Nov '13

commit a6fb3c128b4759c04457c572f4c7c6ed7151ef4c Author: Thomas Penteker <tek(a)serverop.de> Date: Fri Nov 29 20:58:34 2013 +0100 qemu-all: 1.6.1 -> 1.7.0 diff --git a/qemu-all/.footprint b/qemu-all/.footprint index 6218dcd..570144f 100644 --- a/qemu-all/.footprint +++ b/qemu-all/.footprint @@ -71,6 +71,7 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/qemu-nbd.8.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/qemu/ +-rw-r--r-- root/root usr/share/qemu/QEMU,tcx.bin -rw-r--r-- root/root usr/share/qemu/acpi-dsdt.aml -rw-r--r-- root/root usr/share/qemu/bamboo.dtb -rw-r--r-- root/root usr/share/qemu/bios.bin @@ -84,6 +85,7 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/keymaps/ar -rw-r--r-- root/root usr/share/qemu/keymaps/bepo -rw-r--r-- root/root usr/share/qemu/keymaps/common +-rw-r--r-- root/root usr/share/qemu/keymaps/cz -rw-r--r-- root/root usr/share/qemu/keymaps/da -rw-r--r-- root/root usr/share/qemu/keymaps/de -rw-r--r-- root/root usr/share/qemu/keymaps/de-ch @@ -146,5 +148,5 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/vgabios-stdvga.bin -rw-r--r-- root/root usr/share/qemu/vgabios-vmware.bin -rw-r--r-- root/root usr/share/qemu/vgabios.bin -drwxr-xr-x root/root usr/var/ -drwxr-xr-x root/root usr/var/run/ +drwxr-xr-x root/root var/ +drwxr-xr-x root/root var/run/ diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum index 06f99b4..52b8f46 100644 --- a/qemu-all/.md5sum +++ b/qemu-all/.md5sum @@ -1 +1 @@ -3a897d722457c5a895cd6ac79a28fda0 qemu-1.6.1.tar.bz2 +32893941d40d052a5e649efcf06aca06 qemu-1.7.0.tar.bz2 diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile index 94e2400..267736c 100644 --- a/qemu-all/Pkgfile +++ b/qemu-all/Pkgfile @@ -6,7 +6,7 @@ # Nice to have: libseccomp libiscsi name=qemu-all -version=1.6.1 +version=1.7.0 release=1 source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) @@ -18,7 +18,8 @@ build() { --sysconfdir=/etc \ --disable-docs \ --libexecdir=/usr/lib/qemu \ - --disable-gtk + --disable-gtk \ + --localstatedir=/var # fix include issues with nspr echo 'QEMU_CFLAGS+=-I/usr/include/nspr' >> libcacard/Makefile

1 0

ports/opt (3.0): qemu: 1.6.1 -> 1.7.0
by crux＠crux.nu 29 Nov '13

29 Nov '13

commit 7f81cc09b376e210fd67de9f7ef437dc0bf2377f Author: Thomas Penteker <tek(a)serverop.de> Date: Fri Nov 29 20:37:14 2013 +0100 qemu: 1.6.1 -> 1.7.0 diff --git a/qemu/.footprint b/qemu/.footprint index 3c7bf75..67e93c3 100644 --- a/qemu/.footprint +++ b/qemu/.footprint @@ -23,6 +23,7 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/qemu-nbd.8.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/qemu/ +-rw-r--r-- root/root usr/share/qemu/QEMU,tcx.bin -rw-r--r-- root/root usr/share/qemu/acpi-dsdt.aml -rw-r--r-- root/root usr/share/qemu/bamboo.dtb -rw-r--r-- root/root usr/share/qemu/bios.bin @@ -36,6 +37,7 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/keymaps/ar -rw-r--r-- root/root usr/share/qemu/keymaps/bepo -rw-r--r-- root/root usr/share/qemu/keymaps/common +-rw-r--r-- root/root usr/share/qemu/keymaps/cz -rw-r--r-- root/root usr/share/qemu/keymaps/da -rw-r--r-- root/root usr/share/qemu/keymaps/de -rw-r--r-- root/root usr/share/qemu/keymaps/de-ch @@ -98,5 +100,5 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/vgabios-stdvga.bin -rw-r--r-- root/root usr/share/qemu/vgabios-vmware.bin -rw-r--r-- root/root usr/share/qemu/vgabios.bin -drwxr-xr-x root/root usr/var/ -drwxr-xr-x root/root usr/var/run/ +drwxr-xr-x root/root var/ +drwxr-xr-x root/root var/run/ diff --git a/qemu/.md5sum b/qemu/.md5sum index 06f99b4..52b8f46 100644 --- a/qemu/.md5sum +++ b/qemu/.md5sum @@ -1 +1 @@ -3a897d722457c5a895cd6ac79a28fda0 qemu-1.6.1.tar.bz2 +32893941d40d052a5e649efcf06aca06 qemu-1.7.0.tar.bz2 diff --git a/qemu/Pkgfile b/qemu/Pkgfile index 69fdf6b..38fe436 100644 --- a/qemu/Pkgfile +++ b/qemu/Pkgfile @@ -6,7 +6,7 @@ # Nice to have: libseccomp libiscsi libusb usbredir name=qemu -version=1.6.1 +version=1.7.0 release=1 source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) @@ -19,6 +19,7 @@ build() { --disable-docs \ --libexecdir=/usr/lib/qemu \ --disable-gtk \ + --localstatedir=/var \ --target-list=x86_64-linux-user,i386-linux-user,i386-softmmu,x86_64-softmmu # fix include issues with nspr

1 0

ports/opt (3.0): tcpdump: update to 4.5.1
by crux＠crux.nu 29 Nov '13

29 Nov '13

commit bfa63b1511cc4ba7cf96c882fd6ae1a80c64b1cb Author: Juergen Daubert <jue(a)jue.li> Date: Fri Nov 29 12:23:40 2013 +0100 tcpdump: update to 4.5.1 diff --git a/tcpdump/.md5sum b/tcpdump/.md5sum index e812949..626f3d8 100644 --- a/tcpdump/.md5sum +++ b/tcpdump/.md5sum @@ -1 +1 @@ -6f75aabcffd012f73bd7c331bb5d8232 tcpdump-4.4.0.tar.gz +973a2513d0076e34aa9da7e15ed98e1b tcpdump-4.5.1.tar.gz diff --git a/tcpdump/Pkgfile b/tcpdump/Pkgfile index 85b84bb..829847c 100644 --- a/tcpdump/Pkgfile +++ b/tcpdump/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcap, openssl name=tcpdump -version=4.4.0 +version=4.5.1 release=1 source=(http://www.tcpdump.org/release/$name-$version.tar.gz)

1 0

ports/opt (3.0): libpcap: update to 1.5.1
by crux＠crux.nu 29 Nov '13

29 Nov '13

commit 14f01d1fa0ec76ac055af6f7ac9a158804f052f4 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Nov 29 12:23:21 2013 +0100 libpcap: update to 1.5.1 diff --git a/libpcap/.footprint b/libpcap/.footprint index cd110ca..7c7094b 100644 --- a/libpcap/.footprint +++ b/libpcap/.footprint @@ -17,8 +17,8 @@ drwxr-xr-x root/root usr/include/pcap/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libpcap.a lrwxrwxrwx root/root usr/lib/libpcap.so -> libpcap.so.1 -lrwxrwxrwx root/root usr/lib/libpcap.so.1 -> libpcap.so.1.4.0 --rwxr-xr-x root/root usr/lib/libpcap.so.1.4.0 +lrwxrwxrwx root/root usr/lib/libpcap.so.1 -> libpcap.so.1.5.1 +-rwxr-xr-x root/root usr/lib/libpcap.so.1.5.1 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/pcap-config.1.gz @@ -46,11 +46,13 @@ lrwxrwxrwx root/root usr/man/man3/pcap_dump_fopen.3pcap.gz -> pcap_dump_open.3pc -rw-r--r-- root/root usr/man/man3/pcap_fileno.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_findalldevs.3pcap.gz lrwxrwxrwx root/root usr/man/man3/pcap_fopen_offline.3pcap.gz -> pcap_open_offline.3pcap.gz +lrwxrwxrwx root/root usr/man/man3/pcap_fopen_offline_with_tstamp_precision.3pcap.gz -> pcap_open_offline.3pcap.gz lrwxrwxrwx root/root usr/man/man3/pcap_free_datalinks.3pcap.gz -> pcap_list_datalinks.3pcap.gz lrwxrwxrwx root/root usr/man/man3/pcap_free_tstamp_types.3pcap.gz -> pcap_list_tstamp_types.3pcap.gz lrwxrwxrwx root/root usr/man/man3/pcap_freealldevs.3pcap.gz -> pcap_findalldevs.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_freecode.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_get_selectable_fd.3pcap.gz +-rw-r--r-- root/root usr/man/man3/pcap_get_tstamp_precision.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_geterr.3pcap.gz lrwxrwxrwx root/root usr/man/man3/pcap_getnonblock.3pcap.gz -> pcap_setnonblock.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_inject.3pcap.gz @@ -67,16 +69,20 @@ lrwxrwxrwx root/root usr/man/man3/pcap_next.3pcap.gz -> pcap_next_ex.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_next_ex.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_offline_filter.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_open_dead.3pcap.gz +lrwxrwxrwx root/root usr/man/man3/pcap_open_dead_with_tstamp_precision.3pcap.gz -> pcap_open_dead.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_open_live.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_open_offline.3pcap.gz +lrwxrwxrwx root/root usr/man/man3/pcap_open_offline_with_tstamp_precision.3pcap.gz -> pcap_open_offline.3pcap.gz lrwxrwxrwx root/root usr/man/man3/pcap_perror.3pcap.gz -> pcap_geterr.3pcap.gz lrwxrwxrwx root/root usr/man/man3/pcap_sendpacket.3pcap.gz -> pcap_inject.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_set_buffer_size.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_set_datalink.3pcap.gz +-rw-r--r-- root/root usr/man/man3/pcap_set_immediate_mode.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_set_promisc.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_set_rfmon.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_set_snaplen.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_set_timeout.3pcap.gz +-rw-r--r-- root/root usr/man/man3/pcap_set_tstamp_precision.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_set_tstamp_type.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_setdirection.3pcap.gz -rw-r--r-- root/root usr/man/man3/pcap_setfilter.3pcap.gz diff --git a/libpcap/.md5sum b/libpcap/.md5sum index 53568b8..4c807db 100644 --- a/libpcap/.md5sum +++ b/libpcap/.md5sum @@ -1 +1 @@ -56e88a5aabdd1e04414985ac24f7e76c libpcap-1.4.0.tar.gz +b51f0c611b1e21b73f9ba120023bf972 libpcap-1.5.1.tar.gz diff --git a/libpcap/Pkgfile b/libpcap/Pkgfile index f521d62..b4dd5e9 100644 --- a/libpcap/Pkgfile +++ b/libpcap/Pkgfile @@ -4,14 +4,19 @@ # Depends on: udev libusb name=libpcap -version=1.4.0 +version=1.5.1 release=1 source=(http://www.tcpdump.org/release/$name-$version.tar.gz) build () { cd $name-$version + sed -i '/ln [^-][^s]/s/ln/ln -s/' Makefile.in - ./configure --prefix=/usr --mandir=/usr/man + + ./configure --prefix=/usr \ + --mandir=/usr/man \ + --disable-dbus \ + --without-libnl make make DESTDIR=$PKG install install-shared }

1 0

ports/opt (3.0): maildrop: update to 2.7.1
by crux＠crux.nu 29 Nov '13

29 Nov '13

commit 1ab0c0a8d343ec0cd842b4979b52c8f785b677e4 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Nov 29 12:22:45 2013 +0100 maildrop: update to 2.7.1 diff --git a/maildrop/.md5sum b/maildrop/.md5sum index 27cb4ff..1f79507 100644 --- a/maildrop/.md5sum +++ b/maildrop/.md5sum @@ -1 +1 @@ -cd895ca0b78a20da0da7338079b61d3d maildrop-2.7.0.tar.bz2 +afe9e08faba1925ce707f6ae57aa27d8 maildrop-2.7.1.tar.bz2 diff --git a/maildrop/Pkgfile b/maildrop/Pkgfile index 13d58b9..0ead644 100644 --- a/maildrop/Pkgfile +++ b/maildrop/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gdbm libpcre name=maildrop -version=2.7.0 +version=2.7.1 release=1 source=(http://download.sourceforge.net/project/courier/$name/$version/$nam…

1 0

ports/opt (3.0): mod_svn: update to 1.8.5
by crux＠crux.nu 29 Nov '13

29 Nov '13

commit caf1a5bbde43d071527ef4a29abf546804c7f366 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Nov 29 12:20:22 2013 +0100 mod_svn: update to 1.8.5 diff --git a/mod_svn/.md5sum b/mod_svn/.md5sum index a450f78..fc6335c 100644 --- a/mod_svn/.md5sum +++ b/mod_svn/.md5sum @@ -1 +1 @@ -a73a5caad3c442fe88e1f9c0e794d212 subversion-1.8.4.tar.bz2 +77349caf0ef5a612c9718c53516a9934 subversion-1.8.5.tar.bz2 diff --git a/mod_svn/Pkgfile b/mod_svn/Pkgfile index b9e8b4a..b71dfd4 100644 --- a/mod_svn/Pkgfile +++ b/mod_svn/Pkgfile @@ -4,7 +4,7 @@ # Depends on: subversion apache name=mod_svn -version=1.8.4 +version=1.8.5 release=1 source=(http://www.apache.org/dist/subversion/subversion-$version.tar.bz2)

1 0

ports/xorg (3.0): mesa3d: 9.2.3 -> 9.2.4
by crux＠crux.nu 29 Nov '13

29 Nov '13

commit 50ca114b95ef47a93164335c733e0b70672c0541 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Nov 29 19:17:44 2013 +1100 mesa3d: 9.2.3 -> 9.2.4 diff --git a/mesa3d/.footprint b/mesa3d/.footprint index ebdf0cb..33fe343 100644 --- a/mesa3d/.footprint +++ b/mesa3d/.footprint @@ -61,10 +61,10 @@ lrwxrwxrwx root/root usr/lib/libXvMCnouveau.so.1 -> libXvMCnouveau.so.1.0.0 lrwxrwxrwx root/root usr/lib/libXvMCr600.so -> libXvMCr600.so.1.0.0 lrwxrwxrwx root/root usr/lib/libXvMCr600.so.1 -> libXvMCr600.so.1.0.0 -rwxr-xr-x root/root usr/lib/libXvMCr600.so.1.0.0 --rwxr-xr-x root/root usr/lib/libdricore9.2.3.la -lrwxrwxrwx root/root usr/lib/libdricore9.2.3.so -> libdricore9.2.3.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libdricore9.2.3.so.1 -> libdricore9.2.3.so.1.0.0 --rwxr-xr-x root/root usr/lib/libdricore9.2.3.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libdricore9.2.4.la +lrwxrwxrwx root/root usr/lib/libdricore9.2.4.so -> libdricore9.2.4.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libdricore9.2.4.so.1 -> libdricore9.2.4.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libdricore9.2.4.so.1.0.0 -rwxr-xr-x root/root usr/lib/libglapi.la lrwxrwxrwx root/root usr/lib/libglapi.so -> libglapi.so.0.0.0 lrwxrwxrwx root/root usr/lib/libglapi.so.0 -> libglapi.so.0.0.0 diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index c6c2c48..c9047c3 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1 +1 @@ -f56b6beb556e4b9072814419f7c554e3 MesaLib-9.2.3.tar.bz2 +e630c0a307cec4f0f70ddd029d2fe084 MesaLib-9.2.4.tar.bz2 diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 34c69e6..6031a9d 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -4,8 +4,8 @@ # Depends on: expat libdrm libxml2-python talloc xorg-dri2proto xorg-glproto xorg-libxdamage xorg-libxt xorg-libxvmc xorg-libxxf86vm xorg-makedepend name=mesa3d -version=9.2.3 -release=4 +version=9.2.4 +release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz… build() {

1 0

ports/opt (3.0): xterm: updated to 298
by crux＠crux.nu 28 Nov '13

28 Nov '13

commit 758487a52f1d5511936d5d102e6a13daeb9aa875 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Thu Nov 28 17:14:00 2013 +0100 xterm: updated to 298 diff --git a/xterm/.md5sum b/xterm/.md5sum index f30c055..cec5bee 100644 --- a/xterm/.md5sum +++ b/xterm/.md5sum @@ -1,2 +1,2 @@ 2bc971a1753fe57aca05fde7c005a16c configure.diff -45610ae6fe90cf086fcd75b9cb97bbaf xterm-297.tgz +73e98a538614b1060c49302206447e45 xterm-298.tgz diff --git a/xterm/Pkgfile b/xterm/Pkgfile index 307c0cc..dd70bb4 100644 --- a/xterm/Pkgfile +++ b/xterm/Pkgfile @@ -5,7 +5,7 @@ # Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc name=xterm -version=297 +version=298 release=1 source=(ftp://invisible-island.net/$name/$name-$version.tgz \ configure.diff)

1 0

ports/opt (3.0): wine: update wine-mono 0.0.8 -> 4.5.2
by crux＠crux.nu 28 Nov '13

28 Nov '13

commit 0fe954f0684f545a6bcd13a394410bceac15004d Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Nov 28 23:57:39 2013 +1100 wine: update wine-mono 0.0.8 -> 4.5.2 diff --git a/wine/.footprint b/wine/.footprint index 2decde9..fdd92e1 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -3218,5 +3218,5 @@ drwxr-xr-x root/root usr/share/wine/gecko/ -rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.24-x86_64.msi -rw-r--r-- root/root usr/share/wine/l_intl.nls drwxr-xr-x root/root usr/share/wine/mono/ --rwxr-xr-x root/root usr/share/wine/mono/wine-mono-0.0.8.msi +-rwxr-xr-x root/root usr/share/wine/mono/wine-mono-4.5.2.msi -rw-r--r-- root/root usr/share/wine/wine.inf diff --git a/wine/.md5sum b/wine/.md5sum index 209b949..2811e0b 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,4 +1,4 @@ e3b9383439d60202b10b5e93e5b00a3b wine-1.7.7.tar.bz2 -a79eb547bcb562aea5c7096bc97fff11 wine-mono-0.0.8.msi +582a32cde40c165c20d1b4790abab4cd wine-mono-4.5.2.msi 766bb034172f7f0a97443951a02a0df8 wine_gecko-2.24-x86.msi 1912fd191872c72d5f562283e44e8ab4 wine_gecko-2.24-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index 3aedb4f..2776172 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -6,11 +6,11 @@ name=wine version=1.7.7 -release=1 +release=2 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2 http://downloads.sourceforge.net/wine/wine_gecko-2.24-x86.msi http://downloads.sourceforge.net/wine/wine_gecko-2.24-x86_64.msi - http://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi) + http://downloads.sourceforge.net/wine/wine-mono-4.5.2.msi) build() { install -d wine32 wine64 @@ -53,7 +53,7 @@ build() { $SRC/wine_gecko-2.24-x86.msi \ $SRC/wine_gecko-2.24-x86_64.msi - install $SRC/wine-mono-0.0.8.msi $PKG/usr/share/wine/mono/ + install $SRC/wine-mono-4.5.2.msi $PKG/usr/share/wine/mono/ rm -r $PKG/usr/man/??.UTF-8 }

1 0

ports/opt (3.0): spectrwm: remove the buggy LD_PRELOAD stuff
by crux＠crux.nu 27 Nov '13

27 Nov '13

commit 3704cebbb3a2f15389ecca44a375d358bb917e68 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 27 14:20:07 2013 +0100 spectrwm: remove the buggy LD_PRELOAD stuff diff --git a/spectrwm/.footprint b/spectrwm/.footprint index 02fe24f..b4bdbe2 100644 --- a/spectrwm/.footprint +++ b/spectrwm/.footprint @@ -3,9 +3,6 @@ drwxr-xr-x root/root usr/bin/ lrwxrwxrwx root/root usr/bin/scrotwm -> spectrwm -rwxr-xr-x root/root usr/bin/spectrwm drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libswmhack.so -> libswmhack.so.0.0 -lrwxrwxrwx root/root usr/lib/libswmhack.so.0 -> libswmhack.so.0.0 --rwxr-xr-x root/root usr/lib/libswmhack.so.0.0 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/spectrwm.1.gz diff --git a/spectrwm/.md5sum b/spectrwm/.md5sum index 150c2dc..cda74b6 100644 --- a/spectrwm/.md5sum +++ b/spectrwm/.md5sum @@ -1,2 +1,3 @@ 23e32c1e292f2fc94ed88195ffe60023 spectrwm-2.4.0.tgz 1ebde41a8b57b6e116e6effd7a911dc9 spectrwm-fix_unbind.patch +be5fdf53ebac908ad037ad937de5ba3a spectrwm-remove_libswmhack.patch diff --git a/spectrwm/Pkgfile b/spectrwm/Pkgfile index 34a3fe6..614acf6 100644 --- a/spectrwm/Pkgfile +++ b/spectrwm/Pkgfile @@ -5,12 +5,13 @@ name=spectrwm version=2.4.0 -release=1 +release=2 source=(https://opensource.conformal.com/snapshots/$name/$name-$version.tgz - $name-fix_unbind.patch) + $name-fix_unbind.patch $name-remove_libswmhack.patch) build () { cd $name-$version/linux + patch -p 1 -d .. -i $SRC/$name-remove_libswmhack.patch patch -p 1 -d .. -i $SRC/$name-fix_unbind.patch make PREFIX=/usr MANDIR=/usr/man DESTDIR=$PKG install rm $PKG/usr/man/man1/spectrwm_*.1 diff --git a/spectrwm/spectrwm-remove_libswmhack.patch b/spectrwm/spectrwm-remove_libswmhack.patch new file mode 100644 index 0000000..f2920f3 --- /dev/null +++ b/spectrwm/spectrwm-remove_libswmhack.patch @@ -0,0 +1,59 @@ +diff -Nru spectrwm-2.4.0.orig/linux/Makefile spectrwm-2.4.0/linux/Makefile +--- spectrwm-2.4.0.orig/linux/Makefile 2013-11-27 12:41:41.935783480 +0100 ++++ spectrwm-2.4.0/linux/Makefile 2013-11-27 12:44:47.562396671 +0100 +@@ -1,5 +1,5 @@ + CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g +-CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" ++CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 + LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor + + PREFIX?= /usr/local +@@ -16,7 +16,7 @@ + CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" + endif + +-all: spectrwm libswmhack.so.$(LVERS) ++all: spectrwm + + spectrwm.c: + ln -sf ../spectrwm.c +@@ -39,15 +39,12 @@ + install -m 755 -d $(DESTDIR)$(LIBDIR) + install -m 755 -d $(DESTDIR)$(MANDIR)/man1 + install -m 755 spectrwm $(DESTDIR)$(BINDIR) +- install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR) + install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1 + install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_es.1 + install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1 + install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1 + install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1 + ln -sf spectrwm $(DESTDIR)$(BINDIR)/scrotwm +- ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0 +- ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so + + clean: + rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h +diff -Nru spectrwm-2.4.0.orig/spectrwm.c spectrwm-2.4.0/spectrwm.c +--- spectrwm-2.4.0.orig/spectrwm.c 2013-11-27 12:41:41.935783480 +0100 ++++ spectrwm-2.4.0/spectrwm.c 2013-11-27 12:50:27.810081824 +0100 +@@ -273,9 +273,9 @@ + #define SWM_CONF_DEFAULT (0) + #define SWM_CONF_KEYMAPPING (1) + +-#ifndef SWM_LIB ++/* #ifndef SWM_LIB + #define SWM_LIB "/usr/local/lib/libswmhack.so" +-#endif ++#endif */ + + char **start_argv; + xcb_atom_t a_state; +@@ -3117,7 +3117,7 @@ + + close(xcb_get_file_descriptor(conn)); + +- setenv("LD_PRELOAD", SWM_LIB, 1); ++ /* setenv("LD_PRELOAD", SWM_LIB, 1); */ + + if (asprintf(&ret, "%d", ws_idx) == -1) { + warn("spawn: asprintf SWM_WS");

1 0