diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2012-02-05 17:25:05 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2012-02-05 17:25:05 +0000 |
| commit | 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch) | |
| tree | eeed5f77c8417a98fe5b8538d3c019d1cea00c04 /extra | |
| parent | cdc66cc7110e78bf1197f9effc70422114f9341b (diff) | |
Sun Feb 5 17:25:01 UTC 2012
Diffstat (limited to 'extra')
60 files changed, 0 insertions, 5752 deletions
diff --git a/extra/bluez/make-libcheck-optional.patch b/extra/bluez/make-libcheck-optional.patch deleted file mode 100644 index a315a3898..000000000 --- a/extra/bluez/make-libcheck-optional.patch +++ /dev/null @@ -1,79 +0,0 @@ -From: Marcel Holtmann <marcel@holtmann.org> -Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800) -Subject: build: Move libcheck under TEST conditional -X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a - -build: Move libcheck under TEST conditional ---- - -diff --git a/Makefile.am b/Makefile.am -index 9112483..5cf287c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -449,6 +449,7 @@ endif - - unit_objects = - -+if TEST - unit_tests = unit/test-eir - - noinst_PROGRAMS += $(unit_tests) -@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests) - unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c - unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@ - unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ --unit_test_eir_SHORTNAME = unit - unit_objects += $(unit_test_eir_OBJECTS) -+else -+unit_tests = -+endif - - TESTS = $(unit_tests) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 2097d77..753b994 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [ - []) - ]) - -+AC_DEFUN([AC_PATH_CHECK], [ -+ PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no) -+ AC_SUBST(CHECK_CFLAGS) -+ AC_SUBST(CHECK_LIBS) -+]) -+ - AC_DEFUN([AC_PATH_OUI], [ - AC_ARG_WITH(ouifile, - AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]), -@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ - AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes") - AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes") - AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") -- AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") -+ AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes") - AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes") - AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes") - AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes") -diff --git a/configure.ac b/configure.ac -index 3a5dfde..a7670da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,8 +24,6 @@ AC_PROG_YACC - AM_PROG_LEX - AM_PROG_MKDIR_P - --PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) -- - m4_define([_LT_AC_TAGCONFIG], []) - m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) - -@@ -50,6 +48,7 @@ AC_PATH_UDEV - AC_PATH_SNDFILE - AC_PATH_OUI - AC_PATH_READLINE -+AC_PATH_CHECK - - AC_ARG_BLUEZ - diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD deleted file mode 100644 index 018f70a54..000000000 --- a/extra/bogofilter/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Low Kian Seong <fastmail_low@speedymail.org> - -pkgname=bogofilter -pkgver=1.2.2 -pkgrel=4 -pkgdesc="A fast Bayesian spam filtering tool" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://bogofilter.sourceforge.net" -depends=('db' 'perl' 'gsl') -backup=('etc/bogofilter/bogofilter.cf') -source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc/bogofilter \ - --localstatedir=/var \ - --enable-transactions - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf" - - install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib" - install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/" -} diff --git a/extra/claws-mail/gnutls_buildfix.patch b/extra/claws-mail/gnutls_buildfix.patch deleted file mode 100644 index 31de8eb8b..000000000 --- a/extra/claws-mail/gnutls_buildfix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- claws-mail-3.7.10/src/common/ssl.c 2011-12-07 14:55:08.682553870 +0100 -+++ claws-mail-3.7.10/src/common/ssl.c 2011-12-07 14:55:43.808349602 +0100 -@@ -270,7 +270,9 @@ gboolean ssl_init_socket_with_method(Soc - if (session == NULL || r != 0) - return FALSE; - -+#if GNUTLS_VERSION_NUMBER < 0x020c00 - gnutls_transport_set_lowat (session, 1); -+#endif - gnutls_set_default_priority(session); - gnutls_protocol_set_priority (session, proto_prio); - gnutls_cipher_set_priority (session, cipher_prio); diff --git a/extra/colord/scan_only_color_profile_dir.patch b/extra/colord/scan_only_color_profile_dir.patch deleted file mode 100644 index 0591fc420..000000000 --- a/extra/colord/scan_only_color_profile_dir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Tue, 6 Dec 2011 09:49:49 +0000 -Subject: [PATCH] If /usr/share/color appears at runtime, don't rescan the - parent dir - -Resolves https://bugs.freedesktop.org/show_bug.cgi?id=43542 ---- - src/cd-profile-store.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/cd-profile-store.c b/src/cd-profile-store.c -index ecad474..c662351 100644 ---- a/src/cd-profile-store.c -+++ b/src/cd-profile-store.c -@@ -260,8 +260,14 @@ cd_profile_store_file_monitor_changed_cb (GFileMonitor *monitor, - /* just rescan the correct directory */ - parent = g_file_get_parent (file); - parent_path = g_file_get_path (parent); -- g_debug ("CdProfileStore: %s was added, rescanning %s", path, parent_path); -- cd_profile_store_search_path (profile_store, parent_path); -+ if (g_strcmp0 (parent_path, DATADIR) == 0) { -+ g_debug ("CdProfileStore: %s was added, rescanning", path); -+ cd_profile_store_search_path (profile_store, path); -+ } else { -+ g_debug ("CdProfileStore: %s was added, rescanning parent %s", -+ path, parent_path); -+ cd_profile_store_search_path (profile_store, parent_path); -+ } - out: - if (parent != NULL) - g_object_unref (parent); --- -1.7.6 - diff --git a/extra/cppunit/gcc4.5.patch b/extra/cppunit/gcc4.5.patch deleted file mode 100644 index 86d4a424d..000000000 --- a/extra/cppunit/gcc4.5.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- cppunit-1.12.1.orig/src/cppunit/Makefile.am -+++ cppunit-1.12.1/src/cppunit/Makefile.am -@@ -63,5 +63,11 @@ - - libcppunit_la_LDFLAGS= \ - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -- -release $(LT_RELEASE) -+ -release $(LT_RELEASE) @LIBADD_DL@ - -+TESTS = t_link -+ -+check_PROGRAMS = t_link -+ -+t_link_SOURCES = t_link.cpp -+t_link_LDADD = libcppunit.la diff --git a/extra/dirmngr/PKGBUILD b/extra/dirmngr/PKGBUILD deleted file mode 100644 index f2f6b60e5..000000000 --- a/extra/dirmngr/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 134465 2011-08-04 06:40:27Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=dirmngr -pkgver=1.1.0 -pkgrel=3 -pkgdesc="A daemon to handle CRL and certificate requests" -arch=('i686' 'x86_64') -license=('GPL') -url="ftp://ftp.gnupg.org/gcrypt/dirmngr" -depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) -install=dirmngr.install - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib - make - make DESTDIR=$pkgdir install -} -md5sums=('f2570f0248f5947daac200e85291b328') diff --git a/extra/dirmngr/dirmngr.install b/extra/dirmngr/dirmngr.install deleted file mode 100644 index e26e0e7fd..000000000 --- a/extra/dirmngr/dirmngr.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(dirmngr.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/extra/ffmpeg/revert-enabling-threads.patch b/extra/ffmpeg/revert-enabling-threads.patch deleted file mode 100644 index dd50332ee..000000000 --- a/extra/ffmpeg/revert-enabling-threads.patch +++ /dev/null @@ -1,15 +0,0 @@ -X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921 - -diff --git a/libavcodec/options.c b/libavcodec/options.c -index 4ac9313..4ac92fd 100644 ---- a/libavcodec/options.c -+++ b/libavcodec/options.c -@@ -370,7 +370,7 @@ static const AVOption options[]={ - {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"}, - #endif - {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, --{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"}, -+{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"}, - {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, - {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, - {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, diff --git a/extra/freeglut/2.6.0-GFX_radeon.patch b/extra/freeglut/2.6.0-GFX_radeon.patch deleted file mode 100644 index 8806fe849..000000000 --- a/extra/freeglut/2.6.0-GFX_radeon.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: src/freeglut_window.c -=================================================================== ---- src/freeglut_window.c (Revision 832) -+++ src/freeglut_window.c (Arbeitskopie) -@@ -594,10 +594,9 @@ - #if TARGET_HOST_POSIX_X11 - if ( window ) - { -- glXMakeContextCurrent( -+ glXMakeCurrent( - fgDisplay.Display, - window->Window.Handle, -- window->Window.Handle, - window->Window.Context - ); - -@@ -932,10 +932,9 @@ - XSetWMProtocols( fgDisplay.Display, window->Window.Handle, - &fgDisplay.DeleteWindow, 1 ); - -- glXMakeContextCurrent( -+ glXMakeCurrent( - fgDisplay.Display, - window->Window.Handle, -- window->Window.Handle, - window->Window.Context - ); - diff --git a/extra/freeglut/ChangeLog b/extra/freeglut/ChangeLog deleted file mode 100644 index 7dd6847f9..000000000 --- a/extra/freeglut/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -2009-12-30 Eric Belanger <eric@archlinux.org> - - * freeglut 2.6.0-1 - * Upstream update - * Added libxi depends - * Changed license to MIT - * Added patch to fix an issue with the radeon[hd] ATI opensource drivers - * Added ChangeLog diff --git a/extra/gluezilla/PKGBUILD b/extra/gluezilla/PKGBUILD deleted file mode 100644 index 224068bd6..000000000 --- a/extra/gluezilla/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgname=gluezilla -pkgver=2.6 -pkgrel=3 -pkgdesc="Web browser implementation (Gecko) for Mono, the free .NET runtime" -arch=(i686 x86_64) -license=('LGPL2' 'MPL') -url="http://www.mono-project.com/" -depends=('mono' 'xulrunner>=2.0') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xulrunner2.0.patch xulrunner2.0_configure.patch) -md5sums=('bd4eb89747498945227877295fcd36b5' - '26ea3af3ef5ce045a13a3f3ee54cf0f6' - '06faa671dd791868701d98e610fcbc7e') - -build() { - cd ${srcdir}/gluezilla-${pkgver} - patch -p1 < ${srcdir}/xulrunner2.0.patch || return 1 - patch -p1 < ${srcdir}/xulrunner2.0_configure.patch || return 1 - - rm configure - autoconf - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - -} diff --git a/extra/gluezilla/configure_xulrunner.patch b/extra/gluezilla/configure_xulrunner.patch deleted file mode 100644 index 6537a2066..000000000 --- a/extra/gluezilla/configure_xulrunner.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure_old 2009-10-01 20:27:13.000000000 +0200 -+++ configure 2010-03-25 12:31:10.000000000 +0100 -@@ -19988,7 +19988,7 @@ - - { echo "$as_me:$LINENO: checking Mozilla XPCOM > 1.8" >&5 - echo $ECHO_N "checking Mozilla XPCOM > 1.8... $ECHO_C" >&6; } -- mozilla_xpcom_pcs="libxul-embedding-unstable" -+ mozilla_xpcom_pcs="libxul-embedding" - for pc in $mozilla_xpcom_pcs; do - if $PKG_CONFIG --exists $pc; then - { echo "$as_me:$LINENO: result: $pc" >&5 diff --git a/extra/gluezilla/xulrunner2.0.patch b/extra/gluezilla/xulrunner2.0.patch deleted file mode 100644 index 913795908..000000000 --- a/extra/gluezilla/xulrunner2.0.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/src/BrowserWindow.cpp b/src/BrowserWindow.cpp -index f260295..10ae7bd 100755 ---- a/src/BrowserWindow.cpp -+++ b/src/BrowserWindow.cpp -@@ -28,23 +28,6 @@ - NS_GENERIC_FACTORY_CONSTRUCTOR(SecurityWarningDialogs) - NS_GENERIC_FACTORY_CONSTRUCTOR(PromptService) - --static const nsModuleComponentInfo components[] = { -- { -- SECURITYWARNINGSDIALOGS_CLASSNAME, -- SECURITYWARNINGSDIALOGS_CID, -- NS_SECURITYWARNINGDIALOGS_CONTRACTID, -- SecurityWarningDialogsConstructor -- }, -- { -- PROMPTSERVICE_CLASSNAME, -- PROMPTSERVICE_CID, -- NS_PROMPTSERVICE_CONTRACTID, -- PromptServiceConstructor -- } -- --}; -- -- - BrowserWindow::BrowserWindow (void) - { - owner = nsnull; -@@ -162,17 +145,17 @@ nsresult BrowserWindow::RegisterComponents () - nsCOMPtr<nsIFactory> componentFactory; - rv = NS_NewSecurityWarningServiceFactory(getter_AddRefs(componentFactory)); - if (NS_SUCCEEDED(rv)) { -- compReg->RegisterFactory(components[0].mCID, -- components[0].mDescription, -- components[0].mContractID, -+ compReg->RegisterFactory(kSECURITYWARNINGSDIALOGS_CID, -+ SECURITYWARNINGSDIALOGS_CLASSNAME, -+ NS_SECURITYWARNINGDIALOGS_CONTRACTID, - componentFactory); - } - - rv = NS_NewPromptServiceFactory(getter_AddRefs(componentFactory), this); - if (NS_SUCCEEDED(rv)) { -- compReg->RegisterFactory(components[1].mCID, -- components[1].mDescription, -- components[1].mContractID, -+ compReg->RegisterFactory(kPROMPTSERVICE_CID, -+ PROMPTSERVICE_CLASSNAME, -+ NS_PROMPTSERVICE_CONTRACTID, - componentFactory); - } - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3b7bce3..cd6ec99 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -26,7 +26,7 @@ libgluezilla_la_SOURCES = \ - gluezilla.h \ - FastDelegate.h - --if OLDXUL -+if XUL_2 - libgluezilla_la_SOURCES += \ - gluezilla_nsIScriptContext.h \ - gluezilla_nsIScriptGlobalObject.h -diff --git a/src/PromptService.h b/src/PromptService.h -index 04fddb9..174bca4 100644 ---- a/src/PromptService.h -+++ b/src/PromptService.h -@@ -20,8 +20,9 @@ - // {77686174-2061-6d20-6920-746F20646F20}
- #define PROMPTSERVICE_CID \
- { 0x77686174, 0x2061, 0x6d20, { 0x69, 0x20, 0x74, 0x6F, 0x20, 0x64, 0x6F, 0x20 } }
--
--
-+ -+static NS_DEFINE_CID(kPROMPTSERVICE_CID, PROMPTSERVICE_CID); -+ - class PromptService : public nsIPromptService
- {
- NS_DECL_ISUPPORTS
-diff --git a/src/SecurityWarningsDialogs.h b/src/SecurityWarningsDialogs.h -index b75f529..ae352ad 100644 ---- a/src/SecurityWarningsDialogs.h -+++ b/src/SecurityWarningsDialogs.h -@@ -21,8 +21,9 @@ - // {696E7465-7265-7374-696E-67206C696665}
- #define SECURITYWARNINGSDIALOGS_CID \
- { 0x696E7465, 0x7265, 0x7374, { 0x69, 0x6E, 0x67, 0x20, 0x6C, 0x69, 0x66, 0x65 } }
--
--
-+ -+static NS_DEFINE_CID(kSECURITYWARNINGSDIALOGS_CID, SECURITYWARNINGSDIALOGS_CID); -+ - class SecurityWarningDialogs : public nsISecurityWarningDialogs
- {
- public:
-diff --git a/src/interfaces.h b/src/interfaces.h -index 3a9f9dd..6acebb8 100644 ---- a/src/interfaces.h -+++ b/src/interfaces.h -@@ -4,7 +4,18 @@ - #define TO_STRING(x) #x - - //Gecko Embedding API -+#if XUL_VERSION < 4 - #include <nsEmbedAPI.h> -+#else -+#include <nscore.h> -+#include <nsXPCOM.h> -+#include <nsILocalFile.h> -+#include <nsIDirectoryService.h> -+#define NS_GRE_COMPONENT_DIR "GreComsD" -+#define NS_XPCOM_COMPONENT_DIR "ComsD" -+#define NS_XPCOM_COMPONENT_REGISTRY_FILE "ComRegF" -+#define NS_XPCOM_XPTI_REGISTRY_FILE "XptiRegF" -+#endif - - //XPCOM API - #include <nsCOMPtr.h> -@@ -78,8 +89,12 @@ - #include <nsIPromptService.h> - #include <nsISecurityWarningDialogs.h> - #include <nsIComponentRegistrar.h> -+#if XUL_VERSION < 4 - #include <nsIGenericFactory.h> -- -+#else -+#include <mozilla/ModuleUtils.h> -+struct nsModuleComponentInfo; -+#endif - // preferences - #include <nsIPrefBranch.h> - #include <nsIPrefService.h> -@@ -131,12 +146,15 @@ - typedef type (NS_FROZENCALL * name##Type) params; \ - extern name##Type name NS_HIDDEN; - -+#if XUL_VERSION < 4 - XRE_API(nsresult, - XRE_InitEmbedding, (nsILocalFile *aLibXULDirectory, - nsILocalFile *aAppDirectory, - nsIDirectoryServiceProvider *aAppDirProvider, - nsStaticModuleInfo const *aStaticComponents, - PRUint32 aStaticComponentCount)) -+#endif -+ - - XRE_API(void, XRE_TermEmbedding, ()) - diff --git a/extra/gluezilla/xulrunner2.0_configure.patch b/extra/gluezilla/xulrunner2.0_configure.patch deleted file mode 100644 index cb64208e3..000000000 --- a/extra/gluezilla/xulrunner2.0_configure.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac_new -@@ -87,16 +87,23 @@ - - if test "x${oldxul}" != xyes ; then - -- AC_MSG_CHECKING(Mozilla XPCOM > 1.8) -- mozilla_xpcom_pcs="libxul-embedding-unstable" -- for pc in $mozilla_xpcom_pcs; do -- if $PKG_CONFIG --exists $pc; then -- AC_MSG_RESULT($pc) -- mozilla_xpcom=$pc -- XUL_VERSION=3 -- break; -- fi -- done -+ if test -z $mozilla_xpcom; then -+ AC_MSG_CHECKING(Mozilla XPCOM > 1.8) -+ mozilla_xpcom_pcs="libxul-embedding libxul-embedding-unstable" -+ for pc in $mozilla_xpcom_pcs; do -+ if $PKG_CONFIG --exists $pc; then -+ mozilla_xpcom=$pc -+ XUL_VERSION=3 -+ version="$(pkg-config --modversion $pc)" -+ minor=`echo "$version" | sed -e 's,\([[0-9]]*\)\..*,\1,'` -+ if test $minor -ge 2; then -+ XUL_VERSION=4 -+ fi -+ AC_MSG_RESULT(Found $version) -+ break; -+ fi -+ done -+ fi - fi - - if test -z $mozilla_xpcom; then -@@ -121,9 +128,12 @@ - XPCOM_PKGS="$mozilla_xpcom" - fi - --AM_CONDITIONAL([OLDXUL], [test x$XUL_VERSION = x2]) -- - AC_SUBST(XUL_VERSION) -+ -+AM_CONDITIONAL([XUL_4], [test x$XUL_VERSION = x4]) -+AM_CONDITIONAL([XUL_3], [test x$XUL_VERSION = x3]) -+AM_CONDITIONAL([XUL_2], [test x$XUL_VERSION = x2]) -+ - - AC_ARG_ENABLE([optimize], - AC_HELP_STRING([--enable-optimize], [Enable optimizations (-O2)]), diff --git a/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch b/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch deleted file mode 100644 index cdb9140bf..000000000 --- a/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch +++ /dev/null @@ -1,224 +0,0 @@ -From 7e654ab3ca6e8ac75ba5e45c2a411eb1c2904b26 Mon Sep 17 00:00:00 2001 -From: Marina Zhurakhinskaya <marinaz@redhat.com> -Date: Tue, 20 Dec 2011 05:51:35 +0000 -Subject: notificationDaemon: group sources based on a combination of pid and title - -That way different system notifications, such as the ones about battery power -and the ones about software updates, are shown with separate message tray -sources. - -https://bugzilla.gnome.org/show_bug.cgi?id=664138 ---- -diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js -index f40205d..c691efe 100644 ---- a/js/ui/notificationDaemon.js -+++ b/js/ui/notificationDaemon.js -@@ -92,7 +92,7 @@ NotificationDaemon.prototype = { - _init: function() { - DBus.session.exportObject('/org/freedesktop/Notifications', this); - -- this._sources = {}; -+ this._sources = []; - this._senderToPid = {}; - this._notifications = {}; - this._busProxy = new Bus(); -@@ -150,14 +150,30 @@ NotificationDaemon.prototype = { - } - }, - -+ _lookupSource: function(title, pid, trayIcon) { -+ for (let i = 0; i < this._sources.length; i++) { -+ let source = this._sources[i]; -+ if (source.pid == pid && -+ (source.initialTitle == title || source.trayIcon || trayIcon)) -+ return source; -+ } -+ return null; -+ }, -+ - // Returns the source associated with ndata.notification if it is set. -- // Otherwise, returns the source associated with the pid if one is -- // stored in this._sources and the notification is not transient. -- // Otherwise, creates a new source as long as pid is provided. -+ // Otherwise, returns the source associated with the title and pid if -+ // such source is stored in this._sources and the notification is not -+ // transient. If the existing or requested source is associated with -+ // a tray icon and passed in pid matches a pid of an existing source, -+ // the title match is ignored to enable representing a tray icon and -+ // notifications from the same application with a single source. -+ // -+ // If no existing source is found, a new source is created as long as -+ // pid is provided. - // - // Either a pid or ndata.notification is needed to retrieve or - // create a source. -- _getSource: function(title, pid, ndata, sender) { -+ _getSource: function(title, pid, ndata, sender, trayIcon) { - if (!pid && !(ndata && ndata.notification)) - return null; - -@@ -174,20 +190,24 @@ NotificationDaemon.prototype = { - // with a transient one from the same sender, so we - // always create a new source object for new transient notifications - // and never add it to this._sources . -- if (!isForTransientNotification && this._sources[pid]) { -- let source = this._sources[pid]; -- source.setTitle(title); -- return source; -+ if (!isForTransientNotification) { -+ let source = this._lookupSource(title, pid, trayIcon); -+ if (source) { -+ source.setTitle(title); -+ return source; -+ } - } - -- let source = new Source(title, pid, sender); -+ let source = new Source(title, pid, sender, trayIcon); - source.setTransient(isForTransientNotification); - - if (!isForTransientNotification) { -- this._sources[pid] = source; -+ this._sources.push(source); - source.connect('destroy', Lang.bind(this, - function() { -- delete this._sources[pid]; -+ let index = this._sources.indexOf(source); -+ if (index >= 0) -+ this._sources.splice(index, 1); - })); - } - -@@ -261,7 +281,7 @@ NotificationDaemon.prototype = { - let sender = DBus.getCurrentMessageContext().sender; - let pid = this._senderToPid[sender]; - -- let source = this._getSource(appName, pid, ndata, sender); -+ let source = this._getSource(appName, pid, ndata, sender, null); - - if (source) { - this._notifyForSource(source, ndata); -@@ -282,7 +302,7 @@ NotificationDaemon.prototype = { - if (!ndata) - return; - -- source = this._getSource(appName, pid, ndata, sender); -+ source = this._getSource(appName, pid, ndata, sender, null); - - // We only store sender-pid entries for persistent sources. - // Removing the entries once the source is destroyed -@@ -432,8 +452,8 @@ NotificationDaemon.prototype = { - if (!tracker.focus_app) - return; - -- for (let id in this._sources) { -- let source = this._sources[id]; -+ for (let i = 0; i < this._sources.length; i++) { -+ let source = this._sources[i]; - if (source.app == tracker.focus_app) { - source.destroyNonResidentNotifications(); - return; -@@ -456,12 +476,11 @@ NotificationDaemon.prototype = { - }, - - _onTrayIconAdded: function(o, icon) { -- let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null); -- source.setTrayIcon(icon); -+ let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon); - }, - - _onTrayIconRemoved: function(o, icon) { -- let source = this._sources[icon.pid]; -+ let source = this._lookupSource(icon.pid, null, true); - if (source) - source.destroy(); - } -@@ -476,10 +495,12 @@ function Source(title, pid, sender) { - Source.prototype = { - __proto__: MessageTray.Source.prototype, - -- _init: function(title, pid, sender) { -+ _init: function(title, pid, sender, trayIcon) { - MessageTray.Source.prototype._init.call(this, title); - -- this._pid = pid; -+ this.initialTitle = title; -+ -+ this.pid = pid; - if (sender) - // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for - // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation, -@@ -496,7 +517,12 @@ Source.prototype = { - this.title = this.app.get_name(); - else - this.useNotificationIcon = true; -- this._trayIcon = null; -+ -+ this.trayIcon = trayIcon; -+ if (this.trayIcon) { -+ this._setSummaryIcon(this.trayIcon); -+ this.useNotificationIcon = false; -+ } - }, - - _onNameVanished: function() { -@@ -523,7 +549,7 @@ Source.prototype = { - }, - - handleSummaryClick: function() { -- if (!this._trayIcon) -+ if (!this.trayIcon) - return false; - - let event = Clutter.get_current_event(); -@@ -544,11 +570,11 @@ Source.prototype = { - let id = global.connect('notify::stage-input-mode', Lang.bind(this, - function () { - global.disconnect(id); -- this._trayIcon.click(event); -+ this.trayIcon.click(event); - })); - Main.overview.hide(); - } else { -- this._trayIcon.click(event); -+ this.trayIcon.click(event); - } - return true; - }, -@@ -557,31 +583,25 @@ Source.prototype = { - if (this.app) - return; - -- this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid); -+ this.app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid); - if (!this.app) - return; - - // Only override the icon if we were previously using - // notification-based icons (ie, not a trayicon) or if it was unset before -- if (!this._trayIcon) { -+ if (!this.trayIcon) { - this.useNotificationIcon = false; - this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE)); - } - }, - -- setTrayIcon: function(icon) { -- this._setSummaryIcon(icon); -- this.useNotificationIcon = false; -- this._trayIcon = icon; -- }, -- - open: function(notification) { - this.destroyNonResidentNotifications(); - this.openApp(); - }, - - _lastNotificationRemoved: function() { -- if (!this._trayIcon) -+ if (!this.trayIcon) - this.destroy(); - }, - --- -cgit v0.9.0.2 diff --git a/extra/gnupg/PKGBUILD b/extra/gnupg/PKGBUILD deleted file mode 100644 index 997075abb..000000000 --- a/extra/gnupg/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 127729 2011-06-17 22:03:38Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr at archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> -pkgname=gnupg -pkgver=1.4.11 -pkgrel=3 -pkgdesc="GNU Privacy Guard - a PGP replacement tool" -arch=('i686' 'x86_64') -license=('GPL3') -depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00') -source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2) -install=gnupg.install -url="http://www.gnupg.org/" -md5sums=('411744e1ef8ce90b87938c4203f001f1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --enable-noexecstack - make - #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check #All 27 tests passed -} - -package () { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # fix fileconflict with gnupg2 pkg - rm ${pkgdir}/usr/share/man/man1/gpg-zip.1 -} diff --git a/extra/gnupg/gnupg.install b/extra/gnupg/gnupg.install deleted file mode 100644 index 5a6704716..000000000 --- a/extra/gnupg/gnupg.install +++ /dev/null @@ -1,21 +0,0 @@ -info_dir=/usr/share/info -info_files=(gnupg1.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} -# vim:set ts=2 sw=2 et: diff --git a/extra/gnupg2/PKGBUILD b/extra/gnupg2/PKGBUILD deleted file mode 100644 index f237df630..000000000 --- a/extra/gnupg2/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 134651 2011-08-07 10:18:11Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=gnupg2 -pkgver=2.0.18 -pkgrel=1 -pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" -arch=('i686' 'x86_64') -depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt' - 'pth' 'libusb-compat' 'libassuan' 'texinfo' 'readline' 'pinentry' 'dirmngr') -license=('GPL') -url="http://www.gnupg.org/" -install=${pkgname}.install -source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2) - -build() { - cd ${srcdir}/gnupg-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 #$EXTRAOPTS - make -} - -package() { - cd ${srcdir}/gnupg-$pkgver - make DESTDIR=${pkgdir} install - # move conflicting files - mv ${pkgdir}/usr/share/gnupg{,2} - rm -f ${pkgdir}/usr/share/info/dir -} -md5sums=('2f37e0722666a0fedbe4d9f9227ac4d7') diff --git a/extra/gnupg2/gnupg2-2.0.16-security.patch b/extra/gnupg2/gnupg2-2.0.16-security.patch deleted file mode 100644 index b265c1532..000000000 --- a/extra/gnupg2/gnupg2-2.0.16-security.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kbx/keybox-blob.c (revision 5367) -+++ kbx/keybox-blob.c (working copy) -@@ -898,6 +898,7 @@ - rc = gpg_error_from_syserror (); - goto leave; - } -+ names = tmp; - } - names[blob->nuids++] = p; - if (!i && (p=x509_email_kludge (p))) - diff --git a/extra/gnupg2/gnupg2.install b/extra/gnupg2/gnupg2.install deleted file mode 100644 index 27c121ffd..000000000 --- a/extra/gnupg2/gnupg2.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(gnupg.info gnupg.info-1 gnupg.info-2) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/gpgme/PKGBUILD b/extra/gpgme/PKGBUILD deleted file mode 100644 index 3593bb5e7..000000000 --- a/extra/gpgme/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 131247 2011-07-12 07:42:52Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgname=gpgme -pkgver=1.3.1 -pkgrel=1 -pkgdesc="A C wrapper library for GnuPG" -arch=('i686' 'x86_64') -url="http://www.gnupg.org/related_software/gpgme/" -license=('GPL') -depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2') -install=${pkgname}.install -options=('!libtool' '!emptydirs') -source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - rm ${pkgdir}/usr/share/info/dir - gzip ${pkgdir}/usr/share/info/* -} -md5sums=('90afa8436ce2b2683c001c824bd22601') diff --git a/extra/gpgme/gpgme.install b/extra/gpgme/gpgme.install deleted file mode 100644 index b54620d9a..000000000 --- a/extra/gpgme/gpgme.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -filelist=(gpgme.info gpgme.info-1 gpgme.info-2) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/gtk2/revert-iconview.patch b/extra/gtk2/revert-iconview.patch deleted file mode 100644 index e16fc38e3..000000000 --- a/extra/gtk2/revert-iconview.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Wed, 16 Nov 2011 22:38:45 +0000 -Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel" - -It makes GtkIconView segfault on GTK 2.24. - -gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if -there's a layout queued anyway, so we wouldn't end up in the same -situation causing the crash the original patch is supposed to fix. - -This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1. - -https://bugzilla.gnome.org/show_bug.cgi?id=663138 ---- -diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c -index 62877fa..54b3f3b 100644 ---- a/gtk/gtkiconview.c -+++ b/gtk/gtkiconview.c -@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view, - - gtk_icon_view_build_items (icon_view); - -- gtk_icon_view_layout (icon_view); -+ gtk_icon_view_queue_layout (icon_view); - } - - g_object_notify (G_OBJECT (icon_view), "model"); --- -cgit v0.9.0.2 diff --git a/extra/java7-openjdk/jconsole.desktop b/extra/java7-openjdk/jconsole.desktop deleted file mode 100644 index ffbdd42ad..000000000 --- a/extra/java7-openjdk/jconsole.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Monitoring & Management Console -Comment=Monitor and manage OpenJDK applications -Exec=/usr/bin/jconsole -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-tools-jconsole-JConsole -Categories=Development;Monitor;Java; -Version=1.0 diff --git a/extra/java7-openjdk/policytool.desktop b/extra/java7-openjdk/policytool.desktop deleted file mode 100644 index 702b44a6f..000000000 --- a/extra/java7-openjdk/policytool.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Policy Tool -Comment=Manage OpenJDK policy files -Exec=/usr/bin/policytool -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-security-tools-PolicyTool -Categories=Development;Java; -Version=1.0 diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD deleted file mode 100644 index ef9e26785..000000000 --- a/extra/kdeaccessibility/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# $Id: PKGBUILD 144651 2011-12-08 09:19:14Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeaccessibility -pkgname=('kdeaccessibility-jovie' - 'kdeaccessibility-kaccessible' - 'kdeaccessibility-kmag' - 'kdeaccessibility-kmousetool' - 'kdeaccessibility-kmouth') -pkgver=4.7.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://accessibility.kde.org' -license=('GPL' 'FDL') -groups=('kde' 'kdeaccessibility') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('03f4ac8234dcc49eb93eff3630f76e226e290fff') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeaccessibility-jovie() { - pkgdesc='A text to speech application' - depends=('kdebase-runtime' 'speech-dispatcher') - replaces=('kdeaccessibility-kttsd') - install='kdeaccessibility.install' - cd $srcdir/build/jovie - make DESTDIR=$pkgdir install - cd $srcdir/build/jovie/doc - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kaccessible() { - pkgdesc='Provides accessibility services like focus tracking and a screenreader' - depends=('kdebase-runtime' 'speech-dispatcher') - install='kdeaccessibility.install' - cd $srcdir/build/kaccessible - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kmag() { - pkgdesc='Screen Magnifier' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kmag/" - install='kdeaccessibility.install' - cd $srcdir/build/kmag - make DESTDIR=$pkgdir install - cd $srcdir/build/kmag/doc - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kmousetool() { - pkgdesc='Clicks the mouse for you, reducing the effects of RSI' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kmousetool/" - install='kdeaccessibility.install' - cd $srcdir/build/kmousetool - make DESTDIR=$pkgdir install - cd $srcdir/build/kmousetool/doc - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kmouth() { - pkgdesc='Speech Synthesizer Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kmouth/" - install='kdeaccessibility.install' - cd $srcdir/build/kmouth - make DESTDIR=$pkgdir install - cd $srcdir/build/kmouth/doc - make DESTDIR=$pkgdir install -} diff --git a/extra/kdeaccessibility/kdeaccessibility.install b/extra/kdeaccessibility/kdeaccessibility.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdeaccessibility/kdeaccessibility.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdebase-runtime/libqzeitgeist08.patch b/extra/kdebase-runtime/libqzeitgeist08.patch deleted file mode 100644 index f832cd8b2..000000000 --- a/extra/kdebase-runtime/libqzeitgeist08.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~ 2011-10-29 15:46:55.003710230 +0000 -+++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt 2011-10-29 15:47:28.910716093 +0000 -@@ -21,7 +21,7 @@ - ) - endif(Nepomuk_FOUND) - --# Checking for QtZeitgeist -+# Checking for QZeitgeist - macro_optional_find_package(QZeitgeist) - - if (QZEITGEIST_INCLUDE_DIR) -@@ -30,8 +30,8 @@ - - macro_log_feature( - QZeitgeist_FOUND -- "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" -- "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking") -+ "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" -+ "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking") - if (QZeitgeist_FOUND) - set(HAVE_QZEITGEIST 1) - include_directories(${QZEITGEIST_INCLUDE_DIR}) ---- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~ 2011-10-29 15:47:40.960836591 +0000 -+++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp 2011-10-29 15:48:57.034930073 +0000 -@@ -21,31 +21,31 @@ - - #ifndef HAVE_QZEITGEIST - #ifdef __GNUC__ -- #warning "No QtZeitgeist, disabling desktop events processing" -+ #warning "No QZeitgeist, disabling desktop events processing" - #endif - - #else // HAVE_QZEITGEIST - - #include "ZeitgeistEventBackend.h" - --#include <QtZeitgeist/QtZeitgeist> --#include <QtZeitgeist/Interpretation> --#include <QtZeitgeist/Manifestation> -+#include <QZeitgeist/QZeitgeist> -+#include <QZeitgeist/Interpretation> -+#include <QZeitgeist/Manifestation> - - static QString eventInterpretation(Event::Type type) - { - switch (type) { - case Event::Accessed: -- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; -+ return QZeitgeist::Interpretation::Event::ZGAccessEvent; - - case Event::Opened: -- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; -+ return QZeitgeist::Interpretation::Event::ZGAccessEvent; - - case Event::Modified: -- return QtZeitgeist::Interpretation::Event::ZGModifyEvent; -+ return QZeitgeist::Interpretation::Event::ZGModifyEvent; - - case Event::Closed: -- return QtZeitgeist::Interpretation::Event::ZGLeaveEvent; -+ return QZeitgeist::Interpretation::Event::ZGLeaveEvent; - - } - -@@ -57,23 +57,23 @@ - { - switch (reason) { - case Event::User: -- return QtZeitgeist::Manifestation::Event::ZGUserActivity; -+ return QZeitgeist::Manifestation::Event::ZGUserActivity; - - case Event::Heuristic: -- return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity; -+ return QZeitgeist::Manifestation::Event::ZGHeuristicActivity; - - case Event::Scheduled: -- return QtZeitgeist::Manifestation::Event::ZGScheduledActivity; -+ return QZeitgeist::Manifestation::Event::ZGScheduledActivity; - - case Event::System: -- return QtZeitgeist::Manifestation::Event::ZGSystemNotification; -+ return QZeitgeist::Manifestation::Event::ZGSystemNotification; - - case Event::World: -- return QtZeitgeist::Manifestation::Event::ZGWorldActivity; -+ return QZeitgeist::Manifestation::Event::ZGWorldActivity; - } - - // shut up GCC -- return QtZeitgeist::Manifestation::Event::ZGUserActivity; -+ return QZeitgeist::Manifestation::Event::ZGUserActivity; - } - - static QString applicationUri(const QString & application) -@@ -84,7 +84,6 @@ - - ZeitgeistEventBackend::ZeitgeistEventBackend() - { -- QtZeitgeist::init(); - } - - void ZeitgeistEventBackend::addEvents(const EventList & events) diff --git a/extra/kdebase-workspace/fix-powerprofiles.patch b/extra/kdebase-workspace/fix-powerprofiles.patch deleted file mode 100644 index 309fcf3db..000000000 --- a/extra/kdebase-workspace/fix-powerprofiles.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Dario Freddi <drf@kde.org> -Date: Tue, 04 Oct 2011 14:09:09 +0000 -Subject: Use full config when reading settings -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=8d59876457387d1c72ca3626ae2d267adf100014 ---- -Use full config when reading settings - -BUG: 267323 ---- - - ---- a/powerdevil/daemon/powerdevilcore.cpp -+++ b/powerdevil/daemon/powerdevilcore.cpp -@@ -88,7 +88,7 @@ void Core::onBackendReady() - { - kDebug() << "Backend is ready, KDE Power Management system initialized"; - -- m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig); -+ m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::FullConfig); - - // Is it brand new? - if (m_profilesConfig->groupList().isEmpty()) { - diff --git a/extra/kdebindings-smokegen/fix-crash.patch b/extra/kdebindings-smokegen/fix-crash.patch deleted file mode 100644 index 5864da3f3..000000000 --- a/extra/kdebindings-smokegen/fix-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp -diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp ---- smokegen-4.7.0/type_compiler.cpp.orig 2011-08-02 14:34:08.000000000 +0200 -+++ smokegen-4.7.0/type_compiler.cpp 2011-08-02 14:34:34.000000000 +0200 -@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara - - void TypeCompiler::visitPtrOperator(PtrOperatorAST* node) - { -+ if ( ! m_session->token_stream ) return; -+ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return; - if (token_text(m_session->token_stream->kind(node->op))[0] == '*') { - QPair<bool, bool> cv = m_visitor->parseCv(node->cv); - pointerDepth.append(cv.first); diff --git a/extra/kdegraphics-okular/staging-i686/PKGBUILD b/extra/kdegraphics-okular/staging-i686/PKGBUILD deleted file mode 100644 index 8b08d240f..000000000 --- a/extra/kdegraphics-okular/staging-i686/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 144119 2011-12-04 09:06:00Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-okular -pkgver=4.7.4 -pkgrel=1 -pkgdesc='Document Viewer' -arch=('i686' 'x86_64') -url="http://kde.org/applications/graphics/okular/" -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' - 'ebook-tools' 'libspectre') -makedepends=('pkgconfig' 'cmake' 'automoc4') -optdepends=('kdegraphics-mobipocket: mobipocket support') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../okular-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install b/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install +++ /dev/null @@ -1,12 +0,0 @@ -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/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD deleted file mode 100644 index 1bfbb3a18..000000000 --- a/extra/kdelibs/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 147759 2012-01-28 10:32:04Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdelibs -pkgver=4.8.0 -pkgrel=1 -pkgdesc="KDE Core Libraries" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -depends=('strigi' 'attica' 'libxss' 'xz' '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') -makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') -replaces=('kdelibs-experimental') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'fix-knotify-filepath.patch') -sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '3312f6005aa56a9b992c74008fe5b314f1c8ffba') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - # avoid file conflict with gnome-menus - patch -p1 -i "${srcdir}"/kde-applications-menu.patch - # add Archlinux menu entry - patch -p1 -i "${srcdir}"/archlinux-menu.patch - - # https://bugs.kde.org/show_bug.cgi?id=285028 - patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ - -DKDE_DEFAULT_HOME='.kde4' \ - -DWITH_FAM=OFF - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt -} diff --git a/extra/kdelibs/archlinux-menu.patch b/extra/kdelibs/archlinux-menu.patch deleted file mode 100644 index 546784fa2..000000000 --- a/extra/kdelibs/archlinux-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 -+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 -@@ -16,11 +16,19 @@ - </DefaultLayout> - <Layout> - <Merge type="menus"/> -+ <Menuname>Arch Linux</Menuname> - <Menuname>Applications</Menuname> - <Merge type="files"/> - </Layout> - - <Menu> -+ <Name>Arch Linux</Name> -+ <Directory>Archlinux.directory</Directory> -+ <Include> -+ <Category>Archlinux</Category> -+ </Include> -+ </Menu> -+ <Menu> - <Name>Applications</Name> - <Directory>kde-unknown.directory</Directory> - <OnlyUnallocated/> diff --git a/extra/kdelibs/fix-knotify-filepath.patch b/extra/kdelibs/fix-knotify-filepath.patch deleted file mode 100644 index 2cd995e97..000000000 --- a/extra/kdelibs/fix-knotify-filepath.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp -index 88d18b6..0e76658 100644 ---- a/knotify/config/knotifyconfigactionswidget.cpp -+++ b/knotify/config/knotifyconfigactionswidget.cpp -@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay( ) - KUrl soundURL = m_ui.Sound_select->url(); - if ( soundURL.isRelative() ) - { -- QString soundString = soundURL.toLocalFile(); -+ QString soundString = m_ui.Sound_select->text(); - // we need a way to get the application name in order to ba able to do this : - /*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile); - search = KGlobal::mainComponent().dirs()->findResource("data", search); diff --git a/extra/kdelibs/kde-applications-menu.patch b/extra/kdelibs/kde-applications-menu.patch deleted file mode 100644 index 4b513298a..000000000 --- a/extra/kdelibs/kde-applications-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 -+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 -@@ -69,7 +69,7 @@ - if (WIN32) - install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) - else (WIN32) --install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) -+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) - endif (WIN32) - install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) - install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) ---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 -+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 -@@ -302,7 +302,7 @@ - if (!m_trackId.isEmpty()) - g_vfolder->setTrackId(m_trackId); - -- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); -+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); - - KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); - entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch deleted file mode 100644 index bdcd39a6c..000000000 --- a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch +++ /dev/null @@ -1,32 +0,0 @@ -From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 -From: Johannes Huber <johu@gentoo.org> -Date: Thu, 5 Jan 2012 10:06:05 +0100 -Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. - ---- - cmake/modules/FindXine.cmake | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake -index 37c58c6..d71969a 100644 ---- a/cmake/modules/FindXine.cmake -+++ b/cmake/modules/FindXine.cmake -@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine - ${PC_LIBXINE_LIBRARY_DIRS} - ) - --find_program(XINECONFIG_EXECUTABLE NAMES xine-config -+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config - HINTS - ${PC_LIBXINE_PREFIX}/bin - ) - - if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) -- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) -+ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) - if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 - set(XINE_VERSION_OK TRUE) - string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) --- -1.7.8.2 - diff --git a/extra/kdelibs/kdelibs.install b/extra/kdelibs/kdelibs.install deleted file mode 100644 index c77e68041..000000000 --- a/extra/kdelibs/kdelibs.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD deleted file mode 100644 index be1df93da..000000000 --- a/extra/kdeutils/PKGBUILD +++ /dev/null @@ -1,191 +0,0 @@ -# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeutils -pkgname=('kdeutils-ark' - 'kdeutils-filelight' - 'kdeutils-kcalc' - 'kdeutils-kcharselect' - 'kdeutils-kdf' - 'kdeutils-kfloppy' - 'kdeutils-kgpg' - 'kdeutils-kremotecontrol' - 'kdeutils-ktimer' - 'kdeutils-kwallet' - 'kdeutils-printer-applet' - 'kdeutils-superkaramba' - 'kdeutils-sweeper') -pkgver=4.7.4 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeutils') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' - 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' - 'qjson') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - - # Use Python2 - sed -i 's|/usr/bin/python|/usr/bin/python2|' \ - kcharselect/kcharselect-generate-datafile.py \ - superkaramba/examples/richtext/rtext.py - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package_kdeutils-ark() { - pkgdesc='Archiving Tool' - depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') - optdepends=('p7zip' 'zip' 'unzip' 'unrar') - url="http://kde.org/applications/utilities/ark/" - cd $srcdir/build/ark - make DESTDIR=$pkgdir install - cd $srcdir/build/ark/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-filelight() { - pkgdesc='View disk usage information' - depends=('kdebase-runtime' 'qimageblitz') - replaces=('filelight') - conflicts=('filelight') - install='kdeutils.install' - url="http://methylblue.com/filelight/" - cd $srcdir/build/filelight - make DESTDIR=$pkgdir install - cd $srcdir/build/filelight/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kcalc() { - pkgdesc='Scientific Calculator' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kcalc/" - cd $srcdir/build/kcalc - make DESTDIR=$pkgdir install - cd $srcdir/build/kcalc/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kcharselect() { - pkgdesc='Character Selector' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kcharselect/" - cd $srcdir/build/kcharselect - make DESTDIR=$pkgdir install - cd $srcdir/build/kcharselect/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kdf() { - pkgdesc='View Disk Usage' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/kdiskfree/" - install='kdeutils.install' - cd $srcdir/build/kdf - make DESTDIR=$pkgdir install - cd $srcdir/build/kdf/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kfloppy() { - pkgdesc='Floppy Formatter' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kfloppy/" - install='kdeutils.install' - cd $srcdir/build/kfloppy - make DESTDIR=$pkgdir install - cd $srcdir/build/kfloppy/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kgpg() { - pkgdesc='A GnuPG frontend' - depends=('kdepim-runtime' 'kde-agent') - url="http://kde.org/applications/utilities/kgpg" - install='kdeutils.install' - cd $srcdir/build/kgpg - make DESTDIR=$pkgdir install - cd $srcdir/build/kgpg/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kremotecontrol() { - pkgdesc='Configure your remote controls for use with applications' - replaces=('kdeutils-kdelirc') - conflicts=('kdeutils-kdelirc') - depends=('kdebase-workspace') - url="http://kde.org/applications/utilities/kremotecontrol" - install='kdeutils.install' - cd $srcdir/build/kremotecontrol - make DESTDIR=$pkgdir install - cd $srcdir/build/kremotecontrol/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-ktimer() { - pkgdesc='Countdown Launcher' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/ktimer" - install='kdeutils.install' - cd $srcdir/build/ktimer - make DESTDIR=$pkgdir install - cd $srcdir/build/ktimer/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kwallet() { - pkgdesc='Wallet Management Tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/kwalletmanager/" - install='kdeutils.install' - cd $srcdir/build/kwallet - make DESTDIR=$pkgdir install - cd $srcdir/build/kwallet/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-printer-applet() { - pkgdesc='System tray icon for managing print jobs' - depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') - url="http://kde.org/applications/system/printerapplet/" - cd $srcdir/build/printer-applet - make DESTDIR=$pkgdir install - cd $srcdir/build/printer-applet/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-superkaramba() { - pkgdesc='An engine for cool desktop eyecandy' - depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz') - url="http://kde.org/applications/utilities/superkaramba" - install='kdeutils.install' - cd $srcdir/build/superkaramba - make DESTDIR=$pkgdir install -} - -package_kdeutils-sweeper() { - pkgdesc='System Cleaner' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/sweeper/" - cd $srcdir/build/sweeper - make DESTDIR=$pkgdir install - cd $srcdir/build/sweeper/doc - make DESTDIR=$pkgdir install -} diff --git a/extra/kdeutils/kdeutils.install b/extra/kdeutils/kdeutils.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdeutils/kdeutils.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kmod/PKGBUILD b/extra/kmod/PKGBUILD deleted file mode 100644 index 3b17c9f26..000000000 --- a/extra/kmod/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 145285 2011-12-21 02:42:53Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgname=kmod -pkgver=2 -pkgrel=2 -pkgdesc="A set of tools to handle common tasks with Linux kernel modules" -arch=('i686' 'x86_64') -url="http://git.profusion.mobi/cgit.cgi/kmod.git" -license=('GPL2') -depends=('glibc' 'zlib') -options=('!libtool') -source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz") -md5sums=('6017364434377f6724f749d7a28c5d7a') - -build() { - cd "$pkgname-$pkgver" - - ./configure --enable-zlib - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install -} - -# vim: ft=sh syn=sh et diff --git a/extra/libassuan/PKGBUILD b/extra/libassuan/PKGBUILD deleted file mode 100644 index ce2ce2fe0..000000000 --- a/extra/libassuan/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 146533 2012-01-12 16:36:58Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=libassuan -pkgver=2.0.3 -pkgrel=1 -pkgdesc="A IPC library used by some GnuPG related software" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnupg.org/related_software/libassuan" -depends=('libgpg-error') -options=('!libtool') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) -install=libassuan.install - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} -md5sums=('179d1918325fdb928c7bd90b8a514fc7') diff --git a/extra/libassuan/libassuan.install b/extra/libassuan/libassuan.install deleted file mode 100644 index 07e2672db..000000000 --- a/extra/libassuan/libassuan.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(assuan.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/extra/libksba/PKGBUILD b/extra/libksba/PKGBUILD deleted file mode 100644 index 51f23e123..000000000 --- a/extra/libksba/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 134460 2011-08-04 06:38:08Z tpowa $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=libksba -pkgver=1.2.0 -pkgrel=1 -pkgdesc="A CMS and X.509 access library" -arch=(i686 x86_64) -license=('GPL') -url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba" -depends=('bash' 'libgpg-error' 'glibc') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) -options=(!libtool) -install=libksba.install - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$startdir/pkg install -} -md5sums=('e797f370b69b4dc776499d6a071ae137') diff --git a/extra/libksba/libksba.install b/extra/libksba/libksba.install deleted file mode 100644 index 3715b8960..000000000 --- a/extra/libksba/libksba.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(ksba.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/extra/libreoffice/PKGBUILD.next_stable34 b/extra/libreoffice/PKGBUILD.next_stable34 deleted file mode 100644 index 5b9dec2ab..000000000 --- a/extra/libreoffice/PKGBUILD.next_stable34 +++ /dev/null @@ -1,925 +0,0 @@ -# $Id: PKGBUILD 145674 2011-12-26 20:12:16Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('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-extension-barcode' # - 'libreoffice-extension-diagram' - 'libreoffice-extension-google-docs' - 'libreoffice-extension-hunart' - #'libreoffice-extension-lightproof' # no source integration - #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity - 'libreoffice-extension-nlpsolver' - 'libreoffice-extension-ct2n' - 'libreoffice-extension-numbertext' - 'libreoffice-extension-oooblogger' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-extension-scripting-beanshell' - 'libreoffice-extension-scripting-javascript' - 'libreoffice-extension-scripting-python' - 'libreoffice-extension-typo' - 'libreoffice-extension-validator' - 'libreoffice-extension-watch-window' - 'libreoffice-extension-wiki-publisher') -_LOver=3.4.5.2 -pkgver=3.4.5rc2 # last expected release candidate (should become final ) - Release 3.4.5 Week 2 , Jan 9 - Jan 15, 2012 -pkgrel=1 -arch=('i686' 'x86_64') -#_LO_tree="3.4" -_OFFICEUPD="340" -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' - 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' - #'saxon' - currently broken - # the depends from libreoffice main pkg - "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script - 'ttf-dejavu') # to satisfy regression tests - -# http://download.documentfoundation.org/mirrors/all.html -# http://wiki.documentfoundation.org/Mirrors - -#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src" -_additional_source_url="http://hg.services.openoffice.org/binaries" -_additional_source_url="http://dev-www.libreoffice.org/src" -source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - buildfix_boost.diff - buildfix_ct2n.diff - vbahelper.visibility.patch - scp2-more-reasonable-file-access-rights.diff - #oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 - #RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7 - gcc462_buildfix.diff) -noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - 41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) -md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81' - 'c1e2dabdf4cfcd5957779014a7f9787e' - '79c9c7fc208e7f56af09f284f261a7da' - 'c83a8a374d3d5cc83c6ac3b5ff613e46' - 'fa64799ebad8cbd2c160ac2f87bd5599' - 'b24fba57aa4185934e86a0a8db4a3433' - '4f98020088ab9b597fc21b617121bd47' - '3c3be7c5f923339c90b0d1d6ecad0243' - '3a0bb4bb096b7488533ed2ee466a2bc9' - 'f2b180aa1eff3884b4ca81c048f1e327' - 'a9af488ef92ad4442eafba874249c529' - 'db6a67c96a9090bc5e21b64e202a984e' - 'e00187ae0840e1f6a00fa3290cacf0d1' - '20fbf6cffd2b06e90a52105b75a57828' - '4af055f590732ec19a2534b2278ac49c' - 'c84693796d2b1d9c8269425b1fa53aef' - 'd4926dc27b6884656feec6753f4fdf22' - '770678ca19cca0f7985c1c82b2dccf48' - '97a1e3de430b124faf35bf334248ad53' - 'f02578f5218f217a9f20e9c30e119c6a' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '18f577b374d60b3c760a3a3350407632' - '0ff7d225d087793c8c2c680d77aac3e7' - '185d60944ea767075d27247c3162b3bc' - '90401bca927835b6fbae4a707ed187c8' - '451ccf439a36a568653b024534669971' - '7e7efc5d4a03126bb9ae3ae9aa2c4e87' - '41c9b65ad60af4b3255bbecdfef11736' - 'bbdd5639ada63e3130761daaecae1a10' - '23bd75552206dfcd8fd4e29137dcac84' - 'b8cbca7b3363e6ca2d02bc0ba2b63904' - 'b632bdd25649cc4067bcb410bae23d2b' - '9d60b6cfa3ef1926848710bbcd11115b' - 'dbaafd21de055e582d92d7d32fe9da13' - 'b7b2d0e04e142f26dd96119c80757d1f' - 'bc228237108cab7745897a9f466b6d39' - 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d' - '37638431e7e40baf2e47966ebb9bc0e9' - '10600d04ee81014bc9b5cc04e615d799') - -build() { - - unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - # move all LibO sources into one build directory - mkdir ${srcdir}/build && cd ${srcdir}/build - for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations - mv ${srcdir}/$i/* . - done -# mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* . -# ./bin/unpack-sources ${srcdir}/build - - # move external sources into place - mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - - cd ${srcdir}/build - - # buildfixes & bugfixes - #patch -Np1 -i ${srcdir}/buildfix_boost.diff - patch -Np1 -i ${srcdir}/buildfix_ct2n.diff - patch -Np0 -i ${srcdir}/vbahelper.visibility.patch - patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff - #patch -Np1 -i ${srcdir}/oracle-recognition.diff - #patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff - # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139 -# patch -Np1 -i ${srcdir}/gcc462_buildfix.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - - #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" - done - - # python2 fix - export PYTHON=python2 - - # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options - -# if [ "$CARCH" = "x86_64" ]; then -# EXTRAOPTS="--without-stlport" -# else -# EXTRAOPTS="--with-stlport" # --without-system-boost" -# # # avoid problems with ixion for now -# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 -# fi - - # needed for 0003-distro-install-fix-en-US-only-installation.patch - autoconf -f - - # non-SMP test build -# export MAKEFLAGS="-j1" - ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - --with-unix-wrapper="libreoffice" \ - --enable-split-app-modules \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ - --with-lang="" \ - --enable-cairo\ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-ldap \ - --enable-lockdown\ - --enable-opengl \ - --enable-odk\ - --enable-ext-barcode \ - --enable-ext-diagram \ - --enable-ext-google-docs \ - --enable-ext-hunart \ - --disable-ext-lightproof \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-ext-nlpsolver \ - --enable-ext-ct2n \ - --enable-ext-numbertext \ - --enable-ext-oooblogger \ - --enable-ext-pdfimport \ - --enable-ext-presenter-console \ - --enable-ext-presenter-minimizer \ - --enable-ext-report-builder \ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --enable-ext-scripting-python \ - --enable-ext-typo \ - --enable-ext-validator \ - --enable-ext-watch-window \ - --enable-ext-wiki-publisher \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-mdds\ - --without-myspell-dicts \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --with-system-libtextcat \ - --with-external-libtextcat-data \ - --with-openldap\ - --with-ant-home="/usr/share/java/apache-ant"\ - --without-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mozilla\ - --with-system-mythes\ - --with-system-xrender-headers\ - --with-system-headers\ - --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ - --with-java-target-version=1.5 \ - $EXTRAOPTS || return 1 - -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - -#--with-servlet-api-jar=JARFILE -# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 -# --with-system-saxon\ -# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ - - touch src.downloaded - #./download - unset MAKEFLAGS - ./bootstrap - make - - # fake installation to create split file lists - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-common() { - - pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" - install=${pkgbase}.install - depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" - 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script - #'java-runtime' - #'saxon' - optdepends=('libreoffice-langpack: additional language support' - 'java-runtime: adds java support' - 'libcups: adds printing support' - 'gconf: adds additional gnome support' - 'nss: adds support for signed files/macros' - 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'poppler: for shipped pdfimport extension' - 'libmythes: for use in thesaurus' - 'hsqldb-java: default database format for OpenOffice.org' - 'beanshell: 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' - 'libldap: to get profiles via ldap' - 'lucene: full-text search engine library for Java needed in the help section' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) - groups=('libreoffice') - provides=('go-openoffice') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # # remove version in menu entry and make it visible -# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop -# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop - - # 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/basis3.4/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} . - cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - #fix http://bugs.archlinux.org/task/17656 - find ${pkgdir} -perm 444 -exec ls -lh {} \; - find ${pkgdir} -perm 444 -exec chmod 644 {} \; - find ${pkgdir} -perm 555 -exec ls -lh {} \; - find ${pkgdir} -perm 555 -exec chmod 755 {} \; -} - -package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-calc() { - pkgdesc="Spreadsheet application for LibreOffice." - depends=('libreoffice-common' 'lpsolve' ) - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-draw() { - pkgdesc="Drawing Application for LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-gnome() { - pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'dbus-glib') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-impress() { - pkgdesc="Presentation Application for LibreOffice." - depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-kde4() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-sdk() { - pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # fix ArchLinux LibreOffice installation paths - sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ - -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ - -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ - -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ - -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ - -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ - -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ - -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ - -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in -} - -package_libreoffice-sdk-doc() { - pkgdesc="Software Development Kit documentation for LibreOffice" - depends=('libreoffice-common' 'libreoffice-sdk') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - #fix permissions - find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \; -} - -package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." - depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') - optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-en-US() { - pkgdesc="English (US) language pack for LibreOffice" - #arch=('any') - provides=('openoffice-en-US' 'libreoffice-langpack') - replaces=(openoffice-en-US) - conflicts=(openoffice-en-US) - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-extension-barcode() { - - pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode - chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode -} - -package_libreoffice-extension-diagram() { - - pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram -} - -package_libreoffice-extension-google-docs() { - - pkgdesc="Google Documents extension for LibreOffice" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs -} - -package_libreoffice-extension-hunart() { - - pkgdesc="Hungarian cross-reference toolbar extension" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart -} - -#package_libreoffice-extension-lightproof() { - -# pkgdesc="Lightproof extension for LibreOffice" - #arch=('any') -# depends=('libreoffice-common') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof -#} - -#package_libreoffice-extension-mysql-connector() { - -# pkgdesc="MySQL Connector extension for LibreOffice" - #arch=('any') -# depends=('libreoffice-common') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector -#} - -package_libreoffice-extension-nlpsolver() { - - pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} - -package_libreoffice-extension-ct2n() { - - pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n -} - -package_libreoffice-extension-numbertext() { - - pkgdesc="NUMBERTEXT/MONEYTEXT extensions" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext -} - -package_libreoffice-extension-oooblogger() { - - pkgdesc="An extensions for blogging" - #arch=('any') - depends=('libreoffice-common' 'coreutils' 'python') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger -} - -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - -package_libreoffice-extension-presentation-minimizer() { - - pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice-common' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer -} - -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-extension-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell -} - -package_libreoffice-extension-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - -package_libreoffice-extension-typo() { - - pkgdesc="Typography toolbar extension" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo - find ${pkgdir} -type d -exec chmod 755 {} \; - #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo -} - -package_libreoffice-extension-validator() { - - pkgdesc="Validator extension for LibreOffice" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator -} - -package_libreoffice-extension-wiki-publisher() { - - pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -package_libreoffice-extension-watch-window() { - - pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window -} diff --git a/extra/mail-notification/gmime-2.4.patch b/extra/mail-notification/gmime-2.4.patch deleted file mode 100644 index 0d16357fb..000000000 --- a/extra/mail-notification/gmime-2.4.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c ---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 -+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:28.000000000 +0300 -@@ -265,7 +265,7 @@ - mime_message = g_mime_parser_construct_message(parser); - if (mime_message) - { -- if (g_mime_message_get_header(mime_message, "X-Mozilla-Status")) -+ if (g_mime_object_get_header(mime_message, "X-Mozilla-Status")) - { - #if WITH_MOZILLA - type = MN_TYPE_MOZILLA_MAILBOX_BACKEND; -diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c ---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 -+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:46:47.000000000 +0300 -@@ -167,7 +167,7 @@ - - const char *header; - -- header = g_mime_message_get_header(mime_message, header_name); -+ header = g_mime_object_get_header(mime_message, header_name); - if (header && mn_str_ishex(header)) - return strtol(header, NULL, 16); - else -diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c ---- mail-notification-5.4/jbsrc/jb.c 2008-05-22 19:47:04.000000000 +0400 -+++ mail-notification-5.4-OK/jbsrc/jb.c 2008-12-23 14:43:09.000000000 +0300 -@@ -166,7 +166,7 @@ - jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1"); - jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); - -- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7", -+ jb_check_packages_for_options("GMime", "gmime", "gmime-2.4", - "hotmail", - "imap", - "maildir", -diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c ---- mail-notification-5.4/src/mn-message-mime.c 2008-05-22 19:45:35.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-message-mime.c 2008-12-23 14:46:35.000000000 +0300 -@@ -33,12 +33,12 @@ - g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE); - - /* SpamAssassin */ -- spam = g_mime_message_get_header(mime_message, "X-Spam-Status"); -+ spam = g_mime_object_get_header(mime_message, "X-Spam-Status"); - if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) - return TRUE; - - /* bogofilter */ -- spam = g_mime_message_get_header(mime_message, "X-Bogosity"); -+ spam = g_mime_object_get_header(mime_message, "X-Bogosity"); - if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) - return TRUE; - -@@ -89,7 +89,7 @@ - { - const char *status; - -- status = g_mime_message_get_header(mime_message, "Status"); -+ status = g_mime_object_get_header(mime_message, "Status"); - if (status && strchr(status, 'R')) - return NULL; /* the message was read */ - else if (status && strchr(status, 'O')) diff --git a/extra/orage/fix-infinite-reminder.patch b/extra/orage/fix-infinite-reminder.patch deleted file mode 100644 index 1dedbe902..000000000 --- a/extra/orage/fix-infinite-reminder.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 52a58e63cb039338d3365c83cb13e20acefba083 Mon Sep 17 00:00:00 2001 -From: Juha Kautto <juha@xfce.org> -Date: Wed, 01 Jun 2011 12:26:22 +0000 -Subject: fixed Bug 7552 - Orage reminder duplicates infinitely - -When using default timezone floating, reminders repeated and never ended. -Fixed this and prevented using floating as the default value. Using UTC -instead. -diff --git a/src/ical-code.c b/src/ical-code.c -index c080bf2..e726103 100644 ---- a/src/ical-code.c -+++ b/src/ical-code.c -@@ -233,7 +233,7 @@ gboolean xfical_set_local_timezone(gboolean testing) - } - - /* -- * Basically standard says that timezone should be added alwasy -+ * Basically standard says that timezone should be added always - * when it is used, but in real life these are not needed since - * all systems have their own timezone data, so let's save time - * and space and comment this out. -@@ -2587,7 +2587,7 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c - rel = icalparameter_get_related(trg_related_par); - else - rel = ICAL_RELATED_START; -- per = ic_get_period(c, FALSE); -+ per = ic_get_period(c, TRUE); - next_alarm_time = count_alarm_time(per, cur_time, trg.duration, rel); - alarm_start_diff = icaltime_subtract(per.stime, next_alarm_time); - /* we only have ctime for TODOs and only if todo has been completed. -diff --git a/src/parameters.c b/src/parameters.c -index 38407da..462fce2 100644 ---- a/src/parameters.c -+++ b/src/parameters.c -@@ -440,7 +440,7 @@ static void timezone_button_clicked(GtkButton *button, gpointer user_data) - - if (!ORAGE_STR_EXISTS(g_par.local_timezone)) { - g_warning("timezone pressed: local timezone missing"); -- g_par.local_timezone = g_strdup("floating"); -+ g_par.local_timezone = g_strdup("UTC"); - } - if (orage_timezone_button_clicked(button, GTK_WINDOW(itf->orage_dialog) - , &g_par.local_timezone, TRUE, g_par.local_timezone)) -@@ -501,16 +501,12 @@ static void create_parameter_dialog_main_setup_tab(Itf *dialog) - , dialog->timezone_frame, FALSE, FALSE, 5); - - dialog->timezone_button = gtk_button_new(); -- if (g_par.local_timezone) { -- gtk_button_set_label(GTK_BUTTON(dialog->timezone_button) -- , _(g_par.local_timezone)); -- } -- else { /* we should never arrive here */ -- g_warning("parameters: timezone not set."); -- g_par.local_timezone = g_strdup("floating"); -- gtk_button_set_label(GTK_BUTTON(dialog->timezone_button) -- , _("floating")); -+ if (!ORAGE_STR_EXISTS(g_par.local_timezone)) { -+ g_warning("parameters: local timezone missing"); -+ g_par.local_timezone = g_strdup("UTC"); - } -+ gtk_button_set_label(GTK_BUTTON(dialog->timezone_button) -+ , _(g_par.local_timezone)); - gtk_box_pack_start(GTK_BOX(vbox) - , dialog->timezone_button, FALSE, FALSE, 5); - gtk_tooltips_set_tip(dialog->Tooltips, dialog->timezone_button -@@ -1117,7 +1113,7 @@ static void init_default_timezone(void) - if (ORAGE_STR_EXISTS(g_par.local_timezone)) - g_message(_("Default timezone set to %s."), g_par.local_timezone); - else { -- g_par.local_timezone = g_strdup("floating"); -+ g_par.local_timezone = g_strdup("UTC"); - g_message(_("Default timezone not found, please, set it manually.")); - } - } -diff --git a/src/timezone_selection.c b/src/timezone_selection.c -index 1bcb5be..518b83d 100644 ---- a/src/timezone_selection.c -+++ b/src/timezone_selection.c -@@ -307,16 +307,31 @@ gboolean orage_timezone_button_clicked(GtkButton *button, GtkWindow *parent - tree = tz_button_create_view(details, store); - - /* show it */ -- if (check_ical) -- window = gtk_dialog_new_with_buttons(_("Pick timezone") -- , parent -- , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT -- , _("Change mode"), 1 -- , _("UTC"), 2 -- , _("floating"), 3 -- , _(local_tz), 4 -- , GTK_STOCK_OK, GTK_RESPONSE_ACCEPT -- , NULL); -+ if (check_ical) { -+ if (local_tz == *tz) -+ /* We are actually setting the g_par parameter. In other words -+ we are setting the global default timezone for Orage. This is -+ done very seldom and we do not want to allow "floating" here. -+ This test is ugly, but it is not worth an extra parameter. */ -+ window = gtk_dialog_new_with_buttons(_("Pick timezone") -+ , parent -+ , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT -+ , _("Change mode"), 1 -+ , _("UTC"), 2 -+ , _(local_tz), 4 -+ , GTK_STOCK_OK, GTK_RESPONSE_ACCEPT -+ , NULL); -+ else /* this is normal appointment */ -+ window = gtk_dialog_new_with_buttons(_("Pick timezone") -+ , parent -+ , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT -+ , _("Change mode"), 1 -+ , _("UTC"), 2 -+ , _("floating"), 3 -+ , _(local_tz), 4 -+ , GTK_STOCK_OK, GTK_RESPONSE_ACCEPT -+ , NULL); -+ } - else - window = gtk_dialog_new_with_buttons(_("Pick timezone") - , parent --- -cgit diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD deleted file mode 100644 index a2d4acf03..000000000 --- a/extra/oxygen-gtk/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 145044 2011-12-15 21:12:30Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: birdflesh <antkoul at gmail dot com> - -pkgname=oxygen-gtk -pkgver=1.1.6 -pkgrel=1 -pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK" -arch=('i686' 'x86_64') -url="http://kde-look.org/content/show.php/?content=136216" -license=('LGPL') -depends=('gtk2') -makedepends=('cmake') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('714cd895e276cfd20a43b406a78ae6af') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD deleted file mode 100644 index 6aecd3c33..000000000 --- a/extra/pinentry/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 136330 2011-08-26 13:04:19Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=pinentry -pkgver=0.8.1 -pkgrel=3 -pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnupg.org/aegypten2" -depends=('ncurses' 'libcap>=2.16') -makedepends=('gtk2' 'qt') -optdepends=('gtk2: for gtk2 backend' - 'qt: for qt4 backend') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz - gtk2-pinentry-segfault.patch) -install=pinentry.install - -build() { - cd $startdir/src/$pkgname-$pkgver - for file in qt4/*.moc; do - /usr/bin/moc ${file/.moc/.h} > ${file} - done - ./configure --prefix=/usr \ - --enable-pinentry-curses \ - --disable-pinentry-gtk \ - --disable-pinentry-qt \ - --enable-pinentry-gtk2 \ - --enable-pinentry-qt4 \ - --enable-fallback-curses - make - make DESTDIR=${pkgdir} install - #rm ${pkgdir}/usr/share/info/dir - #rm ${pkgdir}/usr/bin/pinentry - #ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry -} -md5sums=('81f99904daee5331eb6738408bb024b6' - 'bd9888fafc56464b2c4deaad5b8edb07') diff --git a/extra/pinentry/gtk2-pinentry-segfault.patch b/extra/pinentry/gtk2-pinentry-segfault.patch deleted file mode 100644 index c0b9fb4ca..000000000 --- a/extra/pinentry/gtk2-pinentry-segfault.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2/pinentry-gtk-2.c.orig 2010-03-03 05:19:55.000000000 -0600 -+++ gtk+-2/pinentry-gtk-2.c 2010-07-07 00:11:30.413572124 -0500 -@@ -145,7 +145,7 @@ - { - gdk_keyboard_ungrab (gdk_event_get_time (event)); - /* Unmake window transient for the root window. */ -- gdk_window_set_transient_for (win->window, NULL); -+ gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR")); - } - - diff --git a/extra/pinentry/pinentry.install b/extra/pinentry/pinentry.install deleted file mode 100644 index eed2c7124..000000000 --- a/extra/pinentry/pinentry.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(pinentry.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/extra/pth/PKGBUILD b/extra/pth/PKGBUILD deleted file mode 100644 index 7e2e6e5ee..000000000 --- a/extra/pth/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 140804 2011-10-19 15:35:55Z dreisner $ -# Maintainer: damir <damir@archlinux.org> - -pkgname=pth -pkgver=2.0.7 -pkgrel=4 -pkgdesc="The GNU Portable Threads." -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/pth/" -license=('LGPL') -depends=('glibc' 'awk') -options=('!libtool' '!makeflags') -source=(ftp://ftp.gnu.org/gnu/pth/$pkgname-$pkgver.tar.gz{,.sig}) -sha1sums=('9a71915c89ff2414de69fe104ae1016d513afeee' - '8cb16dffbf15ba92bda8d08918eaf5995642fc38') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --disable-static \ - --enable-shared \ - --with-pic - - sed -i "s|awk=''|awk=/bin/awk|g" shtool # "Cannot find a reasonable Awk" - - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR=${pkgdir} install -} diff --git a/extra/smplayer-themes/ChangeLog b/extra/smplayer-themes/ChangeLog deleted file mode 100644 index 3b8e487e1..000000000 --- a/extra/smplayer-themes/ChangeLog +++ /dev/null @@ -1,56 +0,0 @@ -2010-01-14 Ionut Biru <ionut@archlinux.ro> - * smplayer-themes 0.1.20-1 - * Upstream update - -2009-03-13 Allan McRae <allan@archlinux.org> - * smplayer-themes 0.1.19-1 - * Upstream update - -2008-12-20 Allan McRae <allan@archlinux.org> - * smplayer-themes 0.1.18-1 - * Upstream update - -2008-09-27 Allan McRae <allan@archlinux.org> - * smplayer-themes 0.1.17-1 - * Upstream update - -2008-06-22 Allan McRae <allan@archlinux.org> - - * smplayer-themes 0.1.16-1 - * Upstream update - -2008-05-23 Eric Belanger <eric@archlinux.org> - - * smplayer-themes 0.1.15-1 - * Upstream update - -2008-01-24 Varun Acharya <varun@archlinux.org> - - * smplayer-themes-0.1.14-1 moved to extra - -2007-11-27 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * smplayer-themes-0.1.14-1 - * version bump - -2007-10-24 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * smplayer-themes-0.1.13-1 - * version bump - -2007-09-02 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * smplayer-themes-0.1.7-1 - * version bump - -2007-07-12 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - * smplayer-themes-0.1.3-1 - * version bump - -2007-06-18 Eric Belanger (Snowman) <eric@archlinux.org> - * smplayer-themes-0.1.1-1 - * fixed minor permission issue - -2007-05-30 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - * smplayer-themes-0.1.1-1 - * version bump diff --git a/extra/smplayer-themes/PKGBUILD b/extra/smplayer-themes/PKGBUILD deleted file mode 100644 index 5f7be24bb..000000000 --- a/extra/smplayer-themes/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 63102 2010-01-14 17:20:39Z ibiru $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> - -pkgname=smplayer-themes -pkgver=0.1.20 -pkgrel=1 -pkgdesc="Themes for smplayer" -arch=('i686' 'x86_64') -url="http://smplayer.sourceforge.net/" -license=('GPL') -depends=('smplayer') -source=(http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-themes-$pkgver.tar.bz2) -md5sums=('384108911caded86306ddfdc047870ef') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - make PREFIX=${pkgdir}/usr CONF_PREFIX= || return 1 - make PREFIX=${pkgdir}/usr install -} diff --git a/extra/subversion/svnmerge.py b/extra/subversion/svnmerge.py deleted file mode 100644 index d8931648f..000000000 --- a/extra/subversion/svnmerge.py +++ /dev/null @@ -1,2370 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- -# Copyright (c) 2005, Giovanni Bajo -# Copyright (c) 2004-2005, Awarix, Inc. -# All rights reserved. -# -# 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 -# -# Author: Archie Cobbs <archie at awarix dot com> -# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> -# -# Acknowledgments: -# John Belmonte <john at neggie dot net> - metadata and usability -# improvements -# Blair Zajac <blair at orcaware dot com> - random improvements -# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive -# merging support -# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple -# location identifier formats -# -# $HeadURL$ -# $LastChangedDate$ -# $LastChangedBy$ -# $LastChangedRevision$ -# -# Requisites: -# svnmerge.py has been tested with all SVN major versions since 1.1 (both -# client and server). It is unknown if it works with previous versions. -# -# Differences from svnmerge.sh: -# - More portable: tested as working in FreeBSD and OS/2. -# - Add double-verbose mode, which shows every svn command executed (-v -v). -# - "svnmerge avail" now only shows commits in source, not also commits in -# other parts of the repository. -# - Add "svnmerge block" to flag some revisions as blocked, so that -# they will not show up anymore in the available list. Added also -# the complementary "svnmerge unblock". -# - "svnmerge avail" has grown two new options: -# -B to display a list of the blocked revisions -# -A to display both the blocked and the available revisions. -# - Improved generated commit message to make it machine parsable even when -# merging commits which are themselves merges. -# - Add --force option to skip working copy check -# - Add --record-only option to "svnmerge merge" to avoid performing -# an actual merge, yet record that a merge happened. -# - Can use a variety of location-identifier formats -# -# TODO: -# - Add "svnmerge avail -R": show logs in reverse order -# -# Information for Hackers: -# -# Identifiers for branches: -# A branch is identified in three ways within this source: -# - as a working copy (variable name usually includes 'dir') -# - as a fully qualified URL -# - as a path identifier (an opaque string indicating a particular path -# in a particular repository; variable name includes 'pathid') -# A "target" is generally user-specified, and may be a working copy or -# a URL. - -import sys, os, getopt, re, types, tempfile, time, locale -from bisect import bisect -from xml.dom import pulldom - -NAME = "svnmerge" -if not hasattr(sys, "version_info") or sys.version_info < (2, 0): - error("requires Python 2.0 or newer") - -# Set up the separator used to separate individual log messages from -# each revision merged into the target location. Also, create a -# regular expression that will find this same separator in already -# committed log messages, so that the separator used for this run of -# svnmerge.py will have one more LOG_SEPARATOR appended to the longest -# separator found in all the commits. -LOG_SEPARATOR = 8 * '.' -LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), - re.MULTILINE) - -# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. -LOG_LINE_PREFIX = 2 * ' ' - -# Set python to the default locale as per environment settings, same as svn -# TODO we should really parse config and if log-encoding is specified, set -# the locale to match that encoding -locale.setlocale(locale.LC_ALL, '') - -# We want the svn output (such as svn info) to be non-localized -# Using LC_MESSAGES should not affect localized output of svn log, for example -if os.environ.has_key("LC_ALL"): - del os.environ["LC_ALL"] -os.environ["LC_MESSAGES"] = "C" - -############################################################################### -# Support for older Python versions -############################################################################### - -# True/False constants are Python 2.2+ -try: - True, False -except NameError: - True, False = 1, 0 - -def lstrip(s, ch): - """Replacement for str.lstrip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - i = 0 - try: - while s[i] == ch: - i = i+1 - return s[i:] - except IndexError: - return "" - -def rstrip(s, ch): - """Replacement for str.rstrip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - try: - if s[-1] != ch: - return s - i = -2 - while s[i] == ch: - i = i-1 - return s[:i+1] - except IndexError: - return "" - -def strip(s, ch): - """Replacement for str.strip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - return lstrip(rstrip(s, ch), ch) - -def rsplit(s, sep, maxsplits=0): - """Like str.rsplit, which is Python 2.4+ only.""" - L = s.split(sep) - if not 0 < maxsplits <= len(L): - return L - return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] - -############################################################################### - -def kwextract(s): - """Extract info from a svn keyword string.""" - try: - return strip(s, "$").strip().split(": ")[1] - except IndexError: - return "<unknown>" - -__revision__ = kwextract('$Rev$') -__date__ = kwextract('$Date$') - -# Additional options, not (yet?) mapped to command line flags -default_opts = { - "svn": "svn", - "prop": NAME + "-integrated", - "block-prop": NAME + "-blocked", - "commit-verbose": True, - "verbose": 0, -} -logs = {} - -def console_width(): - """Get the width of the console screen (if any).""" - try: - return int(os.environ["COLUMNS"]) - except (KeyError, ValueError): - pass - - try: - # Call the Windows API (requires ctypes library) - from ctypes import windll, create_string_buffer - h = windll.kernel32.GetStdHandle(-11) - csbi = create_string_buffer(22) - res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) - if res: - import struct - (bufx, bufy, - curx, cury, wattr, - left, top, right, bottom, - maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) - return right - left + 1 - except ImportError: - pass - - # Parse the output of stty -a - if os.isatty(1): - out = os.popen("stty -a").read() - m = re.search(r"columns (\d+);", out) - if m: - return int(m.group(1)) - - # sensible default - return 80 - -def error(s): - """Subroutine to output an error and bail.""" - print >> sys.stderr, "%s: %s" % (NAME, s) - sys.exit(1) - -def report(s): - """Subroutine to output progress message, unless in quiet mode.""" - if opts["verbose"]: - print "%s: %s" % (NAME, s) - -def prefix_lines(prefix, lines): - """Given a string representing one or more lines of text, insert the - specified prefix at the beginning of each line, and return the result. - The input must be terminated by a newline.""" - assert lines[-1] == "\n" - return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" - -def recode_stdout_to_file(s): - if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ - or sys.stdout.encoding is None: - return s - u = s.decode(sys.stdout.encoding) - return u.encode(locale.getdefaultlocale()[1]) - -class LaunchError(Exception): - """Signal a failure in execution of an external command. Parameters are the - exit code of the process, the original command line, and the output of the - command.""" - -try: - """Launch a sub-process. Return its output (both stdout and stderr), - optionally split by lines (if split_lines is True). Raise a LaunchError - exception if the exit code of the process is non-zero (failure). - - This function has two implementations, one based on subprocess (preferred), - and one based on popen (for compatibility). - """ - import subprocess - import shlex - - def launch(cmd, split_lines=True): - # Requiring python 2.4 or higher, on some platforms we get - # much faster performance from the subprocess module (where python - # doesn't try to close an exhorbitant number of file descriptors) - stdout = "" - stderr = "" - try: - if os.name == 'nt': - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ - close_fds=False, stderr=subprocess.PIPE) - else: - # Use shlex to break up the parameters intelligently, - # respecting quotes. shlex can't handle unicode. - args = shlex.split(cmd.encode('ascii')) - p = subprocess.Popen(args, stdout=subprocess.PIPE, \ - close_fds=False, stderr=subprocess.PIPE) - stdoutAndErr = p.communicate() - stdout = stdoutAndErr[0] - stderr = stdoutAndErr[1] - except OSError, inst: - # Using 1 as failure code; should get actual number somehow? For - # examples see svnmerge_test.py's TestCase_launch.test_failure and - # TestCase_launch.test_failurecode. - raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) - - if p.returncode == 0: - if split_lines: - # Setting keepends=True for compatibility with previous logic - # (where file.readlines() preserves newlines) - return stdout.splitlines(True) - else: - return stdout - else: - raise LaunchError(p.returncode, cmd, stdout + stderr) -except ImportError: - # support versions of python before 2.4 (slower on some systems) - def launch(cmd, split_lines=True): - if os.name not in ['nt', 'os2']: - import popen2 - p = popen2.Popen4(cmd) - p.tochild.close() - if split_lines: - out = p.fromchild.readlines() - else: - out = p.fromchild.read() - ret = p.wait() - if ret == 0: - ret = None - else: - ret >>= 8 - else: - i,k = os.popen4(cmd) - i.close() - if split_lines: - out = k.readlines() - else: - out = k.read() - ret = k.close() - - if ret is None: - return out - raise LaunchError(ret, cmd, out) - -def launchsvn(s, show=False, pretend=False, **kwargs): - """Launch SVN and grab its output.""" - username = password = configdir = "" - if opts.get("username", None): - username = "--username=" + opts["username"] - if opts.get("password", None): - password = "--password=" + opts["password"] - if opts.get("config-dir", None): - configdir = "--config-dir=" + opts["config-dir"] - cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", - username, password, configdir, s])) - if show or opts["verbose"] >= 2: - print cmd - if pretend: - return None - return launch(cmd, **kwargs) - -def svn_command(s): - """Do (or pretend to do) an SVN command.""" - out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], - pretend=opts["dry-run"], - split_lines=False) - if not opts["dry-run"]: - print out - -def check_dir_clean(dir): - """Check the current status of dir for local mods.""" - if opts["force"]: - report('skipping status check because of --force') - return - report('checking status of "%s"' % dir) - - # Checking with -q does not show unversioned files or external - # directories. Though it displays a debug message for external - # directories, after a blank line. So, practically, the first line - # matters: if it's non-empty there is a modification. - out = launchsvn("status -q %s" % dir) - if out and out[0].strip(): - error('"%s" has local modifications; it must be clean' % dir) - -class PathIdentifier: - """Abstraction for a path identifier, so that we can start talking - about it before we know the form that it takes in the properties (its - external_form). Objects are referenced in the class variable 'locobjs', - keyed by all known forms.""" - - # a map of UUID (or None) to repository root URL. - repo_hints = {} - - # a map from any known string form to the corresponding PathIdentifier - locobjs = {} - - def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): - self.repo_relative_path = repo_relative_path - self.uuid = uuid - self.url = url - self.external_form = external_form - - def __repr__(self): - return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' - - def __str__(self): - """Return a printable string representation""" - if self.external_form: - return self.external_form - if self.url: - return self.format('url') - if self.uuid: - return self.format('uuid') - return self.format('path') - - def from_pathid(pathid_str): - """convert pathid_str to a PathIdentifier""" - if not PathIdentifier.locobjs.has_key(pathid_str): - if is_url(pathid_str): - # we can determine every form; PathIdentifier.hint knows how to do that - PathIdentifier.hint(pathid_str) - elif pathid_str[:7] == 'uuid://': - mo = re.match('uuid://([^/]*)(.*)', pathid_str) - if not mo: - error("Invalid path identifier '%s'" % pathid_str) - uuid, repo_relative_path = mo.groups() - pathid = PathIdentifier(repo_relative_path, uuid=uuid) - # we can cache this by uuid:// pathid and by repo-relative path - PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid - elif pathid_str and pathid_str[0] == '/': - # strip any trailing slashes - pathid_str = pathid_str.rstrip('/') - pathid = PathIdentifier(repo_relative_path=pathid_str) - # we can only cache this by repo-relative path - PathIdentifier.locobjs[pathid_str] = pathid - else: - error("Invalid path identifier '%s'" % pathid_str) - return PathIdentifier.locobjs[pathid_str] - from_pathid = staticmethod(from_pathid) - - def from_target(target): - """Convert a target (either a working copy path or an URL) into a - path identifier.""" - # prime the cache first if we don't know about this target yet - if not PathIdentifier.locobjs.has_key(target): - PathIdentifier.hint(target) - - try: - return PathIdentifier.locobjs[target] - except KeyError: - error("Could not recognize path identifier '%s'" % target) - from_target = staticmethod(from_target) - - def hint(target): - """Cache some information about target, as it may be referenced by - repo-relative path in subversion properties; the cache can help to - expand such a relative path to a full path identifier.""" - if PathIdentifier.locobjs.has_key(target): return - if not is_url(target) and not is_wc(target): return - - url = target_to_url(target) - - root = get_repo_root(url) - assert root[-1] != "/" - assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) - repo_relative_path = url[len(root):] - - try: - uuid = get_svninfo(target)['Repository UUID'] - uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) - except KeyError: - uuid = None - uuid_pathid = None - - locobj = PathIdentifier.locobjs.get(url) or \ - (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) - if not locobj: - locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) - - PathIdentifier.repo_hints[uuid] = root # (uuid may be None) - - PathIdentifier.locobjs[target] = locobj - PathIdentifier.locobjs[url] = locobj - if uuid_pathid: - PathIdentifier.locobjs[uuid_pathid] = locobj - if not PathIdentifier.locobjs.has_key(repo_relative_path): - PathIdentifier.locobjs[repo_relative_path] = locobj - hint = staticmethod(hint) - - def format(self, fmt): - if fmt == 'path': - return self.repo_relative_path - elif fmt == 'uuid': - return "uuid://%s%s" % (self.uuid, self.repo_relative_path) - elif fmt == 'url': - return self.url - else: - error("Unkonwn path type '%s'" % fmt) - - def match_substring(self, str): - """Test whether str is a substring of any representation of this - PathIdentifier.""" - if self.repo_relative_path.find(str) >= 0: - return True - - if self.uuid: - if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: - return True - - if self.url: - if (self.url + self.repo_relative_path).find(str) >= 0: - return True - - return False - - def get_url(self): - """Convert a pathid into a URL. If this is not possible, error out.""" - if self.url: - return self.url - # if we have a uuid and happen to know the URL for it, use that - elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): - self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path - PathIdentifier.locobjs[self.url] = self - return self.url - # if we've only seen one rep, use that (a guess, but an educated one) - elif not self.uuid and len(PathIdentifier.repo_hints) == 1: - uuid, root = PathIdentifier.repo_hints.items()[0] - if uuid: - self.uuid = uuid - PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self - self.url = root + self.repo_relative_path - PathIdentifier.locobjs[self.url] = self - report("Guessing that '%s' refers to '%s'" % (self, self.url)) - return self.url - else: - error("Cannot determine URL for '%s'; " % self + - "Explicit source argument (-S/--source) required.\n") - -class RevisionLog: - """ - A log of the revisions which affected a given URL between two - revisions. - """ - - def __init__(self, url, begin, end, find_propchanges=False): - """ - Create a new RevisionLog object, which stores, in self.revs, a list - of the revisions which affected the specified URL between begin and - end. If find_propchanges is True, self.propchange_revs will contain a - list of the revisions which changed properties directly on the - specified URL. URL must be the URL for a directory in the repository. - """ - self.url = url - - # Setup the log options (--quiet, so we don't show log messages) - log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) - if find_propchanges: - # The --verbose flag lets us grab merge tracking information - # by looking at propchanges - log_opts = "--verbose " + log_opts - - # Read the log to look for revision numbers and merge-tracking info - self.revs = [] - self.propchange_revs = [] - repos_pathid = PathIdentifier.from_target(url) - for chg in SvnLogParser(launchsvn("log %s" % log_opts, - split_lines=False)): - self.revs.append(chg.revision()) - for p in chg.paths(): - if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: - self.propchange_revs.append(chg.revision()) - - # Save the range of the log - self.begin = int(begin) - if end == "HEAD": - # If end is not provided, we do not know which is the latest - # revision in the repository. So we set 'end' to the latest - # known revision. - self.end = self.revs[-1] - else: - self.end = int(end) - - self._merges = None - self._blocks = None - - def merge_metadata(self): - """ - Return a VersionedProperty object, with a cached view of the merge - metadata in the range of this log. - """ - - # Load merge metadata if necessary - if not self._merges: - self._merges = VersionedProperty(self.url, opts["prop"]) - self._merges.load(self) - - return self._merges - - def block_metadata(self): - if not self._blocks: - self._blocks = VersionedProperty(self.url, opts["block-prop"]) - self._blocks.load(self) - - return self._blocks - - -class VersionedProperty: - """ - A read-only, cached view of a versioned property. - - self.revs contains a list of the revisions in which the property changes. - self.values stores the new values at each corresponding revision. If the - value of the property is unknown, it is set to None. - - Initially, we set self.revs to [0] and self.values to [None]. This - indicates that, as of revision zero, we know nothing about the value of - the property. - - Later, if you run self.load(log), we cache the value of this property over - the entire range of the log by noting each revision in which the property - was changed. At the end of the range of the log, we invalidate our cache - by adding the value "None" to our cache for any revisions which fall out - of the range of our log. - - Once self.revs and self.values are filled, we can find the value of the - property at any arbitrary revision using a binary search on self.revs. - Once we find the last revision during which the property was changed, - we can lookup the associated value in self.values. (If the associated - value is None, the associated value was not cached and we have to do - a full propget.) - - An example: We know that the 'svnmerge' property was added in r10, and - changed in r21. We gathered log info up until r40. - - revs = [0, 10, 21, 40] - values = [None, "val1", "val2", None] - - What these values say: - - From r0 to r9, we know nothing about the property. - - In r10, the property was set to "val1". This property stayed the same - until r21, when it was changed to "val2". - - We don't know what happened after r40. - """ - - def __init__(self, url, name): - """View the history of a versioned property at URL with name""" - self.url = url - self.name = name - - # We know nothing about the value of the property. Setup revs - # and values to indicate as such. - self.revs = [0] - self.values = [None] - - # We don't have any revisions cached - self._initial_value = None - self._changed_revs = [] - self._changed_values = [] - - def load(self, log): - """ - Load the history of property changes from the specified - RevisionLog object. - """ - - # Get the property value before the range of the log - if log.begin > 1: - self.revs.append(log.begin-1) - try: - self._initial_value = self.raw_get(log.begin-1) - except LaunchError: - # The specified URL might not exist before the - # range of the log. If so, we can safely assume - # that the property was empty at that time. - self._initial_value = { } - self.values.append(self._initial_value) - else: - self._initial_value = { } - self.values[0] = self._initial_value - - # Cache the property values in the log range - old_value = self._initial_value - for rev in log.propchange_revs: - new_value = self.raw_get(rev) - if new_value != old_value: - self._changed_revs.append(rev) - self._changed_values.append(new_value) - self.revs.append(rev) - self.values.append(new_value) - old_value = new_value - - # Indicate that we know nothing about the value of the property - # after the range of the log. - if log.revs: - self.revs.append(log.end+1) - self.values.append(None) - - def raw_get(self, rev=None): - """ - Get the property at revision REV. If rev is not specified, get - the property at revision HEAD. - """ - return get_revlist_prop(self.url, self.name, rev) - - def get(self, rev=None): - """ - Get the property at revision REV. If rev is not specified, get - the property at revision HEAD. - """ - - if rev is not None: - - # Find the index using a binary search - i = bisect(self.revs, rev) - 1 - - # Return the value of the property, if it was cached - if self.values[i] is not None: - return self.values[i] - - # Get the current value of the property - return self.raw_get(rev) - - def changed_revs(self, key=None): - """ - Get a list of the revisions in which the specified dictionary - key was changed in this property. If key is not specified, - return a list of revisions in which any key was changed. - """ - if key is None: - return self._changed_revs - else: - changed_revs = [] - old_val = self._initial_value - for rev, val in zip(self._changed_revs, self._changed_values): - if val.get(key) != old_val.get(key): - changed_revs.append(rev) - old_val = val - return changed_revs - - def initialized_revs(self): - """ - Get a list of the revisions in which keys were added or - removed in this property. - """ - initialized_revs = [] - old_len = len(self._initial_value) - for rev, val in zip(self._changed_revs, self._changed_values): - if len(val) != old_len: - initialized_revs.append(rev) - old_len = len(val) - return initialized_revs - -class RevisionSet: - """ - A set of revisions, held in dictionary form for easy manipulation. If we - were to rewrite this script for Python 2.3+, we would subclass this from - set (or UserSet). As this class does not include branch - information, it's assumed that one instance will be used per - branch. - """ - def __init__(self, parm): - """Constructs a RevisionSet from a string in property form, or from - a dictionary whose keys are the revisions. Raises ValueError if the - input string is invalid.""" - - self._revs = {} - - revision_range_split_re = re.compile('[-:]') - - if isinstance(parm, types.DictType): - self._revs = parm.copy() - elif isinstance(parm, types.ListType): - for R in parm: - self._revs[int(R)] = 1 - else: - parm = parm.strip() - if parm: - for R in parm.split(","): - rev_or_revs = re.split(revision_range_split_re, R) - if len(rev_or_revs) == 1: - self._revs[int(rev_or_revs[0])] = 1 - elif len(rev_or_revs) == 2: - for rev in range(int(rev_or_revs[0]), - int(rev_or_revs[1])+1): - self._revs[rev] = 1 - else: - raise ValueError, 'Ill formatted revision range: ' + R - - def sorted(self): - revnums = self._revs.keys() - revnums.sort() - return revnums - - def normalized(self): - """Returns a normalized version of the revision set, which is an - ordered list of couples (start,end), with the minimum number of - intervals.""" - revnums = self.sorted() - revnums.reverse() - ret = [] - while revnums: - s = e = revnums.pop() - while revnums and revnums[-1] in (e, e+1): - e = revnums.pop() - ret.append((s, e)) - return ret - - def __str__(self): - """Convert the revision set to a string, using its normalized form.""" - L = [] - for s,e in self.normalized(): - if s == e: - L.append(str(s)) - else: - L.append(str(s) + "-" + str(e)) - return ",".join(L) - - def __contains__(self, rev): - return self._revs.has_key(rev) - - def __sub__(self, rs): - """Compute subtraction as in sets.""" - revs = {} - for r in self._revs.keys(): - if r not in rs: - revs[r] = 1 - return RevisionSet(revs) - - def __and__(self, rs): - """Compute intersections as in sets.""" - revs = {} - for r in self._revs.keys(): - if r in rs: - revs[r] = 1 - return RevisionSet(revs) - - def __nonzero__(self): - return len(self._revs) != 0 - - def __len__(self): - """Return the number of revisions in the set.""" - return len(self._revs) - - def __iter__(self): - return iter(self.sorted()) - - def __or__(self, rs): - """Compute set union.""" - revs = self._revs.copy() - revs.update(rs._revs) - return RevisionSet(revs) - -def merge_props_to_revision_set(merge_props, pathid): - """A converter which returns a RevisionSet instance containing the - revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a - dictionary of pathid -> revision set branch integration information - (as returned by get_merge_props()).""" - if not merge_props.has_key(pathid): - error('no integration info available for path "%s"' % pathid) - return RevisionSet(merge_props[pathid]) - -def dict_from_revlist_prop(propvalue): - """Given a property value as a string containing per-source revision - lists, return a dictionary whose key is a source path identifier - and whose value is the revisions for that source.""" - prop = {} - - # Multiple sources are separated by any whitespace. - for L in propvalue.split(): - # We use rsplit to play safe and allow colons in pathids. - pathid_str, revs = rsplit(L.strip(), ":", 1) - - pathid = PathIdentifier.from_pathid(pathid_str) - - # cache the "external" form we saw - pathid.external_form = pathid_str - - prop[pathid] = revs - return prop - -def get_revlist_prop(url_or_dir, propname, rev=None): - """Given a repository URL or working copy path and a property - name, extract the values of the property which store per-source - revision lists and return a dictionary whose key is a source path - identifier, and whose value is the revisions for that source.""" - - # Note that propget does not return an error if the property does - # not exist, it simply does not output anything. So we do not need - # to check for LaunchError here. - args = '--strict "%s" "%s"' % (propname, url_or_dir) - if rev: - args = '-r %s %s' % (rev, args) - out = launchsvn('propget %s' % args, split_lines=False) - - return dict_from_revlist_prop(out) - -def get_merge_props(dir): - """Extract the merged revisions.""" - return get_revlist_prop(dir, opts["prop"]) - -def get_block_props(dir): - """Extract the blocked revisions.""" - return get_revlist_prop(dir, opts["block-prop"]) - -def get_blocked_revs(dir, source_pathid): - p = get_block_props(dir) - if p.has_key(source_pathid): - return RevisionSet(p[source_pathid]) - return RevisionSet("") - -def format_merge_props(props, sep=" "): - """Formats the hash PROPS as a string suitable for use as a - Subversion property value.""" - assert sep in ["\t", "\n", " "] # must be a whitespace - props = props.items() - props.sort() - L = [] - for h, r in props: - L.append("%s:%s" % (h, r)) - return sep.join(L) - -def _run_propset(dir, prop, value): - """Set the property 'prop' of directory 'dir' to value 'value'. We go - through a temporary file to not run into command line length limits.""" - try: - fd, fname = tempfile.mkstemp() - f = os.fdopen(fd, "wb") - except AttributeError: - # Fallback for Python <= 2.3 which does not have mkstemp (mktemp - # suffers from race conditions. Not that we care...) - fname = tempfile.mktemp() - f = open(fname, "wb") - - try: - f.write(value) - f.close() - report("property data written to temp file: %s" % value) - svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) - finally: - os.remove(fname) - -def set_props(dir, name, props): - props = format_merge_props(props) - if props: - _run_propset(dir, name, props) - else: - # Check if NAME exists on DIR before trying to delete it. - # As of 1.6 propdel no longer supports deleting a - # non-existent property. - out = launchsvn('propget "%s" "%s"' % (name, dir)) - if out: - svn_command('propdel "%s" "%s"' % (name, dir)) - -def set_merge_props(dir, props): - set_props(dir, opts["prop"], props) - -def set_block_props(dir, props): - set_props(dir, opts["block-prop"], props) - -def set_blocked_revs(dir, source_pathid, revs): - props = get_block_props(dir) - if revs: - props[source_pathid] = str(revs) - elif props.has_key(source_pathid): - del props[source_pathid] - set_block_props(dir, props) - -def is_url(url): - """Check if url looks like a valid url.""" - return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' - -def check_url(url): - """Similar to is_url, but actually invoke get_svninfo to find out""" - return get_svninfo(url) != {} - -def is_pathid(pathid): - return isinstance(pathid, PathIdentifier) - -def is_wc(dir): - """Check if a directory is a working copy.""" - return os.path.isdir(os.path.join(dir, ".svn")) or \ - os.path.isdir(os.path.join(dir, "_svn")) - -_cache_svninfo = {} -def get_svninfo(target): - """Extract the subversion information for a target (through 'svn info'). - This function uses an internal cache to let clients query information - many times.""" - if _cache_svninfo.has_key(target): - return _cache_svninfo[target] - info = {} - for L in launchsvn('info "%s"' % target): - L = L.strip() - if not L: - continue - key, value = L.split(": ", 1) - info[key] = value.strip() - _cache_svninfo[target] = info - return info - -def target_to_url(target): - """Convert working copy path or repos URL to a repos URL.""" - if is_wc(target): - info = get_svninfo(target) - return info["URL"] - return target - -_cache_reporoot = {} -def get_repo_root(target): - """Compute the root repos URL given a working-copy path, or a URL.""" - # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 - if not is_url(target): - try: - info = get_svninfo(target) - root = info["Repository Root"] - _cache_reporoot[root] = None - return root - except KeyError: - pass - url = target_to_url(target) - assert url[-1] != '/' - else: - url = target - - # Go through the cache of the repository roots. This avoids extra - # server round-trips if we are asking the root of different URLs - # in the same repository (the cache in get_svninfo() cannot detect - # that of course and would issue a remote command). - assert is_url(url) - for r in _cache_reporoot: - if url.startswith(r): - return r - - # Try using "svn info URL". This works only on SVN clients >= 1.2 - try: - info = get_svninfo(url) - # info may be {}, in which case we'll see KeyError here - root = info["Repository Root"] - _cache_reporoot[root] = None - return root - except (KeyError, LaunchError): - pass - - # Constrained to older svn clients, we are stuck with this ugly - # trial-and-error implementation. It could be made faster with a - # binary search. - while url: - temp = os.path.dirname(url) - try: - launchsvn('proplist "%s"' % temp) - except LaunchError: - _cache_reporoot[url] = None - return rstrip(url, "/") - url = temp - - error("svn repos root of %s not found" % target) - -class SvnLogParser: - """ - Parse the "svn log", going through the XML output and using pulldom (which - would even allow streaming the command output). - """ - def __init__(self, xml): - self._events = pulldom.parseString(xml) - def __getitem__(self, idx): - for event, node in self._events: - if event == pulldom.START_ELEMENT and node.tagName == "logentry": - self._events.expandNode(node) - return self.SvnLogRevision(node) - raise IndexError, "Could not find 'logentry' tag in xml" - - class SvnLogRevision: - def __init__(self, xmlnode): - self.n = xmlnode - def revision(self): - return int(self.n.getAttribute("revision")) - def author(self): - return self.n.getElementsByTagName("author")[0].firstChild.data - def paths(self): - return [self.SvnLogPath(n) - for n in self.n.getElementsByTagName("path")] - - class SvnLogPath: - def __init__(self, xmlnode): - self.n = xmlnode - def action(self): - return self.n.getAttribute("action") - def pathid(self): - return self.n.firstChild.data - def copyfrom_rev(self): - try: return self.n.getAttribute("copyfrom-rev") - except KeyError: return None - def copyfrom_pathid(self): - try: return self.n.getAttribute("copyfrom-path") - except KeyError: return None - -def get_copyfrom(target): - """Get copyfrom info for a given target (it represents the - repository-relative path from where it was branched). NOTE: - repos root has no copyfrom info. In this case None is returned. - - Returns the: - - source file or directory from which the copy was made - - revision from which that source was copied - - revision in which the copy was committed - """ - repos_path = PathIdentifier.from_target(target).repo_relative_path - for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' - % target, split_lines=False)): - for p in chg.paths(): - if p.action() == 'A' and p.pathid() == repos_path: - # These values will be None if the corresponding elements are - # not found in the log. - return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() - return None,None,None - -def get_latest_rev(url): - """Get the latest revision of the repository of which URL is part.""" - try: - info = get_svninfo(url) - if not info.has_key("Revision"): - error("Not a valid URL: %s" % url) - return info["Revision"] - except LaunchError: - # Alternative method for latest revision checking (for svn < 1.2) - report('checking latest revision of "%s"' % url) - L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] - rev = re.search("revision (\d+)", L).group(1) - report('latest revision of "%s" is %s' % (url, rev)) - return rev - -def get_created_rev(url): - """Lookup the revision at which the path identified by the - provided URL was first created.""" - oldest_rev = -1 - report('determining oldest revision for URL "%s"' % url) - ### TODO: Refactor this to use a modified RevisionLog class. - lines = None - cmd = "log -r1:HEAD --stop-on-copy -q " + url - try: - lines = launchsvn(cmd + " --limit=1") - except LaunchError: - # Assume that --limit isn't supported by the installed 'svn'. - lines = launchsvn(cmd) - if lines and len(lines) > 1: - i = lines[1].find(" ") - if i != -1: - oldest_rev = int(lines[1][1:i]) - if oldest_rev == -1: - error('unable to determine oldest revision for URL "%s"' % url) - return oldest_rev - -def get_commit_log(url, revnum): - """Return the log message for a specific integer revision - number.""" - out = launchsvn("log --incremental -r%d %s" % (revnum, url)) - return recode_stdout_to_file("".join(out[1:])) - -def construct_merged_log_message(url, revnums): - """Return a commit log message containing all the commit messages - in the specified revisions at the given URL. The separator used - in this log message is determined by searching for the longest - svnmerge separator existing in the commit log messages and - extending it by one more separator. This results in a new commit - log message that is clearer in describing merges that contain - other merges. Trailing newlines are removed from the embedded - log messages.""" - messages = [''] - longest_sep = '' - for r in revnums.sorted(): - message = get_commit_log(url, r) - if message: - message = re.sub(r'(\r\n|\r|\n)', "\n", message) - message = rstrip(message, "\n") + "\n" - messages.append(prefix_lines(LOG_LINE_PREFIX, message)) - for match in LOG_SEPARATOR_RE.findall(message): - sep = match[1] - if len(sep) > len(longest_sep): - longest_sep = sep - - longest_sep += LOG_SEPARATOR + "\n" - messages.append('') - return longest_sep.join(messages) - -def get_default_source(branch_target, branch_props): - """Return the default source for branch_target (given its branch_props). - Error out if there is ambiguity.""" - if not branch_props: - error("no integration info available") - - props = branch_props.copy() - pathid = PathIdentifier.from_target(branch_target) - - # To make bidirectional merges easier, find the target's - # repository local path so it can be removed from the list of - # possible integration sources. - if props.has_key(pathid): - del props[pathid] - - if len(props) > 1: - err_msg = "multiple sources found. " - err_msg += "Explicit source argument (-S/--source) required.\n" - err_msg += "The merge sources available are:" - for prop in props: - err_msg += "\n " + str(prop) - error(err_msg) - - return props.keys()[0] - -def should_find_reflected(branch_dir): - should_find_reflected = opts["bidirectional"] - - # If the source has integration info for the target, set find_reflected - # even if --bidirectional wasn't specified - if not should_find_reflected: - source_props = get_merge_props(opts["source-url"]) - should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) - - return should_find_reflected - -def analyze_revs(target_pathid, url, begin=1, end=None, - find_reflected=False): - """For the source of the merges in the source URL being merged into - target_pathid, analyze the revisions in the interval begin-end (which - defaults to 1-HEAD), to find out which revisions are changes in - the url, which are changes elsewhere (so-called 'phantom' - revisions), optionally which are reflected changes (to avoid - conflicts that can occur when doing bidirectional merging between - branches), and which revisions initialize merge tracking against other - branches. Return a tuple of four RevisionSet's: - (real_revs, phantom_revs, reflected_revs, initialized_revs). - - NOTE: To maximize speed, if "end" is not provided, the function is - not able to find phantom revisions following the last real - revision in the URL. - """ - - begin = str(begin) - if end is None: - end = "HEAD" - else: - end = str(end) - if long(begin) > long(end): - return RevisionSet(""), RevisionSet(""), \ - RevisionSet(""), RevisionSet("") - - logs[url] = RevisionLog(url, begin, end, find_reflected) - revs = RevisionSet(logs[url].revs) - - if end == "HEAD": - # If end is not provided, we do not know which is the latest revision - # in the repository. So return the phantom revision set only up to - # the latest known revision. - end = str(list(revs)[-1]) - - phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs - - if find_reflected: - reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) - reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) - else: - reflected_revs = [] - - initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) - reflected_revs = RevisionSet(reflected_revs) - - return revs, phantom_revs, reflected_revs, initialized_revs - -def analyze_source_revs(branch_target, source_url, **kwargs): - """For the given branch and source, extract the real and phantom - source revisions.""" - branch_url = target_to_url(branch_target) - branch_pathid = PathIdentifier.from_target(branch_target) - - # Extract the latest repository revision from the URL of the branch - # directory (which is already cached at this point). - end_rev = get_latest_rev(source_url) - - # Calculate the base of analysis. If there is a "1-XX" interval in the - # merged_revs, we do not need to check those. - base = 1 - r = opts["merged-revs"].normalized() - if r and r[0][0] == 1: - base = r[0][1] + 1 - - # See if the user filtered the revision set. If so, we are not - # interested in something outside that range. - if opts["revision"]: - revs = RevisionSet(opts["revision"]).sorted() - if base < revs[0]: - base = revs[0] - if end_rev > revs[-1]: - end_rev = revs[-1] - - return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) - -def minimal_merge_intervals(revs, phantom_revs): - """Produce the smallest number of intervals suitable for merging. revs - is the RevisionSet which we want to merge, and phantom_revs are phantom - revisions which can be used to concatenate intervals, thus minimizing the - number of operations.""" - revnums = revs.normalized() - ret = [] - - cur = revnums.pop() - while revnums: - next = revnums.pop() - assert next[1] < cur[0] # otherwise it is not ordered - assert cur[0] - next[1] > 1 # otherwise it is not normalized - for i in range(next[1]+1, cur[0]): - if i not in phantom_revs: - ret.append(cur) - cur = next - break - else: - cur = (next[0], cur[1]) - - ret.append(cur) - ret.reverse() - return ret - -def display_revisions(revs, display_style, revisions_msg, source_url): - """Show REVS as dictated by DISPLAY_STYLE, either numerically, in - log format, or as diffs. When displaying revisions numerically, - prefix output with REVISIONS_MSG when in verbose mode. Otherwise, - request logs or diffs using SOURCE_URL.""" - if display_style == "revisions": - if revs: - report(revisions_msg) - print revs - elif display_style == "logs": - for start,end in revs.normalized(): - svn_command('log --incremental -v -r %d:%d %s' % \ - (start, end, source_url)) - elif display_style in ("diffs", "summarize"): - if display_style == 'summarize': - summarize = '--summarize ' - else: - summarize = '' - - for start, end in revs.normalized(): - print - if start == end: - print "%s: changes in revision %d follow" % (NAME, start) - else: - print "%s: changes in revisions %d-%d follow" % (NAME, - start, end) - print - - # Note: the starting revision number to 'svn diff' is - # NOT inclusive so we have to subtract one from ${START}. - svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, - source_url)) - else: - assert False, "unhandled display style: %s" % display_style - -def action_init(target_dir, target_props): - """Initialize for merges.""" - # Check that directory is ready for being modified - check_dir_clean(target_dir) - - target_pathid = PathIdentifier.from_target(target_dir) - source_pathid = opts['source-pathid'] - if source_pathid == target_pathid: - error("cannot init integration source path '%s'\nIts path identifier does not " - "differ from the path identifier of the current directory, '%s'." - % (source_pathid, target_pathid)) - - source_url = opts['source-url'] - - # If the user hasn't specified the revisions to use, see if the - # "source" is a copy from the current tree and if so, we can use - # the version data obtained from it. - revision_range = opts["revision"] - if not revision_range: - # If source was originally copied from target, and we are merging - # changes from source to target (the copy target is the merge source, - # and the copy source is the merge target), then we want to mark as - # integrated up to the rev in which the copy was committed which - # created the merge source: - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) - - cf_pathid = None - if cf_source: - cf_url = get_repo_root(source_url) + cf_source - if is_url(cf_url) and check_url(cf_url): - cf_pathid = PathIdentifier.from_target(cf_url) - - if target_pathid == cf_pathid: - report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % - (source_url, target_dir, cf_rev, copy_committed_in_rev)) - revision_range = "1-" + str(copy_committed_in_rev) - - if not revision_range: - # If the reverse is true: copy source is the merge source, and - # the copy target is the merge target, then we want to mark as - # integrated up to the specific rev of the merge target from - # which the merge source was copied. (Longer discussion at: - # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) - - cf_pathid = None - if cf_source: - cf_url = get_repo_root(target_dir) + cf_source - if is_url(cf_url) and check_url(cf_url): - cf_pathid = PathIdentifier.from_target(cf_url) - - source_pathid = PathIdentifier.from_target(source_url) - if source_pathid == cf_pathid: - report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % - (target_dir, source_url, cf_rev, copy_committed_in_rev)) - revision_range = "1-" + cf_rev - - # When neither the merge source nor target is a copy of the other, and - # the user did not specify a revision range, then choose a default which is - # the current revision; saying, in effect, "everything has been merged, so - # mark as integrated up to the latest rev on source url). - if not revision_range: - revision_range = "1-" + get_latest_rev(source_url) - - revs = RevisionSet(revision_range) - - report('marking "%s" as already containing revisions "%s" of "%s"' % - (target_dir, revs, source_url)) - - revs = str(revs) - # If the local svnmerge-integrated property already has an entry - # for the source-pathid, simply error out. - if not opts["force"] and target_props.has_key(source_pathid): - error('Repository-relative path %s has already been initialized at %s\n' - 'Use --force to re-initialize' % (source_pathid, target_dir)) - # set the pathid's external_form based on the user's options - source_pathid.external_form = source_pathid.format(opts['location-type']) - - revs = str(revs) - target_props[source_pathid] = revs - - # Set property - set_merge_props(target_dir, target_props) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ - % (NAME, revs) - print >>f, '%s' % source_url - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_avail(branch_dir, branch_props): - """Show commits available for merges.""" - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"], - find_reflected= - should_find_reflected(branch_dir)) - report('skipping phantom revisions: %s' % phantom_revs) - if reflected_revs: - report('skipping reflected revisions: %s' % reflected_revs) - report('skipping initialized revisions: %s' % initialized_revs) - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ - reflected_revs - initialized_revs - - # Compose the set of revisions to show - revs = RevisionSet("") - report_msg = "revisions available to be merged are:" - if "avail" in opts["avail-showwhat"]: - revs |= avail_revs - if "blocked" in opts["avail-showwhat"]: - revs |= blocked_revs - report_msg = "revisions blocked are:" - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs = revs & RevisionSet(opts["revision"]) - - display_revisions(revs, opts["avail-display"], - report_msg, - opts["source-url"]) - -def action_integrated(branch_dir, branch_props): - """Show change sets already merged. This set of revisions is - calculated from taking svnmerge-integrated property from the - branch, and subtracting any revision older than the branch - creation revision.""" - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) - - # Lookup the oldest revision on the branch path. - oldest_src_rev = get_created_rev(opts["source-url"]) - - # Subtract any revisions which pre-date the branch. - report("subtracting revisions which pre-date the source URL (%d)" % - oldest_src_rev) - revs = revs - RevisionSet(range(1, oldest_src_rev)) - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs = revs & RevisionSet(opts["revision"]) - - display_revisions(revs, opts["integrated-display"], - "revisions already integrated are:", opts["source-url"]) - -def action_merge(branch_dir, branch_props): - """Record merge meta data, and do the actual merge (if not - requested otherwise via --record-only).""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"], - find_reflected= - should_find_reflected(branch_dir)) - - if opts["revision"]: - revs = RevisionSet(opts["revision"]) - else: - revs = source_revs - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - merged_revs = opts["merged-revs"] - - # Show what we're doing - if opts["verbose"]: # just to avoid useless calculations - if merged_revs & revs: - report('"%s" already contains revisions %s' % (branch_dir, - merged_revs & revs)) - if phantom_revs: - report('memorizing phantom revision(s): %s' % phantom_revs) - if reflected_revs: - report('memorizing reflected revision(s): %s' % reflected_revs) - if blocked_revs & revs: - report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) - if initialized_revs: - report('skipping initialized revision(s): %s' % initialized_revs) - - # Compute final merge set. - revs = revs - merged_revs - blocked_revs - reflected_revs - \ - phantom_revs - initialized_revs - if not revs: - report('no revisions to merge, exiting') - return - - # When manually marking revisions as merged, we only update the - # integration meta data, and don't perform an actual merge. - record_only = opts["record-only"] - - if record_only: - report('recording merge of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - else: - report('merging in revision(s) %s from "%s"' % - (revs, opts["source-url"])) - - # Do the merge(s). Note: the starting revision number to 'svn merge' - # is NOT inclusive so we have to subtract one from start. - # We try to keep the number of merge operations as low as possible, - # because it is faster and reduces the number of conflicts. - old_block_props = get_block_props(branch_dir) - merge_metadata = logs[opts["source-url"]].merge_metadata() - block_metadata = logs[opts["source-url"]].block_metadata() - for start,end in minimal_merge_intervals(revs, phantom_revs): - if not record_only: - # Preset merge/blocked properties to the source value at - # the start rev to avoid spurious property conflicts - set_merge_props(branch_dir, merge_metadata.get(start - 1)) - set_block_props(branch_dir, block_metadata.get(start - 1)) - # Do the merge - svn_command("merge --force -r %d:%d %s %s" % \ - (start - 1, end, opts["source-url"], branch_dir)) - # TODO: to support graph merging, add logic to merge the property - # meta-data manually - - # Update the set of merged revisions. - merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs - branch_props[opts["source-pathid"]] = str(merged_revs) - set_merge_props(branch_dir, branch_props) - # Reset the blocked revs - set_block_props(branch_dir, old_block_props) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - if record_only: - print >>f, 'Recorded merge of revisions %s via %s from ' % \ - (revs, NAME) - else: - print >>f, 'Merged revisions %s via %s from ' % \ - (revs, NAME) - print >>f, '%s' % opts["source-url"] - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], revs), - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_block(branch_dir, branch_props): - """Block revisions.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"]) - revs_to_block = source_revs - opts["merged-revs"] - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs_to_block = RevisionSet(opts["revision"]) & revs_to_block - - if not revs_to_block: - error('no available revisions to block') - - # Change blocked information - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - blocked_revs = blocked_revs | revs_to_block - set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], - revs_to_block), - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_unblock(branch_dir, branch_props): - """Unblock revisions.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - revs_to_unblock = blocked_revs - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) - - if not revs_to_unblock: - error('no available revisions to unblock') - - # Change blocked information - blocked_revs = blocked_revs - revs_to_unblock - set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], - revs_to_unblock), - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_rollback(branch_dir, branch_props): - """Rollback previously integrated revisions.""" - - # Make sure the revision arguments are present - if not opts["revision"]: - error("The '-r' option is mandatory for rollback") - - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - # Get the list of all revisions already merged into this source-pathid. - merged_revs = merge_props_to_revision_set(branch_props, - opts["source-pathid"]) - - # At which revision was the src created? - oldest_src_rev = get_created_rev(opts["source-url"]) - src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) - - # Limit to revisions specified by -r (if any) - revs = merged_revs & RevisionSet(opts["revision"]) - - # make sure there's some revision to rollback - if not revs: - report("Nothing to rollback in revision range r%s" % opts["revision"]) - return - - # If even one specified revision lies outside the lifetime of the - # merge source, error out. - if revs & src_pre_exist_range: - err_str = "Specified revision range falls out of the rollback range.\n" - err_str += "%s was created at r%d" % (opts["source-pathid"], - oldest_src_rev) - error(err_str) - - record_only = opts["record-only"] - - if record_only: - report('recording rollback of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - else: - report('rollback of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - - # Do the reverse merge(s). Note: the starting revision number - # to 'svn merge' is NOT inclusive so we have to subtract one from start. - # We try to keep the number of merge operations as low as possible, - # because it is faster and reduces the number of conflicts. - rollback_intervals = minimal_merge_intervals(revs, []) - # rollback in the reverse order of merge - rollback_intervals.reverse() - for start, end in rollback_intervals: - if not record_only: - # Do the merge - svn_command("merge --force -r %d:%d %s %s" % \ - (end, start - 1, opts["source-url"], branch_dir)) - - # Write out commit message if desired - # calculate the phantom revs first - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - if record_only: - print >>f, 'Recorded rollback of revisions %s via %s from ' % \ - (revs , NAME) - else: - print >>f, 'Rolled back revisions %s via %s from ' % \ - (revs , NAME) - print >>f, '%s' % opts["source-url"] - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - - # Update the set of merged revisions. - merged_revs = merged_revs - revs - branch_props[opts["source-pathid"]] = str(merged_revs) - set_merge_props(branch_dir, branch_props) - -def action_uninit(branch_dir, branch_props): - """Uninit SOURCE URL.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - # If the source-pathid does not have an entry in the svnmerge-integrated - # property, simply error out. - if not branch_props.has_key(opts["source-pathid"]): - error('Repository-relative path "%s" does not contain merge ' - 'tracking information for "%s"' \ - % (opts["source-pathid"], branch_dir)) - - del branch_props[opts["source-pathid"]] - - # Set merge property with the selected source deleted - set_merge_props(branch_dir, branch_props) - - # Set blocked revisions for the selected source to None - set_blocked_revs(branch_dir, opts["source-pathid"], None) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Removed merge tracking for "%s" for ' % NAME - print >>f, '%s' % opts["source-url"] - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -############################################################################### -# Command line parsing -- options and commands management -############################################################################### - -class OptBase: - def __init__(self, *args, **kwargs): - self.help = kwargs["help"] - del kwargs["help"] - self.lflags = [] - self.sflags = [] - for a in args: - if a.startswith("--"): self.lflags.append(a) - elif a.startswith("-"): self.sflags.append(a) - else: - raise TypeError, "invalid flag name: %s" % a - if kwargs.has_key("dest"): - self.dest = kwargs["dest"] - del kwargs["dest"] - else: - if not self.lflags: - raise TypeError, "cannot deduce dest name without long options" - self.dest = self.lflags[0][2:] - if kwargs: - raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() - def repr_flags(self): - f = self.sflags + self.lflags - r = f[0] - for fl in f[1:]: - r += " [%s]" % fl - return r - -class Option(OptBase): - def __init__(self, *args, **kwargs): - self.default = kwargs.setdefault("default", 0) - del kwargs["default"] - self.value = kwargs.setdefault("value", None) - del kwargs["value"] - OptBase.__init__(self, *args, **kwargs) - def apply(self, state, value): - assert value == "" - if self.value is not None: - state[self.dest] = self.value - else: - state[self.dest] += 1 - -class OptionArg(OptBase): - def __init__(self, *args, **kwargs): - self.default = kwargs["default"] - del kwargs["default"] - self.metavar = kwargs.setdefault("metavar", None) - del kwargs["metavar"] - OptBase.__init__(self, *args, **kwargs) - - if self.metavar is None: - if self.dest is not None: - self.metavar = self.dest.upper() - else: - self.metavar = "arg" - if self.default: - self.help += " (default: %s)" % self.default - def apply(self, state, value): - assert value is not None - state[self.dest] = value - def repr_flags(self): - r = OptBase.repr_flags(self) - return r + " " + self.metavar - -class CommandOpts: - class Cmd: - def __init__(self, *args): - self.name, self.func, self.usage, self.help, self.opts = args - def short_help(self): - return self.help.split(".")[0] - def __str__(self): - return self.name - def __call__(self, *args, **kwargs): - return self.func(*args, **kwargs) - - def __init__(self, global_opts, common_opts, command_table, version=None): - self.progname = NAME - self.version = version.replace("%prog", self.progname) - self.cwidth = console_width() - 2 - self.ctable = command_table.copy() - self.gopts = global_opts[:] - self.copts = common_opts[:] - self._add_builtins() - for k in self.ctable.keys(): - cmd = self.Cmd(k, *self.ctable[k]) - opts = [] - for o in cmd.opts: - if isinstance(o, types.StringType) or \ - isinstance(o, types.UnicodeType): - o = self._find_common(o) - opts.append(o) - cmd.opts = opts - self.ctable[k] = cmd - - def _add_builtins(self): - self.gopts.append( - Option("-h", "--help", help="show help for this command and exit")) - if self.version is not None: - self.gopts.append( - Option("-V", "--version", help="show version info and exit")) - self.ctable["help"] = (self._cmd_help, - "help [COMMAND]", - "Display help for a specific command. If COMMAND is omitted, " - "display brief command description.", - []) - - def _cmd_help(self, cmd=None, *args): - if args: - self.error("wrong number of arguments", "help") - if cmd is not None: - cmd = self._command(cmd) - self.print_command_help(cmd) - else: - self.print_command_list() - - def _paragraph(self, text, width=78): - chunks = re.split("\s+", text.strip()) - chunks.reverse() - lines = [] - while chunks: - L = chunks.pop() - while chunks and len(L) + len(chunks[-1]) + 1 <= width: - L += " " + chunks.pop() - lines.append(L) - return lines - - def _paragraphs(self, text, *args, **kwargs): - pars = text.split("\n\n") - lines = self._paragraph(pars[0], *args, **kwargs) - for p in pars[1:]: - lines.append("") - lines.extend(self._paragraph(p, *args, **kwargs)) - return lines - - def _print_wrapped(self, text, indent=0): - text = self._paragraphs(text, self.cwidth - indent) - print text.pop(0) - for t in text: - print " " * indent + t - - def _find_common(self, fl): - for o in self.copts: - if fl in o.lflags+o.sflags: - return o - assert False, fl - - def _compute_flags(self, opts, check_conflicts=True): - back = {} - sfl = "" - lfl = [] - for o in opts: - sapp = lapp = "" - if isinstance(o, OptionArg): - sapp, lapp = ":", "=" - for s in o.sflags: - if check_conflicts and back.has_key(s): - raise RuntimeError, "option conflict: %s" % s - back[s] = o - sfl += s[1:] + sapp - for l in o.lflags: - if check_conflicts and back.has_key(l): - raise RuntimeError, "option conflict: %s" % l - back[l] = o - lfl.append(l[2:] + lapp) - return sfl, lfl, back - - def _extract_command(self, args): - """ - Try to extract the command name from the argument list. This is - non-trivial because we want to allow command-specific options even - before the command itself. - """ - opts = self.gopts[:] - for cmd in self.ctable.values(): - opts.extend(cmd.opts) - sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) - - lopts,largs = getopt.getopt(args, sfl, lfl) - if not largs: - return None - return self._command(largs[0]) - - def _fancy_getopt(self, args, opts, state=None): - if state is None: - state= {} - for o in opts: - if not state.has_key(o.dest): - state[o.dest] = o.default - - sfl, lfl, back = self._compute_flags(opts) - try: - lopts,args = getopt.gnu_getopt(args, sfl, lfl) - except AttributeError: - # Before Python 2.3, there was no gnu_getopt support. - # So we can't parse intermixed positional arguments - # and options. - lopts,args = getopt.getopt(args, sfl, lfl) - - for o,v in lopts: - back[o].apply(state, v) - return state, args - - def _command(self, cmd): - if not self.ctable.has_key(cmd): - self.error("unknown command: '%s'" % cmd) - return self.ctable[cmd] - - def parse(self, args): - if not args: - self.print_small_help() - sys.exit(0) - - cmd = None - try: - cmd = self._extract_command(args) - opts = self.gopts[:] - if cmd: - opts.extend(cmd.opts) - args.remove(cmd.name) - state, args = self._fancy_getopt(args, opts) - except getopt.GetoptError, e: - self.error(e, cmd) - - # Handle builtins - if self.version is not None and state["version"]: - self.print_version() - sys.exit(0) - if state["help"]: # special case for --help - if cmd: - self.print_command_help(cmd) - sys.exit(0) - cmd = self.ctable["help"] - else: - if cmd is None: - self.error("command argument required") - if str(cmd) == "help": - cmd(*args) - sys.exit(0) - return cmd, args, state - - def error(self, s, cmd=None): - print >>sys.stderr, "%s: %s" % (self.progname, s) - if cmd is not None: - self.print_command_help(cmd) - else: - self.print_small_help() - sys.exit(1) - def print_small_help(self): - print "Type '%s help' for usage" % self.progname - def print_usage_line(self): - print "usage: %s <subcommand> [options...] [args...]\n" % self.progname - def print_command_list(self): - print "Available commands (use '%s help COMMAND' for more details):\n" \ - % self.progname - cmds = self.ctable.keys() - cmds.sort() - indent = max(map(len, cmds)) - for c in cmds: - h = self.ctable[c].short_help() - print " %-*s " % (indent, c), - self._print_wrapped(h, indent+6) - def print_command_help(self, cmd): - cmd = self.ctable[str(cmd)] - print 'usage: %s %s\n' % (self.progname, cmd.usage) - self._print_wrapped(cmd.help) - def print_opts(opts, self=self): - if not opts: return - flags = [o.repr_flags() for o in opts] - indent = max(map(len, flags)) - for f,o in zip(flags, opts): - print " %-*s :" % (indent, f), - self._print_wrapped(o.help, indent+5) - print '\nCommand options:' - print_opts(cmd.opts) - print '\nGlobal options:' - print_opts(self.gopts) - - def print_version(self): - print self.version - -############################################################################### -# Options and Commands description -############################################################################### - -global_opts = [ - Option("-F", "--force", - help="force operation even if the working copy is not clean, or " - "there are pending updates"), - Option("-n", "--dry-run", - help="don't actually change anything, just pretend; " - "implies --show-changes"), - Option("-s", "--show-changes", - help="show subversion commands that make changes"), - Option("-v", "--verbose", - help="verbose mode: output more information about progress"), - OptionArg("-u", "--username", - default=None, - help="invoke subversion commands with the supplied username"), - OptionArg("-p", "--password", - default=None, - help="invoke subversion commands with the supplied password"), - OptionArg("-c", "--config-dir", metavar="DIR", - default=None, - help="cause subversion commands to consult runtime config directory DIR"), -] - -common_opts = [ - Option("-b", "--bidirectional", - value=True, - default=False, - help="remove reflected and initialized revisions from merge candidates. " - "Not required but may be specified to speed things up slightly"), - OptionArg("-f", "--commit-file", metavar="FILE", - default="svnmerge-commit-message.txt", - help="set the name of the file where the suggested log message " - "is written to"), - Option("-M", "--record-only", - value=True, - default=False, - help="do not perform an actual merge of the changes, yet record " - "that a merge happened"), - OptionArg("-r", "--revision", - metavar="REVLIST", - default="", - help="specify a revision list, consisting of revision numbers " - 'and ranges separated by commas, e.g., "534,537-539,540"'), - OptionArg("-S", "--source", "--head", - default=None, - help="specify a merge source for this branch. It can be either " - "a working directory path, a full URL, or an unambiguous " - "substring of one of the locations for which merge tracking was " - "already initialized. Needed only to disambiguate in case of " - "multiple merge sources"), -] - -command_table = { - "init": (action_init, - "init [OPTION...] [SOURCE]", - """Initialize merge tracking from SOURCE on the current working - directory. - - If SOURCE is specified, all the revisions in SOURCE are marked as already - merged; if this is not correct, you can use --revision to specify the - exact list of already-merged revisions. - - If SOURCE is omitted, then it is computed from the "svn cp" history of the - current working directory (searching back for the branch point); in this - case, %s assumes that no revision has been integrated yet since - the branch point (unless you teach it with --revision).""" % NAME, - [ - "-f", "-r", # import common opts - OptionArg("-L", "--location-type", - dest="location-type", - default="path", - help="Use this type of location identifier in the new " + - "Subversion properties; 'uuid', 'url', or 'path' " + - "(default)"), - ]), - - "avail": (action_avail, - "avail [OPTION...] [PATH]", - """Show unmerged revisions available for PATH as a revision list. - If --revision is given, the revisions shown will be limited to those - also specified in the option. - - When svnmerge is used to bidirectionally merge changes between a - branch and its source, it is necessary to not merge the same changes - forth and back: e.g., if you committed a merge of a certain - revision of the branch into the source, you do not want that commit - to appear as available to merged into the branch (as the code - originated in the branch itself!). svnmerge will automatically - exclude these so-called "reflected" revisions.""", - [ - Option("-A", "--all", - dest="avail-showwhat", - value=["blocked", "avail"], - default=["avail"], - help="show both available and blocked revisions (aka ignore " - "blocked revisions)"), - "-b", - Option("-B", "--blocked", - dest="avail-showwhat", - value=["blocked"], - help="show the blocked revision list (see '%s block')" % NAME), - Option("-d", "--diff", - dest="avail-display", - value="diffs", - default="revisions", - help="show corresponding diff instead of revision list"), - Option("--summarize", - dest="avail-display", - value="summarize", - help="show summarized diff instead of revision list"), - Option("-l", "--log", - dest="avail-display", - value="logs", - help="show corresponding log history instead of revision list"), - "-r", - "-S", - ]), - - "integrated": (action_integrated, - "integrated [OPTION...] [PATH]", - """Show merged revisions available for PATH as a revision list. - If --revision is given, the revisions shown will be limited to - those also specified in the option.""", - [ - Option("-d", "--diff", - dest="integrated-display", - value="diffs", - default="revisions", - help="show corresponding diff instead of revision list"), - Option("-l", "--log", - dest="integrated-display", - value="logs", - help="show corresponding log history instead of revision list"), - "-r", - "-S", - ]), - - "rollback": (action_rollback, - "rollback [OPTION...] [PATH]", - """Rollback previously merged in revisions from PATH. The - --revision option is mandatory, and specifies which revisions - will be rolled back. Only the previously integrated merges - will be rolled back. - - When manually rolling back changes, --record-only can be used to - instruct %s that a manual rollback of a certain revision - already happened, so that it can record it and offer that - revision for merge henceforth.""" % (NAME), - [ - "-f", "-r", "-S", "-M", # import common opts - ]), - - "merge": (action_merge, - "merge [OPTION...] [PATH]", - """Merge in revisions into PATH from its source. If --revision is omitted, - all the available revisions will be merged. In any case, already merged-in - revisions will NOT be merged again. - - When svnmerge is used to bidirectionally merge changes between a - branch and its source, it is necessary to not merge the same changes - forth and back: e.g., if you committed a merge of a certain - revision of the branch into the source, you do not want that commit - to appear as available to merged into the branch (as the code - originated in the branch itself!). svnmerge will automatically - exclude these so-called "reflected" revisions. - - When manually merging changes across branches, --record-only can - be used to instruct %s that a manual merge of a certain revision - already happened, so that it can record it and not offer that - revision for merge anymore. Conversely, when there are revisions - which should not be merged, use '%s block'.""" % (NAME, NAME), - [ - "-b", "-f", "-r", "-S", "-M", # import common opts - ]), - - "block": (action_block, - "block [OPTION...] [PATH]", - """Block revisions within PATH so that they disappear from the available - list. This is useful to hide revisions which will not be integrated. - If --revision is omitted, it defaults to all the available revisions. - - Do not use this option to hide revisions that were manually merged - into the branch. Instead, use '%s merge --record-only', which - records that a merge happened (as opposed to a merge which should - not happen).""" % NAME, - [ - "-f", "-r", "-S", # import common opts - ]), - - "unblock": (action_unblock, - "unblock [OPTION...] [PATH]", - """Revert the effect of '%s block'. If --revision is omitted, all the - blocked revisions are unblocked""" % NAME, - [ - "-f", "-r", "-S", # import common opts - ]), - - "uninit": (action_uninit, - "uninit [OPTION...] [PATH]", - """Remove merge tracking information from PATH. It cleans any kind of merge - tracking information (including the list of blocked revisions). If there - are multiple sources, use --source to indicate which source you want to - forget about.""", - [ - "-f", "-S", # import common opts - ]), -} - - -def main(args): - global opts - - # Initialize default options - opts = default_opts.copy() - logs.clear() - - optsparser = CommandOpts(global_opts, common_opts, command_table, - version="%%prog r%s\n modified: %s\n\n" - "Copyright (C) 2004,2005 Awarix Inc.\n" - "Copyright (C) 2005, Giovanni Bajo" - % (__revision__, __date__)) - - cmd, args, state = optsparser.parse(args) - opts.update(state) - - source = opts.get("source", None) - branch_dir = "." - - if str(cmd) == "init": - if len(args) == 1: - source = args[0] - elif len(args) > 1: - optsparser.error("wrong number of parameters", cmd) - elif str(cmd) in command_table.keys(): - if len(args) == 1: - branch_dir = args[0] - elif len(args) > 1: - optsparser.error("wrong number of parameters", cmd) - else: - assert False, "command not handled: %s" % cmd - - # Validate branch_dir - if not is_wc(branch_dir): - if str(cmd) == "avail": - info = None - # it should be noted here that svn info does not error exit - # if an invalid target is specified to it (as is - # intuitive). so the try, except code is not absolutely - # necessary. but, I retain it to indicate the intuitive - # handling. - try: - info = get_svninfo(branch_dir) - except LaunchError: - pass - # test that we definitely targeted a subversion directory, - # mirroring the purpose of the earlier is_wc() call - if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": - error('"%s" is neither a valid URL, nor a working directory' % branch_dir) - else: - error('"%s" is not a subversion working directory' % branch_dir) - - # give out some hints as to potential pathids - PathIdentifier.hint(branch_dir) - if source: PathIdentifier.hint(source) - - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - - # Calculate source_url and source_path - report("calculate source path for the branch") - if not source: - if str(cmd) == "init": - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) - if not cf_source: - error('no copyfrom info available. ' - 'Explicit source argument (-S/--source) required.') - opts["source-url"] = get_repo_root(branch_dir) + cf_source - opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) - - if not opts["revision"]: - opts["revision"] = "1-" + cf_rev - else: - opts["source-pathid"] = get_default_source(branch_dir, branch_props) - opts["source-url"] = opts["source-pathid"].get_url() - - assert is_pathid(opts["source-pathid"]) - assert is_url(opts["source-url"]) - else: - # The source was given as a command line argument and is stored in - # SOURCE. Ensure that the specified source does not end in a /, - # otherwise it's easy to have the same source path listed more - # than once in the integrated version properties, with and without - # trailing /'s. - source = rstrip(source, "/") - if not is_wc(source) and not is_url(source): - # Check if it is a substring of a pathid recorded - # within the branch properties. - found = [] - for pathid in branch_props.keys(): - if pathid.match_substring(source): - found.append(pathid) - if len(found) == 1: - # (assumes pathid is a repository-relative-path) - source_pathid = found[0] - source = source_pathid.get_url() - else: - error('"%s" is neither a valid URL, nor an unambiguous ' - 'substring of a repository path, nor a working directory' - % source) - else: - source_pathid = PathIdentifier.from_target(source) - - source_pathid = PathIdentifier.from_target(source) - if str(cmd) == "init" and \ - source_pathid == PathIdentifier.from_target("."): - error("cannot init integration source path '%s'\n" - "Its repository-relative path must differ from the " - "repository-relative path of the current directory." - % source_pathid) - opts["source-pathid"] = source_pathid - opts["source-url"] = target_to_url(source) - - # Sanity check source_url - assert is_url(opts["source-url"]) - # SVN does not support non-normalized URL (and we should not - # have created them) - assert opts["source-url"].find("/..") < 0 - - report('source is "%s"' % opts["source-url"]) - - # Get previously merged revisions (except when command is init) - if str(cmd) != "init": - opts["merged-revs"] = merge_props_to_revision_set(branch_props, - opts["source-pathid"]) - - # Perform the action - cmd(branch_dir, branch_props) - - -if __name__ == "__main__": - try: - main(sys.argv[1:]) - except LaunchError, (ret, cmd, out): - err_msg = "command execution failed (exit code: %d)\n" % ret - err_msg += cmd + "\n" - err_msg += "".join(out) - error(err_msg) - except KeyboardInterrupt: - # Avoid traceback on CTRL+C - print "aborted by user" - sys.exit(1) diff --git a/extra/vim/urxvt-mouse.diff b/extra/vim/urxvt-mouse.diff deleted file mode 100644 index 9112e7ffd..000000000 --- a/extra/vim/urxvt-mouse.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/term.c b/src/term.c ---- a/src/term.c -+++ b/src/term.c -@@ -1996,6 +1996,7 @@ - # define HMT_DEC 4 - # define HMT_JSBTERM 8 - # define HMT_PTERM 16 -+# define HMT_URXVT 32 - static int has_mouse_termcode = 0; - # endif - -@@ -2031,6 +2032,11 @@ - has_mouse_termcode |= HMT_PTERM; - else - # endif -+# ifdef FEAT_MOUSE_URXVT -+ if (n == KS_URXVT_MOUSE) -+ has_mouse_termcode |= HMT_URXVT; -+ else -+# endif - has_mouse_termcode |= HMT_NORMAL; - # endif - } -@@ -2068,6 +2074,11 @@ - has_mouse_termcode &= ~HMT_PTERM; - else - # endif -+# ifdef FEAT_MOUSE_URXVT -+ if (n == KS_URXVT_MOUSE) -+ has_mouse_termcode &= ~HMT_URXVT; -+ else -+# endif - has_mouse_termcode &= ~HMT_NORMAL; - # endif - } diff --git a/extra/xfce4-xkb-plugin/crashfix.diff b/extra/xfce4-xkb-plugin/crashfix.diff deleted file mode 100644 index 5ccfbaa3c..000000000 --- a/extra/xfce4-xkb-plugin/crashfix.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001 -From: Lionel Le Folgoc <mrpouit@gmail.com> -Date: Fri, 24 Sep 2010 21:28:49 +0200 -Subject: Handle cases when the keyboard model is empty - -gtk_combo_box_get_active_iter () does not set the iter, and a call to -gtk_tree_model_get () using this iter will crash. Thus, check the return value -of gtk_combo_box_get_active_iter () before using the iter. ---- - panel-plugin/xkb-settings-dialog.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c -index 178ec5f..37a0a9a 100644 ---- a/panel-plugin/xkb-settings-dialog.c -+++ b/panel-plugin/xkb-settings-dialog.c -@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb) - gint i = 0; - - model = GTK_TREE_MODEL (xkb->combo_store); -- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter); -- gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); -- kbd_config->model = kbdmodel; -+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter)) -+ { -+ gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); -+ kbd_config->model = kbdmodel; -+ } - - model = GTK_TREE_MODEL (xkb->toggle_options_store); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter)) --- -1.7.1 - diff --git a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch deleted file mode 100644 index 5b9dc5401..000000000 --- a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c ---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200 -+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2009-07-20 18:40:34.000000000 +0300 -@@ -150,7 +150,7 @@ - config->application_map = g_hash_table_new (g_direct_hash, NULL); - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); - - config_item = xkl_config_item_new (); - -@@ -214,7 +214,7 @@ - - gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL); - -- xkl_engine_stop_listen (config->engine); -+ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE); - } - - gint -@@ -547,7 +547,7 @@ - if (!config) return NULL; - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); - - return registry; - } diff --git a/extra/xorg-server/xserver-1.11.2-record-crasher.patch b/extra/xorg-server/xserver-1.11.2-record-crasher.patch deleted file mode 100644 index 3af207bb9..000000000 --- a/extra/xorg-server/xserver-1.11.2-record-crasher.patch +++ /dev/null @@ -1,241 +0,0 @@ -From patchwork Tue Nov 8 18:22:13 2011 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: Save major/minor opcodes in ClientRec for RecordAReply -Date: Tue, 08 Nov 2011 18:22:13 -0000 -From: Keith Packard <keithp@keithp.com> -X-Patchwork-Id: 7866 -Message-Id: <1320776533-3120-1-git-send-email-keithp@keithp.com> -To: xorg-devel@lists.freedesktop.org - -The record extension needs the major and minor opcodes in the reply -hook, but the request buffer may have been freed by the time the hook -is invoked. Saving the request major and minor codes as the request is -executed avoids fetching from the defunct request buffer. - -This patch also eliminates the public MinorOpcodeOfRequest function, -making it static to dispatch. Usages of that function have been -replaced with direct access to the new ClientRec field. - -Signed-off-by: Keith Packard <keithp@keithp.com> -Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> - ---- -Here's what I was thinking of to fix this -- just record the major and -minor opcodes of the request in the ClientRec during Dispatch and then -using those fields in RecordAReply instead of fetching the discarded -request buffer. - -This is entirely untested; I don't know how to make the old code break. - - Xext/security.c | 4 +--- - Xext/xselinux_hooks.c | 4 ++-- - dix/dispatch.c | 31 ++++++++++++++++++++++--------- - dix/extension.c | 14 -------------- - include/dixstruct.h | 1 + - include/extension.h | 2 -- - record/record.c | 8 +++----- - 7 files changed, 29 insertions(+), 35 deletions(-) - -[ fedora: technically this is an ABI breaker since it's changing ClientRec, - but hopefully not in a way that matters. If it does matter, easiest thing - to do is have Record add a hook for XaceHookDispatch. - ajax ] - -diff --git a/Xext/security.c b/Xext/security.c -index 08d8158..b0d82ab 100644 ---- a/Xext/security.c -+++ b/Xext/security.c -@@ -148,9 +148,7 @@ SecurityLabelInitial(void) - static _X_INLINE const char * - SecurityLookupRequestName(ClientPtr client) - { -- int major = ((xReq *)client->requestBuffer)->reqType; -- int minor = MinorOpcodeOfRequest(client); -- return LookupRequestName(major, minor); -+ return LookupRequestName(client->majorOp, client->minorOp); - } - - -diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c -index f1d8e5d..0d4c9ab 100644 ---- a/Xext/xselinux_hooks.c -+++ b/Xext/xselinux_hooks.c -@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata, - if (client) { - REQUEST(xReq); - if (stuff) { -- major = stuff->reqType; -- minor = MinorOpcodeOfRequest(client); -+ major = client->majorOp; -+ minor = client->minorOp; - } - } - if (audit->id) -diff --git a/dix/dispatch.c b/dix/dispatch.c -index 6e33615..3600acd 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -337,7 +337,20 @@ DisableLimitedSchedulingLatency(void) - SmartScheduleLatencyLimited = 0; - } - --#define MAJOROP ((xReq *)client->requestBuffer)->reqType -+static inline unsigned short -+MinorOpcodeOfRequest(ClientPtr client) -+{ -+ unsigned char major; -+ ExtensionEntry *ext; -+ -+ major = ((xReq *)client->requestBuffer)->reqType; -+ if (major < EXTENSION_BASE) -+ return 0; -+ ext = GetExtensionEntry(major); -+ if (!ext) -+ return 0; -+ return ext->MinorOpcode (client); -+} - - void - Dispatch(void) -@@ -419,21 +432,23 @@ Dispatch(void) - } - - client->sequence++; -+ client->majorOp = ((xReq *)client->requestBuffer)->reqType; -+ client->minorOp = MinorOpcodeOfRequest(client); - #ifdef XSERVER_DTRACE -- XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP, -+ XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp, - ((xReq *)client->requestBuffer)->length, - client->index, client->requestBuffer); - #endif - if (result > (maxBigRequestSize << 2)) - result = BadLength; - else { -- result = XaceHookDispatch(client, MAJOROP); -+ result = XaceHookDispatch(client, client->majorOp); - if (result == Success) -- result = (* client->requestVector[MAJOROP])(client); -+ result = (* client->requestVector[client->majorOp])(client); - XaceHookAuditEnd(client, result); - } - #ifdef XSERVER_DTRACE -- XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, -+ XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp, - client->sequence, client->index, result); - #endif - -@@ -444,8 +459,8 @@ Dispatch(void) - } - else if (result != Success) - { -- SendErrorToClient(client, MAJOROP, -- MinorOpcodeOfRequest(client), -+ SendErrorToClient(client, client->majorOp, -+ client->minorOp, - client->errorValue, result); - break; - } -@@ -466,8 +481,6 @@ Dispatch(void) - SmartScheduleLatencyLimited = 0; - } - --#undef MAJOROP -- - static int VendorRelease = VENDOR_RELEASE; - static char *VendorString = VENDOR_NAME; - -diff --git a/dix/extension.c b/dix/extension.c -index c7bbac5..b677cdb 100644 ---- a/dix/extension.c -+++ b/dix/extension.c -@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client) - return ((xReq *)client->requestBuffer)->data; - } - --unsigned short --MinorOpcodeOfRequest(ClientPtr client) --{ -- unsigned char major; -- -- major = ((xReq *)client->requestBuffer)->reqType; -- if (major < EXTENSION_BASE) -- return 0; -- major -= EXTENSION_BASE; -- if (major >= NumExtensions) -- return 0; -- return (*extensions[major]->MinorOpcode)(client); --} -- - void - CloseDownExtensions(void) - { -diff --git a/include/dixstruct.h b/include/dixstruct.h -index 6cc9614..0a85f40 100644 ---- a/include/dixstruct.h -+++ b/include/dixstruct.h -@@ -122,6 +122,7 @@ typedef struct _Client { - - DeviceIntPtr clientPtr; - ClientIdPtr clientIds; -+ unsigned short majorOp, minorOp; - } ClientRec; - - /* -diff --git a/include/extension.h b/include/extension.h -index 29a11c3..9249951 100644 ---- a/include/extension.h -+++ b/include/extension.h -@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN - - extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/); - --extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); -- - extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); - - extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); -diff --git a/record/record.c b/record/record.c -index 68311ac..4a0fe23 100644 ---- a/record/record.c -+++ b/record/record.c -@@ -546,7 +546,7 @@ RecordARequest(ClientPtr client) - } - else /* extension, check minor opcode */ - { -- int minorop = MinorOpcodeOfRequest(client); -+ int minorop = client->minorOp; - int numMinOpInfo; - RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo; - -@@ -603,12 +603,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - RecordContextPtr pContext; - RecordClientsAndProtocolPtr pRCAP; - int eci; -- int majorop; - ReplyInfoRec *pri = (ReplyInfoRec *)calldata; - ClientPtr client = pri->client; -- REQUEST(xReq); - -- majorop = stuff->reqType; - for (eci = 0; eci < numEnabledContexts; eci++) - { - pContext = ppAllContexts[eci]; -@@ -616,6 +613,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - NULL); - if (pRCAP) - { -+ int majorop = client->majorOp; - if (pContext->continuedReply) - { - RecordAProtocolElement(pContext, client, XRecordFromServer, -@@ -635,7 +633,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - } - else /* extension, check minor opcode */ - { -- int minorop = MinorOpcodeOfRequest(client); -+ int minorop = client->minorOp; - int numMinOpInfo; - RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo; - assert (pMinorOpInfo); |