summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-04 03:59:54 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-04 03:59:54 -0300
commit56cad5443b999b8308b5c2c5e278ff6acc24c1c6 (patch)
treeeba35b35755c34974bf76684c14ebb35c65aa19c /libre
parent6ada45cd8762539f08e0477d65b5af697419843c (diff)
parente18624050b62423c4e689ee2abf9929c6b46e5d5 (diff)
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/xchat/ChangeLog (renamed from libre/xchat-libre/ChangeLog)0
-rw-r--r--libre/xchat/PKGBUILD (renamed from libre/xchat-libre/PKGBUILD)18
-rw-r--r--libre/xchat/no-firefox.patch (renamed from libre/xchat-libre/no-firefox.patch)0
-rw-r--r--libre/xchat/remove-non-free-suggestion.patch (renamed from libre/xchat-libre/remove-non-free-suggestion.patch)0
-rw-r--r--libre/xchat/xchat-2.8.8-glib-2.31.patch (renamed from libre/xchat-libre/xchat-2.8.8-glib-2.31.patch)0
-rw-r--r--libre/xchat/xchat-2.8.8-libnotify07.patch (renamed from libre/xchat-libre/xchat-2.8.8-libnotify07.patch)0
-rw-r--r--libre/xchat/xchat-2.8.8-link-against-libnotify.patch (renamed from libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch)0
-rw-r--r--libre/xchat/xchat.install (renamed from libre/xchat-libre/xchat.install)0
-rw-r--r--libre/xorg-fonts-100dpi/PKGBUILD (renamed from libre/xorg-fonts-100dpi-libre/PKGBUILD)9
-rw-r--r--libre/xorg-fonts-100dpi/xfonts.install (renamed from libre/xorg-fonts-100dpi-libre/xfonts.install)0
-rw-r--r--libre/xorg-fonts-75dpi/PKGBUILD (renamed from libre/xorg-fonts-75dpi-libre/PKGBUILD)9
-rw-r--r--libre/xorg-fonts-75dpi/xfonts.install (renamed from libre/xorg-fonts-75dpi-libre/xfonts.install)0
-rw-r--r--libre/xorg-fonts-type1/PKGBUILD (renamed from libre/xorg-fonts-type1-libre/PKGBUILD)9
-rw-r--r--libre/xorg-fonts-type1/xfonts.install (renamed from libre/xorg-fonts-type1-libre/xfonts.install)0
-rw-r--r--libre/xscreensaver/LICENSE (renamed from libre/xscreensaver-libre/LICENSE)0
-rw-r--r--libre/xscreensaver/PKGBUILD (renamed from libre/xscreensaver-libre/PKGBUILD)21
-rw-r--r--libre/xscreensaver/xscreensaver-add-electricsheep.diff (renamed from libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff)0
17 files changed, 30 insertions, 36 deletions
diff --git a/libre/xchat-libre/ChangeLog b/libre/xchat/ChangeLog
index faa8383c8..faa8383c8 100644
--- a/libre/xchat-libre/ChangeLog
+++ b/libre/xchat/ChangeLog
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat/PKGBUILD
index 50bee2561..0bd62f95e 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat/PKGBUILD
@@ -3,23 +3,21 @@
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgname=xchat
-pkgname=xchat-libre
+pkgname=xchat
pkgver=2.8.8
-pkgrel=14
+pkgrel=14.parabola1
pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xchat.org/"
-provides=("xchat=$pkgver")
-replaces=('xchat')
-conflicts=('xchat')
+replaces=('xchat-libre')
+conflicts=('xchat-libre')
license=('GPL')
depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
makedepends=('tcl' 'perl' 'python2' 'librsvg')
optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
'python2: for python plugin')
install=xchat.install
-source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz
+source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
http://xchat.org/files/icons/xchat-svg.tar.bz2
xchat-2.8.8-libnotify07.patch
xchat-2.8.8-link-against-libnotify.patch
@@ -35,7 +33,7 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
'20aef0ae608af6b30e1b4249f9c53830f8f514f6')
prepare() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c
patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
@@ -45,7 +43,7 @@ prepare() {
}
build() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
autoconf
autoheader
@@ -55,7 +53,7 @@ build() {
}
package() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
for i in 24 32 48 64 128 256 ; do
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat/no-firefox.patch
index 60c4846ee..60c4846ee 100644
--- a/libre/xchat-libre/no-firefox.patch
+++ b/libre/xchat/no-firefox.patch
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat/remove-non-free-suggestion.patch
index f20894610..f20894610 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat/remove-non-free-suggestion.patch
diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat/xchat-2.8.8-glib-2.31.patch
index 63f562ff8..63f562ff8 100644
--- a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch
+++ b/libre/xchat/xchat-2.8.8-glib-2.31.patch
diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat/xchat-2.8.8-libnotify07.patch
index 2a6dce9a2..2a6dce9a2 100644
--- a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
+++ b/libre/xchat/xchat-2.8.8-libnotify07.patch
diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat/xchat-2.8.8-link-against-libnotify.patch
index 31e6c0854..31e6c0854 100644
--- a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
+++ b/libre/xchat/xchat-2.8.8-link-against-libnotify.patch
diff --git a/libre/xchat-libre/xchat.install b/libre/xchat/xchat.install
index eab82d16f..eab82d16f 100644
--- a/libre/xchat-libre/xchat.install
+++ b/libre/xchat/xchat.install
diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi/PKGBUILD
index 066904a5a..f4a3d5226 100644
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-100dpi/PKGBUILD
@@ -2,18 +2,17 @@
# Maintainer (Arch): Alexander Baldeck <alexander@archlinux.org>
# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
# Maintainer: fauno <fauno@kiwwwi.com.ar>
-pkgname=xorg-fonts-100dpi-libre
+pkgname=xorg-fonts-100dpi
pkgver=1.0.3
-pkgrel=2
+pkgrel=2.parabola1
pkgdesc="X.org 100dpi fonts"
arch=(any)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
groups=('xorg')
-provides=("xorg-fonts-100dpi=$pkgver")
-conflicts=('xorg-fonts-100dpi')
-replaces=('xorg-fonts-100dpi')
+conflicts=('xorg-fonts-100dpi-libre')
+replaces=('xorg-fonts-100dpi-libre')
install=xfonts.install
source=(${url}/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2
${url}/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2)
diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi/xfonts.install
index 5c5e8a2b4..5c5e8a2b4 100644
--- a/libre/xorg-fonts-100dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-100dpi/xfonts.install
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi/PKGBUILD
index 6921b4ccc..e02711ab5 100644
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-75dpi/PKGBUILD
@@ -1,18 +1,17 @@
# $Id: PKGBUILD 71681 2010-03-08 12:06:26Z jgc $
# Maintainer (Arch): Alexander Baldeck <alexander@archlinux.org>
# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-fonts-75dpi-libre
+pkgname=xorg-fonts-75dpi
pkgver=1.0.3
-pkgrel=2
+pkgrel=2.parabola1
pkgdesc="X.org 75dpi fonts"
arch=(any)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
groups=('xorg')
-provides=("xorg-fonts-75dpi=$pkgver")
-conflicts=('xorg-fonts-75dpi')
-replaces=('xorg-fonts-75dpi')
+conflicts=('xorg-fonts-75dpi-libre')
+replaces=('xorg-fonts-75dpi-libre')
install=xfonts.install
source=(${url}/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2
${url}/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2)
diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi/xfonts.install
index e52603946..e52603946 100644
--- a/libre/xorg-fonts-75dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-75dpi/xfonts.install
diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1/PKGBUILD
index aaa70454e..95766fb20 100644
--- a/libre/xorg-fonts-type1-libre/PKGBUILD
+++ b/libre/xorg-fonts-type1/PKGBUILD
@@ -1,17 +1,16 @@
# $Id: PKGBUILD 216282 2014-07-02 16:41:27Z fyan $
# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-fonts-type1-libre
+pkgname=xorg-fonts-type1
pkgver=7.4
-pkgrel=3
+pkgrel=3.parabola1
pkgdesc="X.org Type1 fonts, without nonfree fonts"
arch=(any)
license=('custom')
url="http://xorg.freedesktop.org/"
depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-provides=("xorg-fonts-type1=${pkgver}")
-conflicts=('xorg-fonts-type1')
-replaces=('xorg-fonts-type1')
+conflicts=('xorg-fonts-type1-libre')
+replaces=('xorg-fonts-type1-libre')
install=xfonts.install
source=(${url}/releases/individual/font/font-bitstream-type1-1.0.2.tar.bz2
${url}/releases/individual/font/font-xfree86-type1-1.0.3.tar.bz2)
diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1/xfonts.install
index 51688a1d1..51688a1d1 100644
--- a/libre/xorg-fonts-type1-libre/xfonts.install
+++ b/libre/xorg-fonts-type1/xfonts.install
diff --git a/libre/xscreensaver-libre/LICENSE b/libre/xscreensaver/LICENSE
index 406467cd4..406467cd4 100644
--- a/libre/xscreensaver-libre/LICENSE
+++ b/libre/xscreensaver/LICENSE
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver/PKGBUILD
index 5a22d37c9..b23bd47f5 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver/PKGBUILD
@@ -2,10 +2,10 @@
# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgname=xscreensaver
-pkgname=xscreensaver-libre
+_pkgname=xscreensaver-libre
+pkgname=xscreensaver
pkgver=5.29
-pkgrel=1
+pkgrel=1.parabola1
pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.jwz.org/xscreensaver/"
@@ -15,10 +15,9 @@ makedepends=('bc' 'intltool' 'libxpm' 'gdm')
optdepends=('gdm: for login manager support')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
backup=('etc/pam.d/xscreensaver')
-mksource=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \
+mksource=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz)
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz \
xscreensaver-add-electricsheep.diff LICENSE)
mksha1sums=('a27a10c6eed024c458e927ee0dc1e6cb306d3335')
sha1sums=('0b0d8d57cac76460cb3a77aa5cd80adcfa856572'
@@ -26,19 +25,19 @@ sha1sums=('0b0d8d57cac76460cb3a77aa5cd80adcfa856572'
'3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
mksource() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
# Deleting dmsc.asm file due which don't have source code supplied
rm -v hacks/images/m6502/dmsc.asm
}
prepare() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
}
build() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
--with-pam --with-login-manager --with-gtk --with-gl \
@@ -47,10 +46,10 @@ build() {
}
package() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
install -d "${pkgdir}/etc/pam.d"
make install_prefix="${pkgdir}" install
- install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+ install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
chmod 755 "${pkgdir}/usr/bin/xscreensaver"
echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
}
diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver/xscreensaver-add-electricsheep.diff
index 0c5c3ff40..0c5c3ff40 100644
--- a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
+++ b/libre/xscreensaver/xscreensaver-add-electricsheep.diff