summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/cups/PKGBUILD6
-rw-r--r--extra/cups/cups-systemd-socket.patch116
-rw-r--r--extra/gnutls/PKGBUILD6
-rw-r--r--extra/icewm/PKGBUILD10
-rw-r--r--extra/icewm/icewm-1.3.8-shutdown-reboot-command.patch13
-rw-r--r--extra/libreoffice-fresh/PKGBUILD332
-rw-r--r--extra/refind-efi/PKGBUILD220
-rw-r--r--extra/refind-efi/refind-efi.install2
-rw-r--r--extra/refind-efi/refind_linux.conf4
-rw-r--r--extra/shared-mime-info/PKGBUILD8
-rw-r--r--extra/xapian-core/PKGBUILD16
11 files changed, 448 insertions, 285 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index afac8c53e..2e4df07b0 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 213868 2014-05-30 17:12:12Z andyrtr $
+# $Id: PKGBUILD 213906 2014-05-31 11:17:32Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.7.3
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
@@ -38,7 +38,7 @@ md5sums=('d498c3020acda0904ab0c13b6389a1ec'
'3ba9e3410df1dc3015463d615ef91b3b'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
- '7088c0123c06bce280925aa39ebd79c6'
+ '8162e1d05947bd59fa29ba40ac565fec'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
index 54a951200..2eef70869 100644
--- a/extra/cups/cups-systemd-socket.patch
+++ b/extra/cups/cups-systemd-socket.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
---- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200
+diff -up cups-1.7.2/config.h.in.systemd-socket cups-1.7.2/config.h.in
+--- cups-1.7.2/config.h.in.systemd-socket 2014-02-27 16:57:59.000000000 +0100
++++ cups-1.7.2/config.h.in 2014-04-17 14:05:04.104472016 +0200
@@ -451,6 +451,13 @@
@@ -15,9 +15,9 @@ diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
* Various scripting languages...
*/
-diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4
---- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200
-+++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200
+diff -up cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.7.2/config-scripts/cups-systemd.m4
+--- cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket 2014-04-17 14:05:04.104472016 +0200
++++ cups-1.7.2/config-scripts/cups-systemd.m4 2014-04-17 14:05:04.104472016 +0200
@@ -0,0 +1,36 @@
+dnl
+dnl "$Id$"
@@ -32,11 +32,11 @@ diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/c
+ [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_MSG_CHECKING(for libsystemd-daemon)
-+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ if $PKGCONFIG --exists libsystemd-daemon; then
+ AC_MSG_RESULT(yes)
+ SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
+ SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ AC_DEFINE(HAVE_SYSTEMD)
+ else
+ AC_MSG_RESULT(no)
@@ -55,9 +55,9 @@ diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/c
+dnl
+dnl "$Id$"
+dnl
-diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
---- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
-+++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200
+diff -up cups-1.7.2/configure.in.systemd-socket cups-1.7.2/configure.in
+--- cups-1.7.2/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
++++ cups-1.7.2/configure.in 2014-04-17 14:05:04.104472016 +0200
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4)
@@ -76,10 +76,10 @@ diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
desktop/cups.desktop
doc/help/ref-cups-files-conf.html
doc/help/ref-cupsd-conf.html
-diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
---- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200
-+++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200
-@@ -1046,7 +1046,7 @@ cups_read_client_conf(
+diff -up cups-1.7.2/cups/usersys.c.systemd-socket cups-1.7.2/cups/usersys.c
+--- cups-1.7.2/cups/usersys.c.systemd-socket 2014-03-05 22:22:12.000000000 +0100
++++ cups-1.7.2/cups/usersys.c 2014-04-17 14:05:04.105472002 +0200
+@@ -1050,7 +1050,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@@ -88,9 +88,9 @@ diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in
---- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
-+++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200
+diff -up cups-1.7.2/data/cups.path.in.systemd-socket cups-1.7.2/data/cups.path.in
+--- cups-1.7.2/data/cups.path.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
++++ cups-1.7.2/data/cups.path.in 2014-04-17 14:05:04.105472002 +0200
@@ -0,0 +1,8 @@
+[Unit]
+Description=CUPS Printer Service Spool
@@ -100,23 +100,24 @@ diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path
+
+[Install]
+WantedBy=multi-user.target
-diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in
---- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
-+++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200
-@@ -0,0 +1,10 @@
+diff -up cups-1.7.2/data/cups.service.in.systemd-socket cups-1.7.2/data/cups.service.in
+--- cups-1.7.2/data/cups.service.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
++++ cups-1.7.2/data/cups.service.in 2014-04-17 14:05:04.105472002 +0200
+@@ -0,0 +1,11 @@
+[Unit]
+Description=CUPS Printing Service
+
+[Service]
++Type=notify
+ExecStart=@sbindir@/cupsd -f
+PrivateTmp=true
+
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target
-diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
---- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
-+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
+diff -up cups-1.7.2/data/cups.socket.in.systemd-socket cups-1.7.2/data/cups.socket.in
+--- cups-1.7.2/data/cups.socket.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
++++ cups-1.7.2/data/cups.socket.in 2014-04-17 14:05:04.105472002 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=CUPS Printing Service Sockets
@@ -128,9 +129,9 @@ diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.so
+
+[Install]
+WantedBy=sockets.target
-diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
---- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200
+diff -up cups-1.7.2/data/Makefile.systemd-socket cups-1.7.2/data/Makefile
+--- cups-1.7.2/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7.2/data/Makefile 2014-04-17 14:05:04.106471988 +0200
@@ -100,6 +100,12 @@ install-data:
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
done
@@ -154,9 +155,9 @@ diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
#
-diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
---- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200
-+++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200
+diff -up cups-1.7.2/Makedefs.in.systemd-socket cups-1.7.2/Makedefs.in
+--- cups-1.7.2/Makedefs.in.systemd-socket 2014-04-17 14:05:04.092472182 +0200
++++ cups-1.7.2/Makedefs.in 2014-04-17 14:05:04.106471988 +0200
@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@
@@ -173,7 +174,7 @@ diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@
+@@ -232,6 +234,7 @@ PAMFILE = @PAMFILE@
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
DBUSDIR = @DBUSDIR@
@@ -181,10 +182,10 @@ diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
#
-diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h
---- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200
-@@ -77,6 +77,9 @@ typedef struct
+diff -up cups-1.7.2/scheduler/client.h.systemd-socket cups-1.7.2/scheduler/client.h
+--- cups-1.7.2/scheduler/client.h.systemd-socket 2013-08-02 00:23:18.000000000 +0200
++++ cups-1.7.2/scheduler/client.h 2014-04-17 14:05:04.106471988 +0200
+@@ -79,6 +79,9 @@ typedef struct
int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */
http_encryption_t encryption; /* To encrypt or not to encrypt... */
@@ -194,9 +195,9 @@ diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/cli
} cupsd_listener_t;
-diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c
---- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200
+diff -up cups-1.7.2/scheduler/listen.c.systemd-socket cups-1.7.2/scheduler/listen.c
+--- cups-1.7.2/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7.2/scheduler/listen.c 2014-04-17 14:05:04.107471974 +0200
@@ -401,7 +401,11 @@ cupsdStopListening(void)
lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@@ -210,10 +211,10 @@ diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/lis
{
#ifdef WIN32
closesocket(lis->fd);
-diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
---- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
-+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
-@@ -62,6 +64,10 @@
+diff -up cups-1.7.2/scheduler/main.c.systemd-socket cups-1.7.2/scheduler/main.c
+--- cups-1.7.2/scheduler/main.c.systemd-socket 2014-04-17 14:05:04.052472738 +0200
++++ cups-1.7.2/scheduler/main.c 2014-04-17 14:09:39.102634667 +0200
+@@ -39,6 +39,10 @@
# endif /* !LAUNCH_JOBKEY_SERVICEIPC */
#endif /* HAVE_LAUNCH_H */
@@ -224,17 +225,17 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -83,6 +89,9 @@
+@@ -64,6 +68,9 @@
static void launchd_checkin(void);
static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
-+static int systemd_checkin(void);
++static void systemd_checkin(void);
+#endif /* HAVE_SYSTEMD */
static void parent_handler(int sig);
static void process_children(void);
static void sigchld_handler(int sig);
-@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm
+@@ -563,6 +570,13 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@@ -248,7 +249,20 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/*
* Startup the server...
*/
-@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm
+@@ -654,6 +668,12 @@ main(int argc, /* I - Number of comm
+ "Scheduler started via launchd.");
+ else
+ #endif /* HAVE_LAUNCHD */
++#ifdef HAVE_SYSTEMD
++ sd_notifyf(0, "READY=1\n"
++ "STATUS=Scheduler is running...\n"
++ "MAINPID=%lu",
++ (unsigned long) getpid());
++#endif /* HAVE_SYSTEMD */
+ if (fg)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+ "Scheduler started in foreground.");
+@@ -751,6 +771,15 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@@ -264,12 +278,12 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/*
* Startup the server...
*/
-@@ -1511,6 +1536,102 @@ launchd_checkout(void)
+@@ -1500,6 +1529,102 @@ launchd_checkout(void)
}
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
-+static int
++static void
+systemd_checkin(void)
+{
+ int n, fd;
@@ -367,9 +381,9 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/*
* 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile
---- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200
+diff -up cups-1.7.2/scheduler/Makefile.systemd-socket cups-1.7.2/scheduler/Makefile
+--- cups-1.7.2/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7.2/scheduler/Makefile 2014-04-17 14:05:04.108471960 +0200
@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 9857c750d..1ec2eea23 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213850 2014-05-30 13:32:16Z andyrtr $
+# $Id: PKGBUILD 213902 2014-05-31 09:42:06Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=gnutls
-pkgver=3.3.3
+pkgver=3.3.4
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=gnutls.install
options=('!zipman')
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('e225247ec82513354a6bdc3be6246377'
+md5sums=('908dc1e98e28cb1c2c255a71785a4af2'
'SKIP')
build() {
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index 3573fb570..32955986c 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199904 2013-11-18 16:10:20Z eric $
+# $Id: PKGBUILD 213876 2014-05-31 01:09:27Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=icewm
pkgver=1.3.8
-pkgrel=1
+pkgrel=2
pkgdesc="A Window Manager designed for speed, usability, and consistency"
arch=('i686' 'x86_64')
url="http://www.icewm.org/"
@@ -11,15 +11,17 @@ license=('LGPL')
depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
makedepends=('xorg-mkfontdir')
source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz
- ignore_workarea_hints.patch icewm-cpustatus.patch)
+ ignore_workarea_hints.patch icewm-cpustatus.patch icewm-1.3.8-shutdown-reboot-command.patch)
sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8'
'88b4b198827d6590901c2c8bdba8826d928f6f1a'
- '0f4a02153496dadd26742f6bd3bdc166d7eafaed')
+ '0f4a02153496dadd26742f6bd3bdc166d7eafaed'
+ 'd85d35b756ca2d5283f10de9d9bca23d39c68f6f')
prepare() {
cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}/ignore_workarea_hints.patch"
patch -p2 -i "${srcdir}/icewm-cpustatus.patch"
+ patch -p1 -i "${srcdir}/icewm-1.3.8-shutdown-reboot-command.patch"
}
build() {
diff --git a/extra/icewm/icewm-1.3.8-shutdown-reboot-command.patch b/extra/icewm/icewm-1.3.8-shutdown-reboot-command.patch
new file mode 100644
index 000000000..a48f4bec3
--- /dev/null
+++ b/extra/icewm/icewm-1.3.8-shutdown-reboot-command.patch
@@ -0,0 +1,13 @@
+diff --git a/src/wmmgr.cc b/src/wmmgr.cc
+index 4252bf6..dc1e703 100644
+--- a/src/wmmgr.cc
++++ b/src/wmmgr.cc
+@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
+ case ICEWM_ACTION_RESTARTWM:
+ case ICEWM_ACTION_WINDOWLIST:
+ case ICEWM_ACTION_ABOUT:
+- break;
++ //break;
+ default:
+ smActionListener->handleSMAction(message.data.l[1]);
+ break;
diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index 43fbac8a5..7319ff8bf 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -1,67 +1,27 @@
-# $Id: PKGBUILD 213572 2014-05-25 11:27:38Z andyrtr $
+# $Id: PKGBUILD 213923 2014-05-31 15:05:40Z bpiotrowski $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-pkgname="libreoffice-fresh"
+pkgbase=libreoffice-fresh
+pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=4.3.0.0.beta1
pkgver=4.3.0
-pkgrel=0.2
-pkgdesc="LibreOffice branch which contains new features and program enhancements"
+pkgrel=0.7
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
-depends=("curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
- 'libwps' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' #'libxaw'
- 'libgl' 'dbus-glib' 'libxslt' 'redland' 'icu' #'librsvg'
- 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' # 'libtextcat'
- 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
- 'libcdr' 'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene'
- # 'lpsolve' ? calc
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
- 'gtk2' 'xdg-utils' #'telepathy-glib' 'orbit2' 'translate-toolkit'
- 'gst-plugins-base-libs' 'glu')
-makedepends=('sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
- 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
- 'clucene' 'junit' 'libmythes' 'libwpg' 'mesa'
- 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
- 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' 'apr' 'serf'
- 'ttf-liberation' # to satisfy regression tests
- 'chrpath')
-optdepends=('libreoffice-fresh-langpack: additional language support'
- 'java-runtime: adds java support'
- 'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
- 'pstoedit: translates PostScript and PDF graphics into other vector formats'
- 'libmythes: for use in thesaurus'
- 'beanshell2: interactive java -- good for prototyping/macros'
- 'vigra: C++ computer vision library, usable in Basebmp'
- 'libmspack: library for Microsoft compression formats for use in FontOOo'
- 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
- 'sane: for scanner access'
- 'unixodbc: adds ODBC database support'
- 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress'
- #'gtk2: for browser plugin and old gtk2 desktop integration'
- 'libpaper: takes care of papersize'
- 'postgresql-libs: for postgresql-connector'
- 'gtk3: for gtk3 Gnome integration'
- 'kdelibs: for kde desktop integration'
- 'make: for use in SDK'
- 'gcc: for use in SDK'
- 'zip: for use in SDK')
-backup=(etc/libreoffice/sofficerc
- etc/libreoffice/bootstraprc
- etc/libreoffice/psprint.conf
- etc/profile.d/libreoffice-fresh.sh
- etc/profile.d/libreoffice-fresh.csh)
-install=$pkgname.install
-provides=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome'
- 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk' 'libreoffice-sdk-doc'
- 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector'
- 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver')
-conflicts=('libreoffice-stable' 'libreoffice-common' 'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome'
- 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk' 'libreoffice-sdk-doc'
- 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector'
- 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver')
-
+makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'libwps'
+ 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
+ 'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
+ 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+ 'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
+ 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'xdg-utils' 'gst-plugins-base-libs'
+ 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
+ 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
+ 'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
+ 'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
+ 'apr' 'serf' 'chrpath' 'ttf-liberation')
+
#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
_additional_source_url="http://dev-www.libreoffice.org/src"
@@ -99,10 +59,11 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
${_additional_source_url}/libe-book-0.0.3.tar.bz2
${_additional_source_url}/libabw-0.0.2.tar.bz2
- ${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2
+ ${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2
${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
${_additional_source_url}/CoinMP-1.7.6.tgz
- ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip # don't use system glm! LibO patches it!
+ # do not use system glm, LibO patxhes it!
+ ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2
${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
${_additional_source_url}/510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2
@@ -148,89 +109,39 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
collada2gltf-master-6258611a6a.tar.bz2
OpenCOLLADA-master-6509aa13af.tar.bz2
510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2)
-md5sums=('c98ff0989252558dc21b71ec5e32049f'
- 'SKIP'
- '5b3b55d75a9659dace93900c3e88d6a9'
- 'SKIP'
- '507657907ee417631287c79deb44cfc8'
- 'SKIP'
- 'd6eef4b4cacb2183f2bf265a5a03a354'
- '1f24ab1d39f4a51faf22244c94a6203f'
- '35c94d2df8893241173de1d16b6034c0'
- '798b2ffdc8bcfe7bca2cf92b62caf685'
- 'a7983f859eafb2677d7ff386a023bc40'
- 'e8e197d628436490886d17cffa108fe3'
- '8ab049135b2d15313da5d9f0656894a1'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- '048751f3271906db5126ab76870444c4'
- 'eeb2c7ddf0d302fba4bfc6e97eac9624'
- '39bb3fcea1514f1369fcfc87542390fd'
- '3404ab6b1792ae5f16bbd603bd1e1d03'
- '97b2d4dba862397f446b217e2b623e71'
- 'f94d9870737518e3b597f9265f4e9803'
- '8ce2fcd72becf06c41f7201d15373ed9'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
- '3bdf40c0d199af31923e900d082ca2dd'
- 'ace6ab49184e329db254e454a010f56d'
- 'db60e4fde8dd6d6807523deb71ee34dc'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- 'ae330b9493bd4503ac390106ff6060d7'
- '22f8a85daf4a012180322e1f52a7563b'
- '7681383be6ce489d84c1c74f4e7f9643'
- '36271d3fa0d9dec1632029b6d7aac925'
- '0168229624cfac409e766913506961a8'
- '17410483b5b5f267aa18b7e00b65e6e0'
- '185d60944ea767075d27247c3162b3bc'
- 'd794625f156a9fb1c53b3f8a8aa13b5e'
- '496dd00028afcc19f896b01394769043'
- '21154d2004e025c8a3666625b0357bb5'
- '2f1ceaf2ac8752ed278e175447d9b978'
- '40fa48e03b1e28ae0325cc34b35bc46d'
- '504af523f5d1a5590bbeb6a4b55e8a97'
- '8ac8ae9829c4fefd1ae9f715f95d4e0b'
- '1cce53bf4b40ae29790d2c5c9f8b1129'
- 'bae83fa5dc7f081768daace6e199adc3'
- 'c8a8be5829ceffacfe1d68d078f5c442'
- '4ca8a6ef0afeefc864e9ef21b9f14bd6'
- '510c3f8504bfb8cc8c8fc5d0fac74055'
- '07d2bf5ad839a394cca008b3ec6e7bb1'
- '4195735a80876ae812fca5736b50192a'
- 'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
prepare() {
-
- cd libreoffice-$_LOver
+ cd libreoffice-$_LOver
# move external sources into place
mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
for source in "${noextract[@]}"; do
- ln -s ${srcdir}/$source .
+ ln -s ${srcdir}/$source .
done
popd
- # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
- # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
+ # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
+ # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
+
+ # fix not upstreamable pyuno paths - patch taken from Debian
+ patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
- # fix not upstreamable pyuno paths - patch taken from Debian
- patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
-O?|-pipe|-Wall|-g|-fexceptions) continue;;
esac
- ARCH_FLAGS="$ARCH_FLAGS $i"
+ ARCH_FLAGS="$ARCH_FLAGS $i"
done
-
- # qt4 fix
- sed -i "s:qmake:qmake-qt4:g" configure.ac
+ # qt4 fix
+ sed -i "s:qmake:qmake-qt4:g" configure.ac
}
build() {
- cd libreoffice-$_LOver
+ cd libreoffice-$_LOver
#autoconf -f
@@ -309,18 +220,21 @@ build() {
--with-ant-home="/usr/share/apache-ant"\
--without-system-boost\
--with-system-icu \
- --with-system-cairo\
- --with-system-libs\
- --with-system-mythes\
- --with-system-headers\
+ --with-system-cairo \
+ --with-system-libs \
+ --with-system-mythes \
+ --with-system-headers \
--without-system-hsqldb \
- --with-alloc=system\
+ --with-alloc=system \
--with-system-clucene \
--disable-dependency-tracking \
--enable-hardlink-deliver #--help
touch src.downloaded
make
+
+ mkdir ${srcdir}/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall distro-pack-install
}
#check() {
@@ -328,16 +242,82 @@ build() {
# make check
#}
-package() {
-
- cd libreoffice-$_LOver
- make DESTDIR="$pkgdir/" distro-pack-install
-
+package_libreoffice-fresh-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice Fresh"
+ depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ provides=('libreoffice-sdk' 'libreoffice-sdk-doc')
+ conflicts=('libreoffice-sdk' 'libreoffice-sdk-doc')
+
+ for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+ install -dm755 ${pkgdir}/${dir/\%dir/}
+ done
+
+ for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+ dirname=$(dirname $file)
+ [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname
+ mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file
+ done
+
+ # fix environment path to keep compatibility with other java-environments
+ sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
+ ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
+
+ # fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
+}
+
+package_libreoffice-fresh() {
+ pkgdesc="LibreOffice branch which contains new features and program enhancements"
+ depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'libwps'
+ 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
+ 'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
+ 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+ 'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
+ 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'xdg-utils' 'glu'
+ 'gst-plugins-base-libs')
+ optdepends=('libreoffice-fresh-langpack: additional language support'
+ 'java-runtime: adds java support'
+ 'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
+ 'pstoedit: translates PostScript and PDF graphics into other vector formats'
+ 'libmythes: for use in thesaurus'
+ 'beanshell2: interactive java -- good for prototyping/macros'
+ 'vigra: C++ computer vision library, usable in Basebmp'
+ 'libmspack: library for Microsoft compression formats for use in FontOOo'
+ 'libwpg: library for importing and converting WordPerfect Graphics format'
+ 'sane: for scanner access'
+ 'unixodbc: adds ODBC database support'
+ 'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
+ 'libpaper: takes care of papersize'
+ 'postgresql-libs: for postgresql-connector'
+ 'gtk3: for GTK3 integration'
+ 'kdelibs: for KDE desktop integration')
+ backup=(etc/libreoffice/sofficerc
+ etc/libreoffice/bootstraprc
+ etc/libreoffice/psprint.conf
+ etc/profile.d/libreoffice-fresh.sh
+ etc/profile.d/libreoffice-fresh.csh)
+ install=$pkgbase.install
+ provides=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc'
+ 'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
+ 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
+ 'libreoffice-postgresql-connector' 'libreoffice-extension-wiki-publisher'
+ 'libreoffice-extension-nlpsolver' 'libreoffice-en-US')
+ conflicts=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc'
+ 'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
+ 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
+ 'libreoffice-extension-wiki-publisher' 'libreoffice-postgresql-connector'
+ 'libreoffice-extension-nlpsolver' 'libreoffice-en-US')
+ replaces=('libreoffice-fresh-en-US')
+
+ mv fakeinstall/* ${pkgdir}/
+
# put configuration files into place
install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
-
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
+ ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \
+ ${pkgdir}/etc/libreoffice/
+
# install dummy links to make them found by LibO
cd ${pkgdir}/usr/lib/libreoffice/program/
ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
@@ -350,29 +330,75 @@ package() {
# move bash-completion files to its new place
install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh # fails
+ mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh \
+ ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh # fails
rm -rf ${pkgdir}/etc/bash_completion.d
# make pyuno find its modules
install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py
+ ln -svf /usr/lib/libreoffice/program/uno.py \
+ ${pkgdir}/usr/lib/python3.4/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/unohelper.py \
+ ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py
- # fix environment path to keep compatibility with other java-environments
- sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-
- # fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-
# cleanup
- rm -rf ${pkgdir}/usr/share/appdata
-
+ rm -rf ${pkgdir}/usr/share/appdata ${pkgdir}/usr/share/libreoffice/sdk
+
# fix insecure rpath
- chrpath -d $pkgdir/usr/lib/libreoffice/program/libCbc.so.3
- chrpath -d $pkgdir/usr/lib/libreoffice/program/libOsi.so.1
- chrpath -d $pkgdir/usr/lib/libreoffice/program/libCoinMP.so.1
- chrpath -d $pkgdir/usr/lib/libreoffice/program/libCbcSolver.so.3
- chrpath -d $pkgdir/usr/lib/libreoffice/program/libOsiClp.so.1
- chrpath -d $pkgdir/usr/lib/libreoffice/program/libCgl.so.1
- chrpath -d $pkgdir/usr/lib/libreoffice/program/libClp.so.1
+ chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbc.so.3
+ chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libOsi.so.1
+ chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCoinMP.so.1
+ chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbcSolver.so.3
+ chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libOsiClp.so.1
+ chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCgl.so.1
+ chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libClp.so.1
}
+
+md5sums=('c98ff0989252558dc21b71ec5e32049f'
+ 'SKIP'
+ '5b3b55d75a9659dace93900c3e88d6a9'
+ 'SKIP'
+ '507657907ee417631287c79deb44cfc8'
+ 'SKIP'
+ 'd6eef4b4cacb2183f2bf265a5a03a354'
+ '1f24ab1d39f4a51faf22244c94a6203f'
+ '35c94d2df8893241173de1d16b6034c0'
+ '798b2ffdc8bcfe7bca2cf92b62caf685'
+ 'a7983f859eafb2677d7ff386a023bc40'
+ 'e8e197d628436490886d17cffa108fe3'
+ '8ab049135b2d15313da5d9f0656894a1'
+ '2c9b0f83ed5890af02c0df1c1776f39b'
+ '048751f3271906db5126ab76870444c4'
+ 'eeb2c7ddf0d302fba4bfc6e97eac9624'
+ '39bb3fcea1514f1369fcfc87542390fd'
+ '3404ab6b1792ae5f16bbd603bd1e1d03'
+ '97b2d4dba862397f446b217e2b623e71'
+ 'f94d9870737518e3b597f9265f4e9803'
+ '8ce2fcd72becf06c41f7201d15373ed9'
+ 'd8bd5eed178db6e2b18eeed243f85aa8'
+ '3bdf40c0d199af31923e900d082ca2dd'
+ 'ace6ab49184e329db254e454a010f56d'
+ 'db60e4fde8dd6d6807523deb71ee34dc'
+ 'ba2930200c9f019c2d93a8c88c651a0f'
+ 'ae330b9493bd4503ac390106ff6060d7'
+ '22f8a85daf4a012180322e1f52a7563b'
+ '7681383be6ce489d84c1c74f4e7f9643'
+ '36271d3fa0d9dec1632029b6d7aac925'
+ '0168229624cfac409e766913506961a8'
+ '17410483b5b5f267aa18b7e00b65e6e0'
+ '185d60944ea767075d27247c3162b3bc'
+ 'd794625f156a9fb1c53b3f8a8aa13b5e'
+ '496dd00028afcc19f896b01394769043'
+ '21154d2004e025c8a3666625b0357bb5'
+ '2f1ceaf2ac8752ed278e175447d9b978'
+ '40fa48e03b1e28ae0325cc34b35bc46d'
+ '504af523f5d1a5590bbeb6a4b55e8a97'
+ '8ac8ae9829c4fefd1ae9f715f95d4e0b'
+ '1cce53bf4b40ae29790d2c5c9f8b1129'
+ 'bae83fa5dc7f081768daace6e199adc3'
+ 'c8a8be5829ceffacfe1d68d078f5c442'
+ '4ca8a6ef0afeefc864e9ef21b9f14bd6'
+ '510c3f8504bfb8cc8c8fc5d0fac74055'
+ '07d2bf5ad839a394cca008b3ec6e7bb1'
+ '4195735a80876ae812fca5736b50192a'
+ 'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 53ba04b57..7bbaa00d2 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,36 +1,25 @@
-# $Id: PKGBUILD 212228 2014-05-11 09:19:56Z tpowa $
+# $Id: PKGBUILD 213910 2014-05-31 11:41:33Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-#######
-# _TIANOCORE_SVN_URL="https://svn.code.sf.net/p/edk2/code/branches/UDK2014"
-# _TIANO_DIR_="tianocore-udk-2014-svn"
-# _TIANO_SVN_REV_="15322"
-
-# BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg
+_USE_GNU_EFI="1"
-_TIANOCORE_SVN_URL="https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1"
-_TIANO_DIR_="tianocore-udk-2010-svn"
-_TIANO_SVN_REV_="14641"
#######
+[[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64"
+[[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32"
-#######
-_TIANOCORE_PKG="Mde"
-_TIANOCORE_TARGET="RELEASE"
-_UDK_TARGET="${_TIANOCORE_PKG}Pkg/${_TIANOCORE_PKG}Pkg.dsc"
-# _COMPILER="GCC48"
-_COMPILER="GCC47"
+[[ "${CARCH}" == "x86_64" ]] && _TIANO_S_ARCH="x64"
+[[ "${CARCH}" == "i686" ]] && _TIANO_S_ARCH="ia32"
#######
pkgname="refind-efi"
-pkgver="0.7.9"
+pkgver="0.8.1"
pkgrel="1"
-pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
+pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager"
url="http://www.rodsbooks.com/refind/index.html"
arch=('x86_64' 'i686')
license=('GPL3' 'custom')
-makedepends=('subversion' 'python2')
depends=('bash' 'dosfstools' 'efibootmgr')
optdepends=('mactel-boot: For bless command in Apple Mac systems'
'imagemagick: For refind-mkfont script')
@@ -42,25 +31,36 @@ install="${pkgname}.install"
source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip"
'refind_linux.conf')
-for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
- source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}")
-done
-
-md5sums=('2792c9430d4e575eb19e62b548a7a2e6'
- 'a83e45b10d5efbca1c93a63851728712'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP')
-
-[[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64"
-[[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32"
+if [[ "${_USE_GNU_EFI}" == "1" ]]; then
+
+ pkgdesc="${pkgdesc} - Built with GNU-EFI libs"
+ makedepends=('gnu-efi-libs')
+
+else
+
+ pkgdesc="${pkgdesc} - Built with Tianocore UDK libs"
+ makedepends+=('subversion' 'python2')
+
+ _TIANOCORE_SVN_URL="https://svn.code.sf.net/p/edk2/code/branches/UDK2014"
+ _TIANO_DIR_="tianocore-udk-2014-svn"
+ _TIANO_SVN_REV_="15322"
+
+ _TIANOCORE_PKG="Mde"
+ _TIANOCORE_TARGET="RELEASE"
+ _UDK_TARGET="${_TIANOCORE_PKG}Pkg/${_TIANOCORE_PKG}Pkg.dsc"
+ _COMPILER="GCC48"
+
+ ## BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg
+ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
+ source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}")
+ done
+
+fi
-[[ "${CARCH}" == "x86_64" ]] && _TIANO_S_ARCH="x64"
-[[ "${CARCH}" == "i686" ]] && _TIANO_S_ARCH="ia32"
+md5sums=('9bb5181bab8700a32a6ab835a131e5c5'
+ '12ce3e22a216e7b25c253478a34713b4')
-_setup_env_vars() {
+_setup_tianocore_env_vars() {
msg "Setup UDK PATH ENV variables"
export _UDK_DIR="${srcdir}/${_TIANO_DIR_}_build"
@@ -96,7 +96,7 @@ _prepare_tianocore_sources() {
sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Source/C/Makefiles/header.makefile" || true
sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
- msg "Fix GenFw: ERROR 3000: Invalid, refind_x64.dll bad symbol definition"
+ msg "Fix GenFw: ERROR 3000: Invalid, bad symbol definition"
## http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg03625.html
sed -e 's|_OBJCOPY_FLAGS =|_OBJCOPY_FLAGS = -R .eh_frame|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
@@ -105,9 +105,12 @@ _prepare_tianocore_sources() {
sed 's|--64 | |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
sed 's| -m64 -melf_x86_64| -m64|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
- msg "Remove GCC -g debug option and add -0s -mabi=ms"
- sed 's|DEFINE GCC_ALL_CC_FLAGS = -g |DEFINE GCC_ALL_CC_FLAGS = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
- sed 's|DEFINE GCC44_ALL_CC_FLAGS = -g |DEFINE GCC44_ALL_CC_FLAGS = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
+ msg "Remove GCC -g debug option and add -O0 -mabi=ms -maccumulate-outgoing-args"
+ sed 's|DEFINE GCC_ALL_CC_FLAGS = -g |DEFINE GCC_ALL_CC_FLAGS = -O0 -mabi=ms -maccumulate-outgoing-args |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
+ sed 's|DEFINE GCC44_ALL_CC_FLAGS = -g |DEFINE GCC44_ALL_CC_FLAGS = -O0 -mabi=ms -maccumulate-outgoing-args |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
+
+ # msg "Fix GenFw: ERROR 3000: Invalid, Unsupported section alignment"
+ sed 's|--gc-sections|--gc-sections --build-id=none|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template"
msg "Fix UDK Target Platform"
sed "s|ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc|ACTIVE_PLATFORM = ${_UDK_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
@@ -126,33 +129,62 @@ _prepare_refind_sources() {
cd "${srcdir}/refind-${pkgver}/"
- msg "Fix UDK Path in rEFInd Makefiles"
- sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
- sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true
- sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
-
- msg "Fix GenFw: ERROR 3000: Invalid, refind_x64.dll bad symbol definition"
- sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
- sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano"
- sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+ if [[ "${_USE_GNU_EFI}" == "1" ]]; then
+ msg "Enable GNU_EFI_USE_MS_ABI"
+ sed "s|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -maccumulate-outgoing-args|g" -i "${srcdir}/refind-${pkgver}/Make.common" || true
+ sed "s|-DEFIX64|-DEFIX64 -maccumulate-outgoing-args|g" -i "${srcdir}/refind-${pkgver}/Make.common" || true
+ sed "s|-m64|-maccumulate-outgoing-args -m64|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.gnuefi" || true
+ else
+ msg "Fix UDK Path in rEFInd Makefiles"
+ sed "s|EDK2BASE = /usr/local/UDK2014/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
+ sed "s|EDK2BASE = /usr/local/UDK2014/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
+ sed "s|EDK2BASE = /usr/local/UDK2014/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true
+ sed "s|EDK2BASE = /usr/local/UDK2014/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+ sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
+ sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
+ sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true
+ sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+
+ msg "Fix GenFw: ERROR 3000: Invalid, refind_x64.dll bad symbol definition"
+ sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
+ sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
+ sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano"
+ sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+
+ # msg "Fix GenFw: ERROR 3000: Invalid section alignment"
+ sed 's|--gc-sections|--gc-sections --build-id=none|g' -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
+ sed 's|--gc-sections|--gc-sections --build-id=none|g' -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
+ sed 's|--gc-sections|--gc-sections --build-id=none|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true
+ sed 's|--gc-sections|--gc-sections --build-id=none|g' -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+ # sed -e 's|--gc-sections|--gc-sections -z max-page-size=0x20|g' -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
+ # sed -e 's|--gc-sections|--gc-sections -z max-page-size=0x20|g' -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
+ # sed -e 's|--gc-sections|--gc-sections -z max-page-size=0x20|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano"
+ # sed -e 's|--gc-sections|--gc-sections -z max-page-size=0x20|g' -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+ # sed -e 's|--strip-unneeded|--section-alignment=0x20 --strip-unneeded|g' -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
+ # sed -e 's|--strip-unneeded|--section-alignment=0x20 --strip-unneeded|g' -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
+ # sed -e 's|--strip-unneeded|--section-alignment=0x20 --strip-unneeded|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano"
+ # sed -e 's|--strip-unneeded|--section-alignment=0x20 --strip-unneeded|g' -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true
+ fi
}
prepare() {
- _setup_env_vars
-
- msg "Prepare Tianocore Sources"
- _prepare_tianocore_sources
+ if [[ "${_USE_GNU_EFI}" != "1" ]]; then
+ _setup_tianocore_env_vars
+
+ msg "Prepare Tianocore Sources"
+ _prepare_tianocore_sources
+ fi
msg "Prepare rEFInd Sources"
_prepare_refind_sources
}
-build() {
+_build_tianocore_sources() {
- _setup_env_vars
+ _setup_tianocore_env_vars
cd "${_UDK_DIR}/"
@@ -171,10 +203,25 @@ build() {
make -C "${EDK_TOOLS_PATH}"
echo
+ msg "Unset all compiler FLAGS"
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
msg "Compile UDK Libraries"
"${EDK_TOOLS_PATH}/BinWrappers/PosixLike/build" -p "${_UDK_TARGET}" -a "${_TIANO_ARCH}" -b "${_TIANOCORE_TARGET}" -t "${_COMPILER}"
echo
+}
+
+build() {
+
+ if [[ "${_USE_GNU_EFI}" != "1" ]]; then
+ _build_tianocore_sources
+ fi
+
cd "${srcdir}/refind-${pkgver}/"
msg "Unset all compiler FLAGS"
@@ -185,12 +232,67 @@ build() {
unset MAKEFLAGS
msg "Compile rEFInd UEFI application"
- make tiano
- echo
+ if [[ "${_USE_GNU_EFI}" == "1" ]]; then
+ make gnuefi
+ echo
+ else
+ make tiano
+ echo
+ fi
+
+ cd "${srcdir}/refind-${pkgver}/filesystems/"
+
+ msg "Unset all compiler FLAGS"
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
msg "Compile UEFI FS drivers"
- make fs
- echo
+ if [[ "${_USE_GNU_EFI}" == "1" ]]; then
+ make btrfs_gnuefi
+ echo
+
+ make ext4_gnuefi
+ echo
+
+ make ext2_gnuefi
+ echo
+
+ make hfs_gnuefi
+ echo
+
+ make iso9660_gnuefi
+ echo
+
+ make reiserfs_gnuefi
+ echo
+
+ # make xfs_gnuefi
+ # echo
+ else
+ make btrfs
+ echo
+
+ make ext4
+ echo
+
+ make ext2
+ echo
+
+ make hfs
+ echo
+
+ make iso9660
+ echo
+
+ make reiserfs
+ echo
+
+ # make xfs
+ # echo
+ fi
}
diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install
index a1f237896..86314c05d 100644
--- a/extra/refind-efi/refind-efi.install
+++ b/extra/refind-efi/refind-efi.install
@@ -16,7 +16,7 @@ or mactel-boot (for Macs)
rEFInd Icons have been installed at /usr/share/refind/icons/
rEFInd Fonts have been installed at /usr/share/refind/fonts/
-HTML Documentation is available at /usr/share/doc/refind/html/
+HTML Documentation is available at /usr/share/refind/docs/html/
More info: https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd
diff --git a/extra/refind-efi/refind_linux.conf b/extra/refind-efi/refind_linux.conf
index a34536b37..5a3768bcf 100644
--- a/extra/refind-efi/refind_linux.conf
+++ b/extra/refind-efi/refind_linux.conf
@@ -1,5 +1,5 @@
## This file should be present in the same directory as the EFISTUB kernel and initramfs files
## More info at http://www.rodsbooks.com/refind/linux.html , http://www.rodsbooks.com/efi-bootloaders/efistub.html
-"Boot with defaults" "root=PARTUUID=XXXXXXXX rootfstype=XXXX ro"
-"Boot to terminal" "root=PARTUUID=XXXXXXXX rootfstype=XXXX ro systemd.unit=multi-user.target"
+"Boot with defaults" "root=PARTUUID=XXXXXXXX rootfstype=XXXX rw add_efi_memmap"
+"Boot to terminal" "root=PARTUUID=XXXXXXXX rootfstype=XXXX rw add_efi_memmap systemd.unit=multi-user.target"
diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD
index a68b03c25..37e384b36 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205611 2014-02-09 10:29:43Z andyrtr $
+# $Id: PKGBUILD 213929 2014-05-31 18:17:31Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=shared-mime-info
-pkgver=1.2
-pkgrel=2
+pkgver=1.3
+pkgrel=1
pkgdesc="Freedesktop.org Shared MIME Info"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig')
install=shared-mime-info.install
url="http://freedesktop.org/Software/shared-mime-info"
source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz)
-md5sums=('8f90f3f2b8478fa47e70678d34013f99')
+md5sums=('743720bc4803dd69f55449013d350f31')
options=(!makeflags)
build() {
diff --git a/extra/xapian-core/PKGBUILD b/extra/xapian-core/PKGBUILD
index ac550a467..90bd7aac7 100644
--- a/extra/xapian-core/PKGBUILD
+++ b/extra/xapian-core/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211530 2014-04-19 11:52:52Z andrea $
+# $Id: PKGBUILD 213896 2014-05-31 06:54:44Z andrea $
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -7,7 +7,7 @@
pkgname=xapian-core
epoch=1
pkgver=1.2.17
-pkgrel=1
+pkgrel=2
pkgdesc='Open source search engine library.'
arch=('i686' 'x86_64')
url='http://www.xapian.org/'
@@ -19,12 +19,18 @@ source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.xz")
md5sums=('493117bf45e5471e86b4fc5d6d8069dc')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ # FS#40614
+ if [ "${CARCH}" = "i686" ]; then
+ SSE2="--disable-sse"
+ fi
+
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr ${SSE2}
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-06 10:45:00 +0000