diff options
55 files changed, 1576 insertions, 183 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index dd5233b0e..52c390c3a 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.11 +pkgver=0.9.13 pkgrel=1 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect') -makedepends=('python2-pycountry') +makedepends=('python2-pycountry' 'qt-private-headers') optdepends=('ipython2: to use calibre-debug') replaces=$_pkgname conflicts=$_pkgname @@ -27,7 +27,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('07e620aed65d7bae2a27ccea123da4c9' +md5sums=('3ad062f85eca072c3990c766bc05412a' '42c07b43d575b5e7e7524bd7b9528f0e' '675cd87d41342119827ef706055491e7') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 84b4d0cd1..0d257856f 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172123 2012-11-29 18:28:53Z andyrtr $ +# $Id: PKGBUILD 174272 2013-01-03 16:15:01Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.25 +pkgver=1.0.29 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') @@ -16,8 +16,9 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=('9690028c5e312b086e7572ae1899a33c') +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) +md5sums=('0640a02a3fb88d3dbdb224e3becd400d' + '4c9f97eae201798000483c4e7109e690') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") @@ -26,13 +27,15 @@ build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --with-rcdir=no \ + --enable-avahi \ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make } check() { cd "$srcdir/$_pkgname-$pkgver" - make -k check + make -j1 -k check } package() { @@ -40,4 +43,7 @@ package() { make DESTDIR="$pkgdir/" install # drop static lib rm -f ${pkgdir}/usr/lib/*.a + + # add missing systemd support + install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service } diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service new file mode 100644 index 000000000..144956c7f --- /dev/null +++ b/libre/cups-filters-libre/cups-browsed.service @@ -0,0 +1,10 @@ +[Unit] +Description=Make remote CUPS printers available locally +After=cups.service avahi-daemon.service +Wants=cups.service avahi-daemon.service + +[Service] +ExecStart=/usr/sbin/cups-browsed + +[Install] +WantedBy=multi-user.target diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 26b14ff86..91d74ba15 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172988 2012-12-08 05:56:10Z andrea $ +# $Id: PKGBUILD 174142 2013-01-02 15:56:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): MichaÅ‚ MasÅ‚owski <mtjm@mtjm.eu> @@ -6,18 +6,16 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff' "konq-about-fsdg.diff") -sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747' - '998f1db2309744dd2c054aec3462a717bc107c2e' +sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') @@ -29,12 +27,11 @@ provides=("kdebase-konqueror=$pkgver") build() { cd kde-baseapps-${pkgver} - patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" - cd ../ + cd .. mkdir build cd build diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 75c9a87da..20219e40a 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('8988c3684c05efc676d1bfe454480f60d75fac3b' +sha1sums=('6e2abeb8cc2d40d248dfabd49da264ac375fe6b5' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index bc71be0c1..e73cc2f36 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $ +# $Id: PKGBUILD 174033 2013-01-02 10:59:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.4 -pkgrel=3 +pkgver=4.9.5 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info' 'libxtst') + 'media-player-info' 'libxtst' 'libutempter') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') provides=("kdelibs=$pkgver") replaces=('kdelibs') @@ -23,13 +23,9 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' - '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' - 'fix-crash-on-open-with.patch' 'khtml-fsdg.diff') -sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' +sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' - '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,11 +33,6 @@ build() { # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch - - # Fixed upstream - patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch - patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch - # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 3ff2a4205..8fea1b1c3 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172278 2012-12-02 07:47:19Z andrea $ +# $Id: PKGBUILD 174113 2013-01-02 11:04:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48' +sha1sums=('26a607742b83211575802781b287f6f7f1c3ebbc' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD new file mode 100644 index 000000000..af28566e8 --- /dev/null +++ b/libre/kdepim-libre/PKGBUILD @@ -0,0 +1,307 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgbase=kdepim +pkgbase=kdepim-libre +pkgname=('kdepim-akonadiconsole-libre' + 'kdepim-akregator-libre' + 'kdepim-blogilo-libre' + 'kdepim-console-libre' + 'kdepim-kaddressbook-libre' + 'kdepim-kalarm-libre' + 'kdepim-kjots-libre' + 'kdepim-kleopatra-libre' + 'kdepim-kmail-libre' + 'kdepim-knode-libre' + 'kdepim-knotes-libre' + 'kdepim-kontact-libre' + 'kdepim-korganizer-libre' + 'kdepim-kresources-libre' + 'kdepim-ktimetracker-libre' + 'kdepim-ktnef-libre' + 'kdepim-libkdepim-libre') +pkgver=4.9.5 +pkgrel=1 +arch=('i686' 'x86_64' 'mips64el') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim-libre') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent') +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") +sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d') + +build() { + mkdir build + cd build + cmake ../${_pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole-libre() { + pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-akonadiconsole') + conflicts=('kdepim-akonadiconsole') + provides=("kdepim-akonadiconsole=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator-libre() { + pkgdesc='A Feed Reader for KDE (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + replaces=('kdepim-akregator') + conflicts=('kdepim-akregator') + provides=("kdepim-akregator=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo-libre() { + pkgdesc='A KDE Blogging Client (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url="http://kde.org/applications/internet/blogilo/" + replaces=('kdepim-blogilo' 'blogilo') + conflicts=('kdepim-blogilo' 'blogilo') + provides=("kdepim-blogilo=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console-libre() { + pkgdesc='Command line tool for accessing calendar files (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url='http://pim.kde.org' + replaces=('kdepim-console') + conflicts=('kdepim-console') + provides=("kdepim-console=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kabcclient + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/konsolekalendar + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook-libre() { + pkgdesc='Contact Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + replaces=('kdepim-kaddressbook') + conflicts=('kdepim-kaddressbook') + provides=("kdepim-kaddressbook=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm-libre() { + pkgdesc='Personal Alarm Scheduler (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + replaces=('kdepim-kalarm') + conflicts=('kdepim-kalarm') + provides=("kdepim-kalarm=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots-libre() { + pkgdesc='Note Taker (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + replaces=('kdepim-kjots') + conflicts=('kdepim-kjots') + provides=("kdepim-kjots=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra-libre() { + pkgdesc='Certificate Manager and Unified Crypto GUI (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + install='kdepim-kleopatra.install' + url="http://kde.org/applications/utilities/kleopatra/" + replaces=('kdepim-kleopatra') + conflicts=('kdepim-kleopatra') + provides=("kdepim-kleopatra=${pkgver}") + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kwatchgnupg + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail-libre() { + pkgdesc='Mail Client (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + provides=("kdepim-kmail=${pkgver}") + for i in kmail doc/kmail kmailcvt archivemailagent backupmail \ + importwizard ksendemail libksieve messagelist mailfilteragent \ + mailimporter ontologies kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode-libre() { + pkgdesc='News Reader (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + replaces=('kdepim-knode') + conflicts=('kdepim-knode') + provides=("kdepim-knode=${pkgver}") + install='kdepim-knode.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kioslave/news + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes-libre() { + pkgdesc='Popup Notes (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + replaces=('kdepim-knotes') + conflicts=('kdepim-knotes') + provides=("kdepim-knotes=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact-libre() { + pkgdesc='Personal Information Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces') + replaces=('kdepim-kontact' 'kdepim-kontactinterfaces') + provides=("kdepim-kontact=${pkgver}") + for i in kontact/src doc/kontact kontact/plugins/summary \ + kontact/plugins/specialdates doc/kontact-admin; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer-libre() { + pkgdesc='Calendar and Scheduling Program (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + replaces=('kdepim-korganizer') + conflicts=('kdepim-korganizer') + provides=("kdepim-korganizer=${pkgver}") + install='kdepim-korganizer.install' + for i in korganizer doc/korganizer kontact/plugins/korganizer \ + calendarviews; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-kresources-libre() { + pkgdesc='KDE PIM resources (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-kresources') + conflicts=('kdepim-kresources') + provides=("kdepim-kresources=${pkgver}") + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker-libre() { + pkgdesc='Personal Time Tracker (without nonfree pilot-link support)' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + replaces=('kdepim-ktimetracker') + conflicts=('kdepim-ktimetracker') + provides=("kdepim-ktimetracker=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktnef-libre() { + pkgdesc='A viewer/extractor for TNEF files (without nonfree pilot-link support)' + depends=('kdebase-runtime' 'kdepimlibs') + url="https://projects.kde.org/projects/kde/kdepim/ktnef" + replaces=('kdepim-ktnef') + conflicts=('kdepim-ktnef') + provides=("kdepim-ktnef=${pkgver}") + install=kdepim-ktnef.install + cd "${srcdir}"/build/ktnef + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktnef + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim-libre() { + pkgdesc='Library for KDE PIM (without nonfree pilot-link support)' + groups=() + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' + conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + provides=("kdepim-libkdepim=${pkgver}") + for i in akonadi_next calendarsupport incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + mailcommon messagecomposer messagecore messageviewer icons \ + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} diff --git a/libre/kdepim-libre/kdepim-kleopatra.install b/libre/kdepim-libre/kdepim-kleopatra.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kleopatra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-kmail.install b/libre/kdepim-libre/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-knode.install b/libre/kdepim-libre/kdepim-knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-knode.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-korganizer.install b/libre/kdepim-libre/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-ktnef.install b/libre/kdepim-libre/kdepim-ktnef.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-ktnef.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim.install b/libre/kdepim-libre/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/libre/kdepim-libre/kdepim.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 20ac66607..d6a1cc01e 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172283 2012-12-02 07:47:38Z andrea $ +# $Id: PKGBUILD 174118 2013-01-02 11:05:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -18,11 +18,18 @@ install=${_pkgname}.install provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') -source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb') +source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" + 'ark-unar-06.patch') +sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c' + 'a0a836950f185d9b2245204579f969203036fdec') build() { - cd "${srcdir}" + cd "${srcdir}/ark-${pkgver}" + + # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. + patch -Np1 -i "${srcdir}/ark-unar-06.patch" + + cd .. mkdir build cd build cmake ../ark-${pkgver} \ diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark-libre/ark-unar-06.patch new file mode 100644 index 000000000..ab2ef274f --- /dev/null +++ b/libre/kdeutils-ark-libre/ark-unar-06.patch @@ -0,0 +1,236 @@ +diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +new file mode 100644 +index 0000000..2b5bd9e +--- /dev/null ++++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Type=Service ++X-KDE-ServiceTypes=Kerfuffle/Plugin ++X-KDE-Library=kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Author=Luke Shumaker ++X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net ++X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Version=0.0.1 ++X-KDE-PluginInfo-Website=http://www.kde.org ++X-KDE-PluginInfo-License=GPLv2+ ++X-KDE-Priority=150 ++X-KDE-Kerfuffle-APIRevision=1 ++X-KDE-Kerfuffle-ReadWrite=false ++Name=The Unarchiver plugin ++MimeType=application/x-rar; +diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp +new file mode 100644 +index 0000000..e0adcf7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/cliplugin.cpp +@@ -0,0 +1,170 @@ ++ /* ++ * ark -- archiver for the KDE project ++ * ++ * Copyright (C) 2011 Luke Shumaker <lukeshu@sbcglobal.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++#include "kerfuffle/cliinterface.h" ++#include "kerfuffle/kerfuffle_export.h" ++ ++#include <KDebug> ++ ++#include <QDateTime> ++#include <QDir> ++#include <QRegExp> ++#include <QString> ++#include <QStringList> ++ ++using namespace Kerfuffle; ++ ++class CliPlugin: public CliInterface ++{ ++public: ++ explicit CliPlugin(QObject *parent, const QVariantList & args) ++ : CliInterface(parent, args) { ++ m_indentLevel = 0; ++ } ++ ++ virtual ~CliPlugin() { ++ } ++ ++ virtual ParameterList parameterList() const { ++ static ParameterList p; ++ if (p.isEmpty()) { ++ /* Limitations: ++ * 01 - creates an empty file upon entering wrong password ++ * 02 - unar detects if output is being redirected and then does not accept any input ++ */ ++ ++ ///////////////[ COMMON ]///////////// ++ ++ p[CaptureProgress] = false; ++ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); ++ ++ ///////////////[ LIST ]///////////// ++ ++ p[ListProgram] = QLatin1String("lsar"); ++ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); ++ ++ ///////////////[ EXTRACT ]///////////// ++ ++ p[ExtractProgram] = QLatin1String("unar"); ++ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); ++ p[NoTrailingSlashes] = true; ++ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); ++ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); ++ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); ++ p[FileExistsInput] = QStringList() ++ << QLatin1String("o") //overwrite ++ << QLatin1String("s") //skip ++ << QLatin1String("O") //overwrite all ++ << QLatin1String("S") //autoskip ++ << QLatin1String("q") //cancel ++ ; ++ ++ ///////////////[ DELETE ]///////////// ++ ++ p[DeleteProgram] = QLatin1String("x-fakeprogram"); ++ //p[DeleteArgs] = ++ ++ ///////////////[ ADD ]///////////// ++ ++ p[AddProgram] = QLatin1String("x-fakeprogram"); ++ //p[AddArgs] = ++ ++ ///////////////[ ERRORS ]///////////// ++ ++ p[ExtractionFailedPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$") ++ << QLatin1String("Segmentation fault$"); ++ ++ p[WrongPasswordPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$"); ++ } ++ return p; ++ } ++ ++ QString m_entryFilename, m_internalId; ++ ArchiveEntry m_currentEntry; ++ int m_indentLevel; ++ ++ bool readListLine(const QString &line) { ++ /* lsar will give us JSON output. However, we actually parse based on ++ * the indentation. Ugly, I know, but ++ * 1. It's easier ++ * 2. lsar's JSON is invalid JSON, so actual parsers bork. ++ */ ++ ++ int spaces; ++ for(spaces=0;(spaces<line.size())&&(line[spaces]==QLatin1Char(' '));spaces++){} ++ // Since this is so ugly anyway, I'm not even going to check to ++ // make sure that spaces is even. I mean, what would I do about it? ++ int m_newIndentLevel = spaces/2; ++ ++ if (m_newIndentLevel>m_indentLevel) { ++ if (m_newIndentLevel==3) { ++ m_currentEntry.clear(); ++ m_currentEntry[IsDirectory] = false; ++ } ++ } else if (m_newIndentLevel<m_indentLevel) { ++ if ( (m_newIndentLevel<3) && (m_indentLevel>=3) ) { ++ EntryMetaDataType index = IsDirectory; ++ if (m_currentEntry[index].toBool()) { ++ m_currentEntry[FileName].toString().append(QLatin1String("/")); ++ } ++ kDebug() << "Added entry:" << m_currentEntry; ++ entry(m_currentEntry); ++ } ++ } ++ m_indentLevel = m_newIndentLevel; ++ ++ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); ++ if (rx.indexIn(line) >= 0) { ++ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); ++ QString key = rx.cap(1); ++ QString value = rx.cap(2); ++ ++ if (false) { ++ } else if (key==QLatin1String("XADFileName")) { ++ rx_unquote.indexIn(value); ++ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); ++ } else if (key==QLatin1String("XADFileSize")) { ++ m_currentEntry[Size] = value.toInt(); ++ } else if (key==QLatin1String("XADCompressedSize")) { ++ m_currentEntry[CompressedSize] = value.toInt(); ++ } else if (key==QLatin1String("XADLastModificationDate")) { ++ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); ++ m_currentEntry[Timestamp] = ts; ++ } else if (key==QLatin1String("XADIsDirectory")) { ++ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); ++ } else if (key==QLatin1String("RARCRC32")) { ++ m_currentEntry[CRC] = value.toInt(); ++ } else if (key==QLatin1String("RARCompressionMethod")) { ++ m_currentEntry[Method] = value.toInt(); ++ } else if (key==QLatin1String("Encrypted")) { ++ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); ++ } ++ // TODO: add RAR version. ([Version]) ++ } ++ ++ return true; ++ } ++}; ++ ++KERFUFFLE_EXPORT_PLUGIN(CliPlugin) ++ +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 3619412..6368839 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) + endif (LIBARCHIVE_FOUND) + + add_subdirectory( clirarplugin ) ++add_subdirectory( cliunarchiverplugin ) + add_subdirectory( cli7zplugin ) + add_subdirectory( clizipplugin ) + add_subdirectory( libsinglefileplugin ) +diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt +new file mode 100644 +index 0000000..ccd52e7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/CMakeLists.txt +@@ -0,0 +1,21 @@ ++ ++include_directories( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../.. ++ ${CMAKE_CURRENT_BINARY_DIR}/../.. ++ ) ++ ++########### next target ############### ++ ++set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) ++ ++kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) ++ ++target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) ++ ++ ++ ++########### install files ############### ++ ++install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) ++install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ++ diff --git a/libre/kdeutils-ark-libre/rePKGBUILD b/libre/kdeutils-ark-libre/rePKGBUILD deleted file mode 100644 index f40b19d3f..000000000 --- a/libre/kdeutils-ark-libre/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> -source PKGBUILD -#CARCH=x86_64 -unset build package md5sums source -_repo=extra # Put the repo here -_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here -source=(PKGBUILD - "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" - # files for pkg modifications below this line - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm -vf .{INSTALL,PKGINFO} || true - # put actions for package modifications below this line - -} - -package() { - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} - - -# vim:set ts=2 sw=2 et: diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 01ea9167c..84e095db4 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170013 2012-10-31 00:54:28Z eric $ +# $Id: PKGBUILD 174301 2013-01-04 04:58:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.10 -pkgrel=1.1 +pkgver=1.8.12 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d' +sha1sums=('f40c453af577e2870bc12981ef4df6418a627f78' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 3810fe495..4e4f94494 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.3 -pkgrel=2 +pkgrel=4 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -23,7 +23,7 @@ source=( jamendo.ico::http://www.jamendo.com/favicon.ico parabola-packages.xml parabola-wiki-en.xml - seeks-search.xml::http://www.seeks-project.info/search.php/opensearch.xml + seeks-search.xml::http://www.seeks.fr/opensearch.xml yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php ) @@ -45,6 +45,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4' 'e50a847cec81357e8730e0d327515a9c' '3c4a7f901bfe9000a702c68f7f78428c' '5bf9ca2558026fa3f4ec52d8e64fee47' - '3c68938db88b6ea552742718a08f3bf8' + 'dc6c76acf4c68a40710383513d72fa8b' 'bdb2640c643493063051bc72eeeff920' 'cb281f07933210c812a6153f32109645') diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index e1664e809..85366a600 100644 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: N30N <archlinux@alunamation.com> pkgname=unar -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') @@ -38,5 +38,5 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('ae5233dd835229f867f0948d28dde0d6' +md5sums=('d493957a56844ef9c1ad7b7dd24571fc' '4fa4ecc6e4ba14d3b6952d064e728511') diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD index 2e5aa615c..e4ac77b11 100644 --- a/libre/ununrar/PKGBUILD +++ b/libre/ununrar/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: MichaÅ‚ MasÅ‚owski <mtjm@mtjm.eu> pkgname=ununrar -pkgver=0.0a0dev20120412 +pkgver=0.0a0dev20130105 pkgrel=1 pkgdesc="An unrar-compatible interface to Unarchiver" arch=('any') @@ -12,7 +12,7 @@ provides=('unrar' 'unrar-libre') conflicts=('unrar' 'unrar-libre') options=(!emptydirs) source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz") -sha512sums=('3593198e76643b8873d06db770bf24a8d2fdab6d2ab7880850e29cb6c2f94836bcc032f6cc919dfe39deb030c2bcd942ab870231def3aee14e8e89cf78fc3d6f') +sha512sums=('d8872d529b8e813b44f353f2958712c7e602776810ed51c6de7b6364e024cde9058e724569f83445a324edf41ca25757f3d94d67018ba18e3db027a9ee6c9200') package() { cd "$srcdir/Ununrar-$pkgver" diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 0b43cbf0a..1833f020e 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,18 +8,19 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.6 -pkgrel=1 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-lts-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" - 'expac') + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -32,16 +33,17 @@ build() { } package_virtualbox-libre-host-modules-lts(){ - pkgdesc='Host kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-host-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -50,17 +52,18 @@ package_virtualbox-libre-host-modules-lts(){ } package_virtualbox-libre-guest-modules-lts(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' license=('GPL') +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-guest-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 948465a99..067a95fdd 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,18 +7,19 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.6 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" - 'expac') + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,16 +32,17 @@ build() { } package_virtualbox-libre-host-modules(){ + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -49,17 +51,18 @@ package_virtualbox-libre-host-modules(){ } package_virtualbox-libre-guest-modules(){ + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 710177923..dc94a2a33 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -11,10 +11,9 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-host-dkms' 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' - 'virtualbox-libre-guest-utils' - 'virtualbox-libre-ext-vnc') + 'virtualbox-libre-guest-utils') pkgver=4.2.6 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -29,7 +28,6 @@ makedepends=('alsa-lib' 'libidl2' 'libpulse' 'libstdc++5' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' @@ -109,8 +107,8 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '85141ccd2621a8e004b8f55c9a1f83eb' - '54884839546647efd75adb22dbd68337') + '05d166104a66ee479896c941ac27a3d0' + '78168f8699aa01a632603f0d5b1b8281') build() { cd "VirtualBox-$pkgver" @@ -151,7 +149,6 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ - --enable-vnc \ --disable-kmods source ./env.sh kmk all @@ -166,11 +163,6 @@ build() { sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all popd - - # build VNC pack - pushd src/VBox/ExtPacks/VNC - kmk packing - popd } package_virtualbox-libre() { @@ -294,7 +286,7 @@ package_virtualbox-libre-host-dkms() { conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-host-source.install + install=virtualbox-libre-host-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" @@ -310,7 +302,7 @@ package_virtualbox-libre-guest-dkms() { conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-guest-source.install + install=virtualbox-libre-guest-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" @@ -356,18 +348,4 @@ package_virtualbox-libre-guest-utils(){ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } -package_virtualbox-libre-ext-vnc() { - pkgdesc='VirtualBox VNC extension pack' - depends=('virtualbox-libre' 'libvncserver') - optdepends=('tigervnc: vnc client') - replaces=('virtualbox-ext-vnc') - conflicts=('virtualbox-ext-vnc') - provides=("virtualbox-ext-vnc=$pkgver") - install=virtualbox-libre-ext-vnc.install - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" - install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" -} - # vim:set ts=4 sw=4 et: diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index db6774542..91d15e380 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -502,10 +502,10 @@ index 6ae0372..df65e60 100644 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -index 4c52fb0..fbccfaf 100644 +index c5a4cfe..7d2b363 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -@@ -44,45 +44,33 @@ struct osTypePattern +@@ -44,46 +44,33 @@ struct osTypePattern static const osTypePattern gs_OSTypePattern[] = { @@ -523,6 +523,7 @@ index 4c52fb0..fbccfaf 100644 - { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, - { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, - { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, +- { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, - { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, - { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, - { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -578,7 +579,7 @@ index 4c52fb0..fbccfaf 100644 { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -90,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, @@ -587,7 +588,7 @@ index 4c52fb0..fbccfaf 100644 { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -624,6 +625,7 @@ index 4c52fb0..fbccfaf 100644 + { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, + { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, + { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, ++ { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, + { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, + { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, + { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -646,27 +648,27 @@ index 4c52fb0..fbccfaf 100644 { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, -+ ++ + /* Other: */ { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; -@@ -230,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) +@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) /* Create widgets: */ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { + pMainLayout->setContentsMargins(8, 6, 8, 6); m_pLabel = new QIRichTextLabel(this); -+ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); ++ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); m_pNameAndSystemEditor = new UINameAndSystemEditor(this); - pMainLayout->addWidget(m_pLabel); - pMainLayout->addWidget(m_pNameAndSystemEditor); - pMainLayout->addStretch(); -+ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); ++ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + pMainLayout->addWidget(m_pLabel, 1); + pMainLayout->addWidget(m_pNameAndSystemEditor, 1); } @@ -719,10 +721,10 @@ index 9a31a4c..7db11ad 100644 </xsl:attribute> <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/> diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -index 075f097..3d311e1 100644 +index 4523dad..38ae21a 100644 --- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -@@ -70,6 +70,24 @@ +@@ -71,6 +71,24 @@ <file alias="os_oracle_64.png">images/os_oracle_64.png</file> <file alias="os_macosx.png">images/os_macosx.png</file> <file alias="os_macosx_64.png">images/os_macosx_64.png</file> @@ -748,10 +750,10 @@ index 075f097..3d311e1 100644 <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> <file alias="hd_32px.png">images/hd_32px.png</file> diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -index ec404df..c09e3b1 100644 +index 8af9597..39a8d39 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -@@ -4334,11 +4334,11 @@ void VBoxGlobal::init() +@@ -4336,11 +4336,11 @@ void VBoxGlobal::init() {"OS2Warp45", ":/os_os2warp45.png"}, {"OS2eCS", ":/os_os2ecs.png"}, {"OS2", ":/os_os2_other.png"}, @@ -768,7 +770,7 @@ index ec404df..c09e3b1 100644 {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, -@@ -4361,7 +4361,7 @@ void VBoxGlobal::init() +@@ -4363,7 +4363,7 @@ void VBoxGlobal::init() {"Xandros_64", ":/os_xandros_64.png"}, {"Oracle", ":/os_oracle.png"}, {"Oracle_64", ":/os_oracle_64.png"}, @@ -777,7 +779,7 @@ index ec404df..c09e3b1 100644 {"FreeBSD", ":/os_freebsd.png"}, {"FreeBSD_64", ":/os_freebsd_64.png"}, {"OpenBSD", ":/os_openbsd.png"}, -@@ -4377,6 +4377,25 @@ void VBoxGlobal::init() +@@ -4379,6 +4379,25 @@ void VBoxGlobal::init() {"MacOS", ":/os_macosx.png"}, {"MacOS_64", ":/os_macosx_64.png"}, {"JRockitVE", ":/os_jrockitve.png"}, @@ -1393,19 +1395,19 @@ index 275e1e6..34171eb 100644 <context> <name>UINetworkManagerDialog</name> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts -index fcaed77..ab92ef9 100644 +index f902373..625da36 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts -@@ -4830,6 +4830,10 @@ - <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> - <translation>نوع سیستم عاملی Ú©Ù‡ شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation> +@@ -4850,6 +4850,10 @@ + <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source> + <translation>نوع سیستم عاملی Ú©Ù‡ شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation> </message> + <message> + <source>We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source> + <translation type="unfinished"></translation> + </message> - </context> - <context> + </context> + <context> <name>UINetworkManagerDialog</name> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts index 3f31f8f..9248344 100644 diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 138bbd612..e93fe80e8 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300 -+++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300 +--- VirtualBox-4.2.6.orig/Config.kmk 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/Config.kmk 2012-12-27 14:28:22.897125304 -0200 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -55,7 +55,16 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -609,17 +596,6 @@ +@@ -580,8 +567,6 @@ + if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) + VBOX_WITH_CROGL = 1 + endif +-# Enable the VNC server extension pack (GPL only). +-#VBOX_WITH_EXTPACK_VNC = 1 + # Enable S3 support (requires libcurl) + VBOX_WITH_S3 = 1 + # Enable Host=>Guest Drag'n'Drop +@@ -621,17 +606,6 @@ endif ## @} @@ -73,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -810,14 +786,6 @@ +@@ -822,14 +796,6 @@ # Skip stuff. # @@ -88,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -872,7 +840,6 @@ +@@ -884,7 +850,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -96,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -894,7 +861,6 @@ +@@ -906,7 +871,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -104,7 +113,16 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -985,9 +951,6 @@ +@@ -979,7 +943,7 @@ + # + # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. + # +-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\ ++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\ + , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) + if $(words $(VBOX_ONLY_BUILD)) > 1 + $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) +@@ -997,9 +961,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -114,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1118,10 +1081,6 @@ +@@ -1130,10 +1091,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -125,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1744,9 +1703,6 @@ +@@ -1738,9 +1695,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -135,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2638,13 +2594,6 @@ +@@ -2632,13 +2586,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -149,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4100,99 +4049,6 @@ +@@ -4099,99 +4046,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -249,6 +267,131 @@ # # Qt 4 # Qt 4 +--- VirtualBox-4.2.6.orig/configure 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/configure 2012-12-27 14:26:25.743442978 -0200 +@@ -90,8 +90,6 @@ + WITH_HARDENING=1 + WITH_UDPTUNNEL=1 + WITH_VDE=0 +-WITH_VNC=0 +-WITH_EXTPACK=1 + WITH_DOCS=1 + BUILD_LIBXML2= + BUILD_LIBCURL= +@@ -124,8 +122,6 @@ + MESA="-lGL" + INCZ="" + LIBZ="-lz" +-INCVNCSERVER="" +-LIBVNCSERVER="-lvncserver" + INCDEVMAPPER="" + LIBDEVMAPPER="-ldevmapper" + CXX_FLAGS="" +@@ -930,47 +926,6 @@ + } + + # +-# Check for libvncserver, needed for VNC in OSE +-# +-check_vncserver() +-{ +- test_header libvncserver +- cat > $ODIR.tmp_src.cc <<EOF +-#include <cstdio> +-#include <rfb/rfbconfig.h> +- +-extern "C" int main() +-{ +- const char* v=LIBVNCSERVER_VERSION; +- unsigned int major = 0, minor = 0, micro = 0; +- +- for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; +- +- printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); +- if (major*10000 + minor*100 + micro >= 900) +- { +- printf(", OK.\n"); +- return 0; +- } +- else +- { +- printf(", expected version 0.9 or higher\n"); +- return 1; +- } +-} +-EOF +- if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then +- if test_execute; then +- cnf_append "VBOX_WITH_EXTPACK_VNC" "1" +- fi +- fi +-} +- +-# + # Check for libcurl, needed by S3 + # + check_curl() +@@ -2173,8 +2128,6 @@ + [ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" + [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" + [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" +-[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" +-[ $OSE -eq 0 ] && echo " --disable-extpack don't build the extpack" + [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" + [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" + cat << EOF +@@ -2346,15 +2299,9 @@ + --enable-webservice) + [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 + ;; +- --enable-vnc) +- WITH_VNC=1 +- ;; + --disable-hardening) + WITH_HARDENING=0 + ;; +- --disable-extpack) +- WITH_EXTPACK=0 +- ;; + --disable-docs) + WITH_DOCS=0 + ;; +@@ -2512,15 +2459,6 @@ + echo >> $CNF + fi + +-# extpack +-if [ $OSE -eq 0 ]; then +- if [ $WITH_EXTPACK -eq 1 ]; then +- BUILD_LIBSSL=1 +- else +- cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" "" +- fi +-fi +- + # headless + if [ -n "$HEADLESS" ]; then + cnf_append "VBOX_HEADLESS" "1" +@@ -2646,15 +2584,6 @@ + cnf_append "VBOX_WITH_DOCS_PACKING" "" + fi + +-# VNC server support +-if [ $OSE -ge 1 ]; then +- if [ $WITH_VNC = 1 ]; then +- check_vncserver +- else +- cnf_append "VBOX_WITH_EXTPACK_VNC" "" +- fi +-fi +- + # success! + echo + echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 +++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 @@ -378,7 +378,6 @@ diff --git a/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install deleted file mode 100644 index 828a16a1d..000000000 --- a/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install +++ /dev/null @@ -1,25 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" -} - -# arg 1: the old package version -pre_remove() { - VBoxManage extpack uninstall 'VNC' >/dev/null -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install index 2d62eae43..2d62eae43 100644 --- a/libre/virtualbox-libre/virtualbox-libre-guest-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install index 8028cb7e0..8028cb7e0 100644 --- a/libre/virtualbox-libre/virtualbox-libre-host-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index 3d93b47a3..90d8a8739 100644 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -30,7 +30,7 @@ post_upgrade() { post_install "$1" if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then cat << EOF -===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-modules. +===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules. ===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package. EOF fi diff --git a/pcr/chm2pdf/PKGBUILD b/pcr/chm2pdf/PKGBUILD new file mode 100644 index 000000000..16586e732 --- /dev/null +++ b/pcr/chm2pdf/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: Rodrigo Coacci <rcoacci@gmail.com> +# Contributor: fes0 +# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO> + +pkgname=chm2pdf +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A simple Python script that converts CHM files into PDF files." +arch=('any') +license=('GPL2') +url="http://code.google.com/p/chm2pdf/" +depends=('chmlib' 'python2' 'python2-pychm' 'htmldoc') +optdepends=('beautiful-soup: A Python HTML/XML parser designed for quick turnaround projects like screen-scraping') +source=('http://chm2pdf.googlecode.com/files/chm2pdf-0.9.1.tar.gz') + + +build() { + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $srcdir/$pkgname-$pkgver/chm2pdf + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$startdir/pkg +} + diff --git a/pcr/emacs-newlisp/PKGBUILD b/pcr/emacs-newlisp/PKGBUILD new file mode 100644 index 000000000..25dcbc219 --- /dev/null +++ b/pcr/emacs-newlisp/PKGBUILD @@ -0,0 +1,24 @@ +# Contributor: Jan Kròávek <wamba@centrum.cz> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=emacs-newlisp +pkgver=0.25 +pkgrel=5 +arch=('any') +pkgdesc="Emacs mode for Newlisp." +url="http://artfulcode.net/projects" +depends=('emacs') +makedepends=('unzip') +license=('GPL') +source=(http://www.artfulcode.net/wp-content/uploads/2008/12/newlisp-mode.zip) +noextract=newlisp-mode.zip +install=emacs-newlisp.install + +build() { + cd $srcdir + unzip -quo newlisp-mode.zip || return 1 + cd $srcdir/newlisp-mode || return 1 + install -d $pkgdir/usr/share/emacs/site-lisp/newlisp-mode + install -Dm644 *.el $pkgdir/usr/share/emacs/site-lisp/newlisp-mode +} diff --git a/pcr/emacs-newlisp/emacs-newlisp.install b/pcr/emacs-newlisp/emacs-newlisp.install new file mode 100644 index 000000000..640e19d16 --- /dev/null +++ b/pcr/emacs-newlisp/emacs-newlisp.install @@ -0,0 +1,26 @@ +# vim: set ft=sh: +post_install() { + echo " +=> Autoloading: + ------------ + In your .emacs or .init.el + (add-to-list 'load-path (expand-file-name \"/usr/share/emacs/site-lisp/newlisp-mode\")) + (add-to-list 'auto-mode-alist '(\"\\\\.lsp\\\\'\" . newlisp-mode)) + (autoload 'newlisp-mode \"newlisp\" \"Turn on NewLisp mode\" t) + (turn-on-font-lock) + +=> Newlisp is started with the Emacs command M-x newlisp-mode." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install +} + +op=$1 +shift + +$op $* diff --git a/pcr/ipmitool/PKGBUILD b/pcr/ipmitool/PKGBUILD new file mode 100644 index 000000000..38d4eb237 --- /dev/null +++ b/pcr/ipmitool/PKGBUILD @@ -0,0 +1,18 @@ +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=ipmitool +pkgver=1.8.11 +pkgrel=1 +pkgdesc="Command-line interface to IPMI-enabled devices" +arch=(i686 x86_64) +url="http://ipmitool.sourceforge.net" +depends=('glibc' 'bash' 'openssl') +license=("BSD") +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr --with-kerneldir + make || return 1 + make DESTDIR=${startdir}/pkg install +} diff --git a/pcr/ipmiutil/PKGBUILD b/pcr/ipmiutil/PKGBUILD new file mode 100644 index 000000000..132ea7c59 --- /dev/null +++ b/pcr/ipmiutil/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: goodmen <goodmenlinux@gmail.com> +# Contributor: Gergely Imreh <imrehgATgmailDOTcom> +# Contributors: champus, madeye, Ranguvar and ninja_pt +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=ipmiutil +pkgver=2.7.5 +pkgrel=1 +pkgdesc="A simple program that lists results from the hardware detection library." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/ipmiutil/" +license=('BSD2.0') +depends=('') +makedepends=('openssl') +options=('!emptydirs') +source=("http://prdownloads.sourceforge.net/ipmiutil/ipmiutil-${pkgver}.tar.gz") + +build() { + cd ${srcdir} + tar -xf ${pkgname}-${pkgver}.tar.gz + + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --enable-gpl + make -j1 || return 1 + make DESTDIR=${pkgdir} install || return 1 +} diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD new file mode 100644 index 000000000..372243b2a --- /dev/null +++ b/pcr/libav-builder/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +static=false +pkgbase=libav +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + pkgname=libav-static-builder +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + pkgname=libav-builder +fi +pkgflag=builder +pkgver=0.8.4 +pkgrel=1 +pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" +arch=any +url="http://$pkgbase.org/" +license=GPL +depends=${pkgname%-$pkgflag}=$pkgver +conflicts=( + ffmpeg + ffmpeg-static +) +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + conflicts+=( + ${pkgname%-static-$pkgflag} + ) +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + conflicts+=( + ${pkgname%-$pkgflag}-static + ) +fi + +package() { + install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}} + include_list=$(ls /opt/${pkgname%-$pkgflag}/include) + for i in $include_list; do + ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include + done + lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib) + for l in $lib_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib + done + pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig) + for c in $pkgconfig_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig + done +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD new file mode 100644 index 000000000..da47f927b --- /dev/null +++ b/pcr/luabind/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# Maintainer: Jakob Gruber <jakob.gruber@gmail.com> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: rayte <rabyte.at.gmail.dot.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=luabind +pkgver=0.9.1 +pkgrel=3 +pkgdesc='A library that helps you create bindings between C++ and Lua' +arch=( + i686 + x86_64 + mips64el +) +url="http://www.rasterbar.com/products/$pkgname.html" +license=MIT +makedepends=( + boost + boost-build + unzip +) +depends=( + gcc-libs + lua51 +) +source=( + "http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + ${pkgname}_boost.patch +) +md5sums=( + 8a323fb51d07dad5cfdb12c432793d55 + d62ae6fc635300bc659df9dbb587ac53 +) + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i $srcdir/${pkgname}_boost.patch + + # build luabind + setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared +} + +package() { + cd $srcdir/$pkgname-$pkgver + + setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared install + + # copy license + install -Dm644 $srcdir/$pkgname-$pkgver/LICENSE \ + $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/luabind/luabind_boost.patch b/pcr/luabind/luabind_boost.patch new file mode 100644 index 000000000..92e32828a --- /dev/null +++ b/pcr/luabind/luabind_boost.patch @@ -0,0 +1,59 @@ +diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp +index 1b45ec1..8f5afff 100644 +--- luabind-0.9.1/luabind/detail/call_function.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp +@@ -323,7 +323,8 @@ namespace luabind + + #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -440,4 +441,5 @@ namespace luabind + + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp +index de8d563..e63555b 100644 +--- luabind-0.9.1/luabind/detail/call_member.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp +@@ -316,7 +316,8 @@ namespace luabind + + #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -360,4 +361,5 @@ namespace luabind + #undef LUABIND_TUPLE_PARAMS + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp +index d54c668..0f88cc5 100755 +--- luabind-0.9.1/luabind/wrapper_base.hpp ++++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp +@@ -89,7 +89,8 @@ namespace luabind + + #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -188,3 +189,4 @@ namespace luabind + #undef N + + #endif ++#endif diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD new file mode 100644 index 000000000..0a7209f0b --- /dev/null +++ b/pcr/mosquitto/PKGBUILD @@ -0,0 +1,34 @@ +# This is the PKGBUILD for mosquitto, an MQTT broker and example clients +# Maintainer: Dan Anderson <dan-anderson@cox.net> +# Contributor: Gordon JC Pearce <gordon@gjcp.net> + +pkgname=mosquitto +pkgver=1.1 +pkgrel=1 +pkgdesc="An MQTT broker and clients" +arch=(i686 x86_64 mips64el) +url="http://mosquitto.org/" +makedepends=('python') +optdepends=('python: python support') +license=('BSD') +source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('ab51f64eb3f0041402073aa7865f3ec4' + '76fbc38a2eb0b8110caf7ac1f43d4057') + +build() { + cd "$srcdir/$pkgname-$pkgver" +# Remove hardcoded prefix + find -name Makefile -exec sed '/prefix=/d' -i {} \; + + make prefix=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr DESTDIR="$pkgdir/" install + + install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 LICENSE-3rd-party.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-3rd-party +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/newlisp/PKGBUILD b/pcr/newlisp/PKGBUILD new file mode 100644 index 000000000..a53106390 --- /dev/null +++ b/pcr/newlisp/PKGBUILD @@ -0,0 +1,26 @@ +# Contributor: scrawler <scrawler@gmail.com> +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO> + +pkgname=newlisp +pkgver=10.4.5 +pkgrel=1 +pkgdesc="newLISP is a LISP like, general purpose scripting language." +url="http://www.newlisp.org" +license=('GPL') +arch=('x86_64' 'i686') +depends=('readline') +optdepends=('openjdk6') +options=('docs') +source=(http://newlisp.org/downloads/$pkgname-$pkgver.tgz) +install=$pkgname.install + +build() { +cd $srcdir/$pkgname-$pkgver +./configure +[ $CARCH = "x86_64" ] && make -f makefile_linuxLP64_utf8 +[ $CARCH = "i686" ] && make -f makefile_linux_utf8 +install -d $pkgdir/usr/bin +install -d $pkgdir/usr/share/man/man1 +make bindir=$pkgdir/usr/bin mandir=$pkgdir/usr/share/man \ +datadir=$pkgdir/usr/share install +} diff --git a/pcr/newlisp/newlisp.install b/pcr/newlisp/newlisp.install new file mode 100644 index 000000000..2c7fd8481 --- /dev/null +++ b/pcr/newlisp/newlisp.install @@ -0,0 +1,20 @@ +pre_install() { + rm /usr/bin/newlisp +} + +post_install() { + ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp +} + +pre_upgrade() { +[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp +} + +post_upgrade() { + ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp +} + +pre_remove() { +[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp +} + diff --git a/pcr/python-renpy/ChangeLog b/pcr/python-renpy/ChangeLog new file mode 100644 index 000000000..0a357d3db --- /dev/null +++ b/pcr/python-renpy/ChangeLog @@ -0,0 +1,32 @@ +2012-28-07 AlexanderR <alexanderr at gmx dot com> + + * 6.14.1-1 : + new upstream release. + added renpy.diff. + +2012-22-07 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-3 : + fixed build with latest ffmpeg at cost of sound. + +2012-26-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-2 : + moved python-pygame from makedepends to depends. + +2012-20-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.11-1 : + new upstream release. + moved python-pygame dependency form renpy to python-renpy. + +2011-22-03 AlexanderR <alexanderr at gmx dot com> + + * 16.13.9-2 : + added ChangeLog. + fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python-renpy/PKGBUILD b/pcr/python-renpy/PKGBUILD new file mode 100644 index 000000000..f7c16e9b9 --- /dev/null +++ b/pcr/python-renpy/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: AlexanderR <rvacheva at nxt dot ru> +# Contributor: zhn <zhangn1985 AT gmail com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=python-renpy +pkgver=6.14.1 +pkgrel=2 +pkgdesc="Platform-dependant Ren'Py libraries." +arch=('i686' 'x86_64' 'mips64el') +license=('MIT') +url='http://www.renpy.org/' +depends=('ffmpeg' 'fribidi' 'glew' 'python2-pygame' 'mesa') +options=(!buildflags) +conflicts=("renpy<$pkgver" 'renpy64' 'renpy-bin') +# python-argparse is part of distribution since 2.7 +makedepends=('python2>=2.7' 'cython') +changelog=ChangeLog +source=("http://www.renpy.org/dl/$pkgver/renpy-${pkgver}-source.tar.bz2" + python2.diff + renpy.diff) + +md5sums=('16814530ba9ce1f2968bb8c8c785651b' + '19b861f4d934bfea817c161bf3ea1142' + '14f789d847dbd4278a2d5d74ab551e2d') + +build() { + cd "$srcdir"/renpy-${pkgver}-source + + #patch -p1 < ../python2.diff + patch -Rp1 < ../renpy.diff + + CFLAGS=-Os python2 module/setup.py build +} + +package(){ + cd "$srcdir"/renpy-${pkgver}-source + + # install python-renpy + CFLAGS=-Os python2 module/setup.py install --root="$pkgdir/" --prefix=/usr --optimize=1 + install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/pcr/python-renpy/python2.diff b/pcr/python-renpy/python2.diff new file mode 100644 index 000000000..c1e68d87e --- /dev/null +++ b/pcr/python-renpy/python2.diff @@ -0,0 +1,8 @@ +--- a/module/setup.py.orig 2011-09-06 07:50:08.000000000 +0800 ++++ b/module/setup.py 2011-09-16 18:38:42.187110252 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + import platform + import sys diff --git a/pcr/python-renpy/renpy.diff b/pcr/python-renpy/renpy.diff new file mode 100644 index 000000000..89a6b8c05 --- /dev/null +++ b/pcr/python-renpy/renpy.diff @@ -0,0 +1,20 @@ +diff -aur renpy-6.14.1-source.new/module/ffdecode.c renpy-6.14.1-source/module/ffdecode.c +--- renpy-6.14.1-source.new/module/ffdecode.c 2012-08-28 16:49:27.217523406 +1100 ++++ renpy-6.14.1-source/module/ffdecode.c 2012-08-26 15:28:30.000000000 +1100 +@@ -1152,6 +1152,7 @@ + AVFormatContext *ic; + int err, i, ret, video_index, audio_index; + AVPacket pkt1, *pkt = &pkt1; ++ AVFormatParameters params, *ap = ¶ms; + int codecs_locked = 0; + + // url_set_interrupt_cb(decode_interrupt_cb); +@@ -1161,6 +1162,8 @@ + is->video_stream = -1; + is->audio_stream = -1; + ++ memset(ap, 0, sizeof(*ap)); ++ + is->io_context = rwops_open(is->rwops); + + codecs_locked = 1; diff --git a/pcr/python2-renpy/ChangeLog b/pcr/python2-renpy/ChangeLog new file mode 100644 index 000000000..0a357d3db --- /dev/null +++ b/pcr/python2-renpy/ChangeLog @@ -0,0 +1,32 @@ +2012-28-07 AlexanderR <alexanderr at gmx dot com> + + * 6.14.1-1 : + new upstream release. + added renpy.diff. + +2012-22-07 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-3 : + fixed build with latest ffmpeg at cost of sound. + +2012-26-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-2 : + moved python-pygame from makedepends to depends. + +2012-20-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.11-1 : + new upstream release. + moved python-pygame dependency form renpy to python-renpy. + +2011-22-03 AlexanderR <alexanderr at gmx dot com> + + * 16.13.9-2 : + added ChangeLog. + fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD new file mode 100644 index 000000000..4d6611548 --- /dev/null +++ b/pcr/python2-renpy/PKGBUILD @@ -0,0 +1,66 @@ +# Maintainer: AlexanderR <rvacheva at nxt dot ru> +# Contributor: zhn <zhangn1985 AT gmail com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=python2-renpy +pkgflag=renpy +pkgver=6.14.1 +pkgrel=3 +pkgdesc="Platform-dependant Ren'Py libraries." +arch=( + i686 + x86_64 + mips64el +) +license=MIT +url="http://www.$pkgflag.org/" +depends=( + fribidi + glew + libav + libgl + python2-pygame +) +# python-argparse is part of distribution since 2.7 +makedepends=( + cython2 + libav-builder # to solve libav deps + mesa + 'python2>=2.7' +) +options=!buildflags +provides="python-$pkgflag=$pkgver" +conflicts=( + python-$pkgflag + "$pkgflag<$pkgver" + $pkgflag64 + $pkgflag-bin +) +renplaces=python-$pkgflag +changelog=ChangeLog +source=( + "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2" +) + +md5sums=( + 16814530ba9ce1f2968bb8c8c785651b +) + +build() { + cd $srcdir/$pkgflag-$pkgver-source + + sed -i -e ' + s#!/usr/bin/env python#!/usr/bin/env python2#; + ' module/setup.py + + CFLAGS=-Os setarch $CARCH python2 module/setup.py build +} + +package(){ + cd $srcdir/$pkgflag-$pkgver-source + + # install python2-$pkgflag + CFLAGS=-Os setarch $CARCH python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog new file mode 100644 index 000000000..566d97fa9 --- /dev/null +++ b/pcr/renpy/ChangeLog @@ -0,0 +1,30 @@ +2012-28-07 AlexanderR <alexanderr at gmx dot com> + + * 6.14.1-1 : + new upstream release. + removed optdepends. + removed jedit-external.diff (does not work anymore). + +2012-23-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + Added notice abot RENPY_BASE usage to renpy.install. + +2012-20-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR <alexanderr at gmx dot com> + + * 6.13.11-1 : + new upstream release. + +2012-16-03 AlexanderR <alexanderr at gmx dot com> + + * 6.13.9-1 : + re-split package python-renpy into two. added ChangeLog. + added jedit-external.diff to split jedit into optdepends. + added profile.d scripts to export RENPY_BASE. + added icon, launcher script and .desktop file. + creation of link from /usr/share/renpy/doc to /usr/share/doc/renpy. diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD new file mode 100644 index 000000000..89c07a433 --- /dev/null +++ b/pcr/renpy/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: AlexanderR <rvacheva at nxt dot ru> + +pkgname=renpy +pkgver=6.14.1 +pkgrel=1 +pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools." +arch=('any') +license=('MIT') +url='http://www.renpy.org/' +# is ttf-dejavu required by renpy or games itself? +depends=("python-renpy=$pkgver" 'ttf-dejavu') +options=(!strip !zipman) +conflicts=('renpy-bin' 'renpy64') +replaces=('renpy64') +install=renpy.install +changelog=ChangeLog +source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2" + "${pkgname}.desktop" + "${pkgname}."{sh,csh} + 'python2.diff' + 'renpy-launcher.sh') + +md5sums=('16814530ba9ce1f2968bb8c8c785651b' + 'a9beb35fa6c6d8af7ba5d2a764c33158' + 'd206d24b78e207a2c3b603fef14ac47f' + '8b9922e26e567248a2a5adc1d0cdfdd4' + '0476b16220e6faeb031e1dbfe45249b4' + 'dfa92cdecc15e5c1ddee387fbbbb2d9c') + +build() { + cd "$srcdir/renpy-$pkgver-source" + + patch -p1 < ../python2.diff + + # fonts are provided by ttf-dejavu + rm common/DejaVuSans.ttf common/DejaVuSans.txt +} + +package(){ + mkdir -p "$pkgdir/"{usr/share/{$pkgname,doc/$pkgname},etc/profile.d} + + cd "$srcdir" + + install -m755 ${pkgname}.{sh,csh} "$pkgdir/etc/profile.d" + install -D -m755 $pkgname-launcher.sh "$pkgdir/usr/bin/$pkgname" + install -D -m644 ${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop" + + cd renpy-$pkgver-source + + cp -r launcher renpy common renpy.py template the_question tutorial "$pkgdir/usr/share/$pkgname" + cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" + install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" + install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + chgrp -R games "$pkgdir"/usr/share/renpy/{the_question,tutorial} + chmod g+w "$pkgdir"/usr/share/renpy/{the_question,tutorial} +} diff --git a/pcr/renpy/python2.diff b/pcr/renpy/python2.diff new file mode 100644 index 000000000..9153659a2 --- /dev/null +++ b/pcr/renpy/python2.diff @@ -0,0 +1,8 @@ +--- renpy-6.13.9/renpy.py 2012-01-16 01:48:05.000000000 +1100 ++++ renpy-6.13.9.new/renpy.py 2012-03-16 05:36:41.406170787 +1100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + #@PydevCodeAnalysisIgnore + # Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us> + # diff --git a/pcr/renpy/renpy-launcher.sh b/pcr/renpy/renpy-launcher.sh new file mode 100644 index 000000000..605c0c1fd --- /dev/null +++ b/pcr/renpy/renpy-launcher.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +mkdir -p ~/renpy_projects +cd ~/renpy_projects +exec env python2 -OO /usr/share/renpy/renpy.py "$@" diff --git a/pcr/renpy/renpy.csh b/pcr/renpy/renpy.csh new file mode 100644 index 000000000..71269b48c --- /dev/null +++ b/pcr/renpy/renpy.csh @@ -0,0 +1 @@ +setenv RENPY_BASE /usr/share/renpy/ diff --git a/pcr/renpy/renpy.desktop b/pcr/renpy/renpy.desktop new file mode 100644 index 000000000..5cd64ea94 --- /dev/null +++ b/pcr/renpy/renpy.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Ren'Py +GenericName= renpy +GenericName[fr]= renpy +Comment=A programming language and runtime, intended to ease the creation of visual-novel type games. +Comment[fr]=Un langage de programmation et un exécutable conçus pour faciliter la création de jeux de type "visual-novel" +Icon=renpy.png +Exec=renpy +Categories=Game;AdventureGame; + diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install new file mode 100644 index 000000000..9630a255f --- /dev/null +++ b/pcr/renpy/renpy.install @@ -0,0 +1,21 @@ +post_install() { + ln -sf "/usr/share/doc/renpy" "/usr/share/renpy/doc" + + cat << EOF +This package sets global environment variable RENPY_BASE, forcing all RenPy +games, including incompatible ones, to use system-wide interpreter. Undefine +this variable to launch games, you downloaded somewhere, with their built-in +versions of interpreter. + +To run two example games: The Question and RenPy Tutorial you should be +member of "games" group. +EOF +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm "/usr/share/renpy/doc" +} diff --git a/pcr/renpy/renpy.sh b/pcr/renpy/renpy.sh new file mode 100644 index 000000000..32b2e6d29 --- /dev/null +++ b/pcr/renpy/renpy.sh @@ -0,0 +1 @@ +export RENPY_BASE=/usr/share/renpy/ |