From 94fa10f3a918892a08707aa27eb32a83a4959879 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 16 Jun 2012 00:01:25 +0000 Subject: Sat Jun 16 00:01:25 UTC 2012 --- extra/claws-mail/PKGBUILD | 11 +- extra/claws-mail/buildfix_gnutls3.diff | 18 +++ extra/java7-openjdk/PKGBUILD | 44 +++---- extra/java7-openjdk/disable_Werror.diff | 11 ++ extra/libmusicbrainz5/PKGBUILD | 34 ++++++ .../support-out-of-source-build.patch | 131 +++++++++++++++++++++ extra/live-media/PKGBUILD | 6 +- extra/networkmanager/PKGBUILD | 30 ++--- extra/xfce4-mixer/PKGBUILD | 43 ++++--- extra/xfce4-mixer/xfce4-mixer.install | 6 +- extra/xine-ui/PKGBUILD | 26 +--- 11 files changed, 271 insertions(+), 89 deletions(-) create mode 100644 extra/claws-mail/buildfix_gnutls3.diff create mode 100644 extra/java7-openjdk/disable_Werror.diff create mode 100644 extra/libmusicbrainz5/PKGBUILD create mode 100644 extra/libmusicbrainz5/support-out-of-source-build.patch (limited to 'extra') diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 18a75f5a5..a85c8b939 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146461 2012-01-11 15:21:50Z stephane $ +# $Id: PKGBUILD 161800 2012-06-14 15:33:46Z andyrtr $ # Maintainer: Andreas Radke pkgname=claws-mail pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -19,11 +19,14 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('df9f1657d7f34959a2205344d952c2e3') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + buildfix_gnutls3.diff) +md5sums=('df9f1657d7f34959a2205344d952c2e3' + '0c0956755ddcec939d916af35310ee3f') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/buildfix_gnutls3.diff sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py diff --git a/extra/claws-mail/buildfix_gnutls3.diff b/extra/claws-mail/buildfix_gnutls3.diff new file mode 100644 index 000000000..1a71ff43a --- /dev/null +++ b/extra/claws-mail/buildfix_gnutls3.diff @@ -0,0 +1,18 @@ +Index: src/common/ssl_certificate.c +=================================================================== +RCS file: //claws/src/common/ssl_certificate.c,v +retrieving revision 1.4.2.40 +retrieving revision 1.4.2.41 +diff -u -r1.4.2.40 -r1.4.2.41 +--- src/common/ssl_certificate.c 30 Aug 2011 06:18:09 -0000 1.4.2.40 ++++ src/common/ssl_certificate.c 16 May 2012 05:43:14 -0000 1.4.2.41 +@@ -686,7 +686,7 @@ + gnutls_x509_privkey * key, + gnutls_x509_crt_t * cert) + { +- gnutls_pkcs12_bag bag = NULL; ++ gnutls_pkcs12_bag_t bag = NULL; + int index = 0; + int ret; + + diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 8d4259c1a..9148b09f6 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160627 2012-06-02 21:15:26Z andyrtr $ +# $Id: PKGBUILD 161798 2012-06-14 14:46:00Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Jan de Groot # Contributor: Guillaume ALAUX @@ -7,20 +7,20 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 pkgbase=java7-openjdk _java_ver=7 -_updatever=u4 +_updatever=u5 _openjdk_build=b21 _openjdk_date=27_jun_2011 -_icedtea_ver=2.2 +_icedtea_ver=2.2.1 _date=20110922 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=3231f3e9c517 -_HOTSPOT_CHANGESET=bfe5efd70bce -_JAXP_CHANGESET=0036fe6fe7dc -_JAXWS_CHANGESET=abfb890c262a -_JDK_CHANGESET=839d0155f7cc -_LANGTOOLS_CHANGESET=f855bdb37537 -_OPENJDK_CHANGESET=49a6fc8f712f +_CORBA_CHANGESET=38deb372c569 +_HOTSPOT_CHANGESET=889dffcf4a54 +_JAXP_CHANGESET=335fb0b059b7 +_JAXWS_CHANGESET=5471e01ef43b +_JDK_CHANGESET=6c3b742b735d +_LANGTOOLS_CHANGESET=beea46c7086b +_OPENJDK_CHANGESET=0b776ef59474 _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -50,23 +50,25 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar fix_corba_cmds_path.diff openjdk7_fix_jdk_cmds_path.diff openjdk7_nonreparenting-wm.diff + disable_Werror.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5' - '9a5e9342111263f76aae4b86ac38e912b60cd81fb49943c3868c8f63e2e21130' - '26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54' - '9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274' - '245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2' - 'e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a' - '19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7' - 'd46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19' - '86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514' +sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6' + '0c987bff8e490a57d1e16e328a54665073ef920166342a0a08e5593aa20cd215' + '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe' + 'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93' + 'ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd' + '1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d' + '48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e' + '17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb' + 'b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' + 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' @@ -93,7 +95,7 @@ build() { # default is to build with first found java-environment found in our repos - is jdk7-openjdk [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh - unset MAKEFLAGS # parallel build is currently broken +# unset MAKEFLAGS # parallel build is currently broken export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" @@ -101,7 +103,7 @@ build() { . /etc/profile.d/apache-ant.sh cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/disable_Werror.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" diff --git a/extra/java7-openjdk/disable_Werror.diff b/extra/java7-openjdk/disable_Werror.diff new file mode 100644 index 000000000..fa8887a10 --- /dev/null +++ b/extra/java7-openjdk/disable_Werror.diff @@ -0,0 +1,11 @@ +--- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2012-06-14 15:32:44.967695139 +0200 +@@ -150,7 +150,7 @@ + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++#WARNINGS_ARE_ERRORS = -Werror + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/extra/libmusicbrainz5/PKGBUILD b/extra/libmusicbrainz5/PKGBUILD new file mode 100644 index 000000000..9cccbd2b3 --- /dev/null +++ b/extra/libmusicbrainz5/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 161787 2012-06-14 09:28:16Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=libmusicbrainz5 +pkgver=5.0.1 +pkgrel=1 +pkgdesc="Library That Provides Access to the MusicBrainz Server" +arch=('i686' 'x86_64') +url="http://musicbrainz.org/" +license=('LGPL2.1') +depends=('neon') +makedepends=('cmake') +source=("https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-$pkgver.tar.gz" + 'support-out-of-source-build.patch') +md5sums=('a0406b94c341c2b52ec0fe98f57cadf3' + '78348e0c9a0864c7be2dcced5aab6d38') + +build() { + cd "${srcdir}"/libmusicbrainz-${pkgver} + patch -p1 -i "${srcdir}"/support-out-of-source-build.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../libmusicbrainz-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="$pkgdir" install +} diff --git a/extra/libmusicbrainz5/support-out-of-source-build.patch b/extra/libmusicbrainz5/support-out-of-source-build.patch new file mode 100644 index 000000000..eeb3bc2c7 --- /dev/null +++ b/extra/libmusicbrainz5/support-out-of-source-build.patch @@ -0,0 +1,131 @@ +From b74fd9680c20f8cbdbcf6cdff9ee1074c55fe1c1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= +Date: Thu, 14 Jun 2012 09:58:41 +0200 +Subject: [PATCH] Support out-of-source build + +http://tickets.musicbrainz.org/browse/LMB-10 +https://github.com/metabrainz/libmusicbrainz/issues/1 +--- + examples/CMakeLists.txt | 5 ++++- + src/CMakeLists.txt | 9 +++++++-- + src/make-c-interface.cc | 8 ++++---- + tests/CMakeLists.txt | 5 ++++- + 4 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 3e11469..000d4aa 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -1,4 +1,7 @@ +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include) ++INCLUDE_DIRECTORIES( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../include ++ ${CMAKE_CURRENT_BINARY_DIR}/../include ++) + LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES}) + + ADD_EXECUTABLE(cdlookup cdlookup.cc) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2ee102f..89ab63c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,5 +1,10 @@ + SET(CMAKE_INCLUDE_CURRENT_DIR ON) +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR}) ++INCLUDE_DIRECTORIES( ++ ${CMAKE_CURRENT_SOURCE_DIR}/.. ++ ${CMAKE_CURRENT_SOURCE_DIR}/../include ++ ${CMAKE_CURRENT_BINARY_DIR}/../include ++ ${NEON_INCLUDE_DIR} ++) + + SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc + Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc +@@ -13,7 +18,7 @@ ADD_EXECUTABLE(make-c-interface make-c-interface.cc xmlParser.cpp) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h + COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5 ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h + DEPENDS make-c-interface cinterface.xml *.inc + ) + +diff --git a/src/make-c-interface.cc b/src/make-c-interface.cc +index 652a65b..70dd6d7 100644 +--- a/src/make-c-interface.cc ++++ b/src/make-c-interface.cc +@@ -33,7 +33,7 @@ + + #include "musicbrainz5/xmlParser.h" + +-void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); ++void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path); + void ProcessHeader(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); + void ProcessEntity(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); + void ProcessClass(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); +@@ -80,7 +80,7 @@ int main(int argc, const char *argv[]) + std::string Name=Node.getName(); + + if ("boilerplate"==Name) +- ProcessBoilerplate(Node,Source,Include); ++ ProcessBoilerplate(Node,Source,Include,argv[1]); + else if ("header"==Name) + ProcessHeader(Node,Source,Include); + else if ("declare"==Name) +@@ -156,13 +156,13 @@ void ProcessHeader(const XMLNode& /*Node*/, std::ofstream& Source, std::ofstream + Include << os.str() << std::endl; + } + +-void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include) ++void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path) + { + std::ofstream *File=GetFile(Node,Source,Include); + + if (Node.isAttributeSet("file")) + { +- std::string FileName=Node.getAttribute("file"); ++ std::string FileName=Path+"/"+Node.getAttribute("file"); + std::ifstream InFile(FileName.c_str()); + if (InFile.is_open()) + *File << InFile.rdbuf() << std::endl; +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 645f8ae..8a0b38b 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,4 +1,7 @@ +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include) ++INCLUDE_DIRECTORIES( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../include ++ ${CMAKE_CURRENT_BINARY_DIR}/../include ++) + LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES}) + ADD_EXECUTABLE(mbtest mbtest.cc) + ADD_EXECUTABLE(ctest ctest.c) +-- +1.7.10 + +From b5d4f4ea32068e296326438c747faf665c311ddd Mon Sep 17 00:00:00 2001 +From: Andy Hawkins +Date: Thu, 14 Jun 2012 09:12:27 +0000 +Subject: [PATCH] Fix install when building out of tree + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16870b4..958461c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h) + + FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/musicbrainz5/*.h) +-INSTALL(FILES ${headers} include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5) ++INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + + ADD_SUBDIRECTORY(src) +-- +1.7.10 + diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index ebc6604ad..c6e28b53e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159279 2012-05-20 14:16:33Z giovanni $ +# $Id: PKGBUILD 161806 2012-06-14 18:07:58Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2012.05.17 +pkgver=2012.06.12 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('e46d6070d7043b67c776389276d8bfed') +md5sums=('0c952d4debc674ac896fe3d231b21a0a') build() { cd ${srcdir}/live diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 7587d3e38..94b238613 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 157134 2012-04-24 18:49:00Z heftig $ +# $Id: PKGBUILD 161809 2012-06-14 18:56:19Z heftig $ # Maintainer: Jan de Groot -# Contri-butor: Wael Nasreddine +# Contributor: Wael Nasreddine # Contributor: Tor Krill # Contributor: Will Rea # Contributor: Valentine Sinitsyn @@ -8,14 +8,15 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.4.0 -pkgrel=4 +pkgrel=5 +_snapshot=83760a7 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/$_pkgname/" depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' 'libsoup') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc') optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' @@ -25,26 +26,21 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -#source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch - initialize-GError.patch dont-fight-over-ipv6.patch) -sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f' +#source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz +source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-$_snapshot.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) +sha256sums=('6cb6d6c87306a7cd4aeed786c3445677b6df4e56ddcc4a6c1747c09c44114091' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' - '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6' - 'cc66f2fdf59f4f9873a5b775421e1968861c5541d7e29b83b4d30351ad1f9e94') + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') build() { - cd $_pkgname-$pkgver + cd $_pkgname-$_snapshot patch -Np1 -i ../disable_set_hostname.patch patch -Np1 -i ../dnsmasq-path.patch - patch -Np1 -i ../initialize-GError.patch - patch -Np1 -i ../dont-fight-over-ipv6.patch - ./configure \ + ./autogen.sh \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -66,7 +62,7 @@ build() { } package() { - cd $_pkgname-$pkgver + cd $_pkgname-$_snapshot make DESTDIR="$pkgdir" install install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD index befd4f301..841cc9417 100644 --- a/extra/xfce4-mixer/PKGBUILD +++ b/extra/xfce4-mixer/PKGBUILD @@ -1,38 +1,37 @@ -# $Id: PKGBUILD 157863 2012-04-30 04:20:32Z foutrelis $ +# $Id: PKGBUILD 161812 2012-06-14 23:39:44Z foutrelis $ # Maintainer: Tobias Kieslich pkgname=xfce4-mixer pkgver=4.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="The volume control plugin for the Xfce panel" -arch=(i686 x86_64) -license=('GPL2') +arch=('i686' 'x86_64') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') -depends=("xfce4-panel>=4.8.0" 'gstreamer0.10-base>=0.10.22' 'hicolor-icon-theme') +depends=('xfce4-panel' 'gstreamer0.10-base-plugins' 'hicolor-icon-theme') makedepends=('intltool') -optdepends=('gstreamer0.10-base-plugins: to support basic audio hardware' \ - 'gstreamer0.10-good-plugins: well supported hardware'\ - 'gstreamer0.10-bad-plugins: not so well supported hardware'\ - 'gstreamer0.10-ugly-plugins: might contain questionable license hardware') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3fa3a9973e18c04da26709a654e242ff') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --with-sound=alsa \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-mixer/xfce4-mixer.install b/extra/xfce4-mixer/xfce4-mixer.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-mixer/xfce4-mixer.install +++ b/extra/xfce4-mixer/xfce4-mixer.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD index 15e2b70d1..db9587850 100644 --- a/extra/xine-ui/PKGBUILD +++ b/extra/xine-ui/PKGBUILD @@ -1,38 +1,24 @@ -# $Id: PKGBUILD 148980 2012-02-05 11:58:50Z ibiru $ +# $Id: PKGBUILD 161816 2012-06-15 02:09:04Z eric $ # Maintainer: Eric Bélanger pkgname=xine-ui -pkgver=0.99.6 -pkgrel=5 +pkgver=0.99.7 +pkgrel=1 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') url="http://www.xine-project.org" -depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm' +depends=('xine-lib' 'curl' 'libpng' 'libjpeg' 'libxft' 'libxxf86vm' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'lirc-utils') makedepends=('libxt') options=('!strip') install=xine-ui.install -source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz - lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch - fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch) -sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' - 'b2df43ede3a9d1a34b80139704a4cbbc7295c584' - '8bbd39f61de7b6991385457a4944b8ea104da88b' - '2361df9ddad59c426b0f863414c6d527b463a38a' - '9c70c6543dae6815710b239b4638ffe3843bac86' - 'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14') +source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz) +sha1sums=('ca82e09cf8245d038813bc4dbd8384ba79cbf197') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" - patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" - patch -p1 < "${srcdir}/fix_lirc.diff" - patch -p1 < "${srcdir}/xine-ui-xdg.diff" - patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch" - sed -i '/\#include /d' src/xitk/download.c - autoconf ./configure --prefix=/usr --mandir=/usr/share/man \ --with-x --enable-lirc --without-aalib --enable-debug make -- cgit v1.2.3-54-g00ecf