summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/kdebase-workspace/PKGBUILD12
-rw-r--r--extra/kdebase-workspace/kdebug-324574.patch55
-rw-r--r--extra/kdebase/PKGBUILD19
-rw-r--r--extra/kdebase/kdebug-324511.patch25
-rw-r--r--extra/kdeplasma-addons/PKGBUILD18
-rw-r--r--extra/kdeplasma-addons/kdebug-324661.patch76
-rw-r--r--extra/libidn/PKGBUILD6
-rw-r--r--extra/mediastreamer/PKGBUILD9
-rw-r--r--extra/mono/PKGBUILD6
-rw-r--r--extra/tk/PKGBUILD14
-rw-r--r--extra/wireshark/01_fix_pod_file.patch11
-rw-r--r--extra/wireshark/PKGBUILD28
-rw-r--r--extra/wireshark/wireshark.install12
-rw-r--r--extra/xpdf/PKGBUILD67
-rw-r--r--extra/xpdf/char.patch12
-rw-r--r--extra/xpdf/desktop9
-rw-r--r--extra/xpdf/install11
-rw-r--r--extra/xpdf/sanitize.patch55
18 files changed, 227 insertions, 218 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index a8207807f..216f5cddd 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 194052 2013-09-10 13:23:12Z andrea $
+# $Id: PKGBUILD 194252 2013-09-11 15:17:31Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.11.1
-pkgrel=1
+pkgrel=2
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -27,7 +27,8 @@ install="${pkgname}.install"
backup=('usr/share/config/kdm/kdmrc')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
- 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+ 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+ 'kdebug-324574.patch')
sha1sums=('4515c2909d2b9e711758a566ef6cd9e2f2181531'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -36,7 +37,8 @@ sha1sums=('4515c2909d2b9e711758a566ef6cd9e2f2181531'
'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
+ 'd509dac592bd8b310df27991b208c95b6d907514'
+ 'd0269345377df58205dba7b0a1403df4f30afe93')
prepare() {
mkdir build
@@ -50,6 +52,8 @@ prepare() {
# KDEBUG#202629
patch -p0 -i "${srcdir}"/terminate-server.patch
+
+ patch -p1 -i "${srcdir}"/kdebug-324574.patch
}
build() {
diff --git a/extra/kdebase-workspace/kdebug-324574.patch b/extra/kdebase-workspace/kdebug-324574.patch
new file mode 100644
index 000000000..053eef57e
--- /dev/null
+++ b/extra/kdebase-workspace/kdebug-324574.patch
@@ -0,0 +1,55 @@
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Mon, 09 Sep 2013 15:43:06 +0000
+Subject: Delay KDE class initialization to main loop
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d
+---
+Delay KDE class initialization to main loop
+
+Gui platform plugin is loaded during QApplication construction, but it
+relies on some KApplication/QApplication data to work correctly.
+
+This patch delays the initialization to main loop, to ensure
+KApplication/QApplication is already constructed.
+
+BUG: 324574
+FIXED-IN: 4.11.2
+REVIEW: 112602
+---
+
+
+--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
++++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+@@ -28,6 +28,7 @@
+ #include <KDE/KFileDialog>
+ #include <KDE/KColorDialog>
+ #include <QtCore/QHash>
++#include <QtCore/QTimer>
+ #include <QtGui/QFileDialog>
+ #include <QtGui/QColorDialog>
+ #include <QtGui/QApplication>
+@@ -153,9 +154,7 @@
+ public:
+ KQGuiPlatformPlugin()
+ {
+- connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
+- connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
+- connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
++ QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
+ }
+
+ virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); }
+@@ -340,6 +339,13 @@
+ }
+
+ private slots:
++ void init()
++ {
++ connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
++ connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
++ connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
++ }
++
+ void updateToolbarStyle()
+ {
+ //from gtksymbol.cpp
+
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index ead5769e7..576774403 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194054 2013-09-10 13:23:34Z andrea $
+# $Id: PKGBUILD 194224 2013-09-10 22:47:54Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -13,18 +13,25 @@ pkgname=('kdebase-dolphin'
'kdebase-lib'
'kdebase-plasma')
pkgver=4.11.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('a8781b2d7d431024cd5355a1e57d387d5945e12f')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
+ 'kdebug-324511.patch')
+sha1sums=('a8781b2d7d431024cd5355a1e57d387d5945e12f'
+ 'ff32bee8ef0ee154f1885fa4cd91a6754d980343')
+
+prepare() {
+ mkdir build
+
+ cd kde-baseapps-${pkgver}
+ patch -p1 -i "${srcdir}"/kdebug-324511.patch
+}
build() {
- cd ${srcdir}
- mkdir build
cd build
cmake ../kde-baseapps-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdebase/kdebug-324511.patch b/extra/kdebase/kdebug-324511.patch
new file mode 100644
index 000000000..cca2a7254
--- /dev/null
+++ b/extra/kdebase/kdebug-324511.patch
@@ -0,0 +1,25 @@
+commit 43a981481ab9161a83dd200db39c093e2502f68a
+Author: Bernd Buschinski <b.buschinski@googlemail.com>
+Date: Wed Sep 4 16:23:35 2013 +0200
+
+ Fix toplevel bookmarks not showing in toolbar
+ regression from d1963e23
+
+diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
+index 2141575..199e15f 100644
+--- a/konqueror/src/konqbookmarkbar.cpp
++++ b/konqueror/src/konqbookmarkbar.cpp
+@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
+
+ if (!bm.isGroup())
+ {
+- if ( bm.isSeparator() )
++ if ( bm.isSeparator() )
++ {
+ if (m_toolBar) {
+ m_toolBar->addSeparator();
+ }
++ }
+ else
+ {
+ KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index 234ffa4aa..b4f4b706d 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194167 2013-09-10 13:39:44Z andrea $
+# $Id: PKGBUILD 194223 2013-09-10 22:40:15Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -78,18 +78,26 @@ pkgname=('kdeplasma-addons-applets-bball'
'kdeplasma-addons-wallpapers-virus'
'kdeplasma-addons-wallpapers-weather')
pkgver=4.11.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdeplasma-addons'
license=('GPL' 'LGPL')
groups=('kde' 'kdeplasma-addons')
makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('ac6cc243fe0bacce77b9286269dde9b342eb5ddd')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+ 'kdebug-324661.patch')
+sha1sums=('ac6cc243fe0bacce77b9286269dde9b342eb5ddd'
+ 'fc274d87f7e39cde2c19570b6e38666b95050a9d')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/kdebug-324661.patch
+}
build() {
- mkdir build
cd build
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdeplasma-addons/kdebug-324661.patch b/extra/kdeplasma-addons/kdebug-324661.patch
new file mode 100644
index 000000000..92de3fcc9
--- /dev/null
+++ b/extra/kdeplasma-addons/kdebug-324661.patch
@@ -0,0 +1,76 @@
+commit 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6
+Author: Eike Hein <hein@kde.org>
+Date: Mon Sep 9 23:12:45 2013 +0200
+
+ Spin the event loop before destroying the menu.
+
+ This allows the menu implementation to complete toggling the
+ launcher before the instance is destroyed. It's extremely un-
+ fortunate that the library currently requires this careful
+ handling; see e944d7ae in kde-workspace for a note on what
+ needs to be cleaned up there.
+
+ BUG:324661
+
+diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp
+index 970c19f..61b39ef 100644
+--- a/applets/icontasks/windowtaskitem.cpp
++++ b/applets/icontasks/windowtaskitem.cpp
+@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu)
+ actionList.append(configAction);
+ }
+
+- TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
+- menu.adjustSize();
++ TaskManager::BasicMenu * menu = new TaskManager::BasicMenu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
++ menu->adjustSize();
+
+ if (m_applet->formFactor() != Plasma::Vertical) {
+- menu.setMinimumWidth(size().width());
++ menu->setMinimumWidth(size().width());
+ }
+
+ Q_ASSERT(m_applet->containment());
+ Q_ASSERT(m_applet->containment()->corona());
+ stopWindowHoverEffect();
+- menu.exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu.size()) : pos);
++ menu->exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu->size()) : pos);
++ menu->deleteLater();
+ delete a;
+ }
+
+commit b56d1552e9a8f8efe8fb8fd641126e78627c61a9
+Author: Eike Hein <hein@kde.org>
+Date: Mon Sep 9 23:33:30 2013 +0200
+
+ Fix it for non-running items too.
+
+ BUG:324661
+
+diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp
+index b5f646c..f721b5a 100644
+--- a/applets/icontasks/applauncheritem.cpp
++++ b/applets/icontasks/applauncheritem.cpp
+@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
+ actionList.append(configAction);
+ }
+
+- TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
+- menu.adjustSize();
++ TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
++ menu->adjustSize();
+
+ if (m_applet->formFactor() != Plasma::Vertical) {
+- menu.setMinimumWidth(size().width());
++ menu->setMinimumWidth(size().width());
+ }
+
+ Q_ASSERT(m_applet->containment());
+ Q_ASSERT(m_applet->containment()->corona());
+ stopWindowHoverEffect();
+- menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size()));
++ menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size()));
++ menu->deleteLater();
+ }
+
+
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index 2b91105af..ad516863b 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178107 2013-02-16 09:56:28Z ronald $
+# $Id: PKGBUILD 194235 2013-09-11 07:58:33Z bpiotrowski $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jan de Groot <jgc.archlinux.org>
# Contributor: Eric Johnson <eric.archlinux.org>
pkgname=libidn
-pkgver=1.26
+pkgver=1.28
pkgrel=1
pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
url="http://www.gnu.org/software/libidn/"
@@ -15,7 +15,7 @@ makedepends=('pkgconfig')
options=('!libtool')
source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
install=libidn.install
-sha1sums=('b1cb40646a96dadbfc41d060d23dfb382eec1128')
+sha1sums=('725587211b229c156e29fa2ad116b0ef71a7ca17')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index 00379f815..91f86b579 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191931 2013-08-01 07:14:32Z andrea $
+# $Id: PKGBUILD 194257 2013-09-11 19:36:47Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,12 +6,12 @@
pkgname=mediastreamer
pkgver=2.9.0
-pkgrel=3
+pkgrel=4
pkgdesc="A library written in C that allows you to create and run audio and video streams"
arch=('i686' 'x86_64')
url="http://www.linphone.org/"
license=('GPL')
-depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp')
+depends=('ortp' 'ffmpeg' 'libxv' 'libupnp')
# xxd from Vim is needed to build
makedepends=('intltool' 'vim')
options=('!libtool')
@@ -21,7 +21,8 @@ md5sums=('f2ea0fe731a363749a81b6eaac22a62c'
build() {
cd $pkgname-$pkgver
- ./configure --prefix=/usr
+ ./configure --prefix=/usr \
+ --disable-glx --enable-xv
make
}
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 1a1200a8e..c2ae4e353 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186332 2013-05-24 20:45:34Z daniel $
+# $Id: PKGBUILD 194244 2013-09-11 08:25:23Z bpiotrowski $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: Brice Carpentier <brice@dlfp.org>
pkgname=mono
-pkgver=3.0.7
+pkgver=3.0.12
pkgrel=1
pkgdesc="Free implementation of the .NET platform including runtime and compiler"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ provides=('monodoc')
conflicts=('monodoc')
source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
mono.binfmt.d)
-md5sums=('76ebec9c97347aac13d9f28fc58b347d'
+md5sums=('7833809f5ddac1b8c605d4d26789987b'
'b9ef8a65fea497acf176cca16c1e2402')
build() {
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index 04e1108a4..c5116f60c 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194019 2013-09-10 03:10:44Z eric $
+# $Id: PKGBUILD 194259 2013-09-11 22:03:31Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=tk
pkgver=8.6.0
-pkgrel=3
+pkgrel=4
pkgdesc="A windowing toolkit for use with tcl"
arch=('i686' 'x86_64')
url="http://tcl.sourceforge.net/"
@@ -25,10 +25,10 @@ build() {
make
}
-#check() {
-# cd tk${pkgver}/unix
+check() {
+ cd tk${pkgver}/unix
# make test
-#}
+}
package() {
cd tk${pkgver}/unix
@@ -38,5 +38,7 @@ package() {
install -Dm644 license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
# remove buildroot traces
- sed -i "s#${srcdir}#/usr/src#" "${pkgdir}/usr/lib/tkConfig.sh"
+ sed -e "s#${srcdir}/tk${pkgver}/unix#/usr/lib#" \
+ -e "s#${srcdir}/tk${pkgver}#/usr/include#" \
+ -i "${pkgdir}/usr/lib/tkConfig.sh"
}
diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch
deleted file mode 100644
index f75f4c0bf..000000000
--- a/extra/wireshark/01_fix_pod_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435
-+++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436
-@@ -40,6 +40,8 @@
- When the B<-n> option is used, B<reordercap> will not write out the output
- file if it finds that the input file is already in order.
-
-+=back
-+
- =head1 SEE ALSO
-
- pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index d8136a396..cb7e84cc2 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $
+# $Id: PKGBUILD 194226 2013-09-11 02:06:50Z eric $
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=('wireshark-cli' 'wireshark-gtk')
pkgbase=wireshark
-pkgver=1.10.1
+pkgver=1.10.2
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
-makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
- 'libgcrypt' 'lua51' 'python')
+makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls'
+ 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
url='http://www.wireshark.org/'
options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
- 01_fix_pod_file.patch)
-sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc'
- '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d')
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- patch -p1 <${srcdir}/01_fix_pod_file.patch
+ cd ${pkgbase}-${pkgver}
./autogen.sh
./configure \
@@ -33,11 +29,11 @@ build() {
package_wireshark-cli() {
pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
- depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51')
+ depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua')
install=wireshark.install
conflicts=(wireshark)
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd ${pkgbase}-${pkgver}
make DESTDIR="${pkgdir}" install
@@ -47,11 +43,11 @@ package_wireshark-cli() {
rm "${pkgdir}/usr/bin/wireshark"
# Headers
- install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+ install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
- install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
+ install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
done
}
@@ -62,7 +58,7 @@ package_wireshark-gtk() {
replaces=(wireshark)
conflicts=(wireshark)
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd ${pkgbase}-${pkgver}
install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
for d in 16 32 48; do
diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install
index 001bd0c58..719171d9e 100644
--- a/extra/wireshark/wireshark.install
+++ b/extra/wireshark/wireshark.install
@@ -1,18 +1,18 @@
post_install() {
- /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null
+ getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
- /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+ setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
}
post_upgrade() {
- /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null
+ getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
- /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+ setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
}
post_remove() {
- if /usr/bin/getent group wireshark >/dev/null 2>&1; then
- /usr/sbin/groupdel wireshark
+ if getent group wireshark >/dev/null 2>&1; then
+ groupdel wireshark
fi
}
diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD
deleted file mode 100644
index 5dbaf8468..000000000
--- a/extra/xpdf/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 193958 2013-09-08 17:19:05Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=xpdf
-#pkgver=3.03_pl1
-pkgver=3.03
-pkgrel=4
-pkgdesc='Viewer for Portable Document Format (PDF) files'
-url='http://www.foolabs.com/xpdf/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('lesstif' 'gsfonts' 'libxt')
-optdepends=('poppler: tools that used to be included in xpdf'
- 'desktop-file-utils: for desktop environments')
-# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
-source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
- 'sanitize.patch'
- 'char.patch'
- 'desktop')
-sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
- '2face78a2f550fd15eeceb8a1ce47c566104f457'
- '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
- '17ebbfe457cb92e97b12b7362e8ce961526012d9')
-
-install=install
-backup=('etc/xpdfrc')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
- patch -p1 -i ../sanitize.patch
- patch -p1 -i ../char.patch
-
- sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
- sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --enable-multithreaded \
- --enable-wordlist \
- --with-freetype2-library=/usr/lib \
- --with-freetype2-includes=/usr/include/freetype2 \
- --x-includes=/usr/include \
- --with-Xm-library=/usr/lib \
- --with-Xm-includes=/usr/include \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
- install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
-
- # stuff provided by poppler
- for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
- rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
- done
-}
diff --git a/extra/xpdf/char.patch b/extra/xpdf/char.patch
deleted file mode 100644
index 8e49393a6..000000000
--- a/extra/xpdf/char.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
---- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700
-+++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700
-@@ -1803,7 +1803,7 @@
- menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
- for (i = 0; i < nZoomMenuItems; ++i) {
- n = 0;
-- s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
- XtSetArg(args[n], XmNlabelString, s); ++n;
- XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
- sprintf(buf, "zoom%d", i);
diff --git a/extra/xpdf/desktop b/extra/xpdf/desktop
deleted file mode 100644
index 956323427..000000000
--- a/extra/xpdf/desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Xpdf
-Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf %f
-Terminal=false
-Type=Application
-Icon=xpdf
-Categories=Office;
-MimeType=application/pdf;
diff --git a/extra/xpdf/install b/extra/xpdf/install
deleted file mode 100644
index c6cf149dd..000000000
--- a/extra/xpdf/install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/extra/xpdf/sanitize.patch b/extra/xpdf/sanitize.patch
deleted file mode 100644
index 891c41fd3..000000000
--- a/extra/xpdf/sanitize.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 3945969e0072217c143fefa3044512a31ac2afa8 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Sun, 11 Aug 2013
-Subject: CVE-2012-2142
-
-Filter stuff that might end up in the shell to address CVE-2012-2142.
-This code was adapted from the Poppler project.
----
- Error.cc | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
---- a/xpdf/Error.cc 2013-08-11
-+++ b/xpdf/Error.cc 2013-08-11
-@@ -43,7 +43,7 @@ void setErrorCallback(void (*cbk)(void *
-
- void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
- va_list args;
-- GString *s;
-+ GString *s, *sanitized;
-
- // NB: this can be called before the globalParams object is created
- if (!errorCbk && globalParams && globalParams->getErrQuiet()) {
-@@ -52,17 +52,28 @@ void CDECL error(ErrorCategory category,
- va_start(args, msg);
- s = GString::formatv(msg, args);
- va_end(args);
-+
-+ sanitized = new GString ();
-+ for (int i = 0; i < s->getLength(); ++i) {
-+ const char c = s->getChar(i);
-+ if (c < (char)0x20 || c >= (char)0x7f) {
-+ sanitized->appendf("<{0:02x}>", c & 0xff);
-+ } else {
-+ sanitized->append(c);
-+ }
-+ }
-+
- if (errorCbk) {
-- (*errorCbk)(errorCbkData, category, pos, s->getCString());
-+ (*errorCbk)(errorCbkData, category, pos, sanitized->getCString());
- } else {
- if (pos >= 0) {
- fprintf(stderr, "%s (%d): %s\n",
-- errorCategoryNames[category], pos, s->getCString());
-+ errorCategoryNames[category], pos, sanitized->getCString());
- } else {
- fprintf(stderr, "%s: %s\n",
-- errorCategoryNames[category], s->getCString());
-+ errorCategoryNames[category], sanitized->getCString());
- }
- fflush(stderr);
- }
-- delete s;
-+ delete sanitized;
- }
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 11:38:12 +0000