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 /staging | |
| parent | cdc66cc7110e78bf1197f9effc70422114f9341b (diff) | |
Sun Feb 5 17:25:01 UTC 2012
Diffstat (limited to 'staging')
508 files changed, 0 insertions, 34165 deletions
diff --git a/staging/abiword/PKGBUILD b/staging/abiword/PKGBUILD deleted file mode 100644 index 68ff94733..000000000 --- a/staging/abiword/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 146946 2012-01-19 14:59:03Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Maël Lavault <moimael@neuf.fr> - -pkgbase=abiword -pkgname=('abiword' 'abiword-plugins') -pkgver=2.8.6 -pkgrel=7 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.abisource.com" -makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' - 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup') -options=('!makeflags' '!libtool') -source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz" - 'compat_libwpg_0_9.patch' - 'abiword-2.8.6-no-undefined.patch' - 'abiword-2.8.6-libpng15.patch') -md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' - '09446a2ebba8288fc611e88f7cf17298' - '42e2614b6e0aad457d91f6ce20b6f225' - '40e370e7e88c5437140ef18037abfbd3') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" - # fix a gcc 4.6.x build issue, patch from Fedora - patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" - patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch" - - libtoolize --force - autoreconf - - ./configure --prefix=/usr \ - --enable-clipart \ - --enable-templates \ - --enable-collab-backend-xmpp \ - --enable-collab-backend-tcp \ - --enable-collab-backend-service \ - --disable-collab-backend-sugar \ - --enable-plugins --without-gnomevfs \ - --with-gio \ - --with-goffice \ - --disable-static \ - --with-psiconv-config=/nothere - make -} - -package_abiword() { - pkgdesc="A fully-featured word processor" - depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils') - install=$pkgname.install - optdepends=('abiword-plugins') - conflicts=("abiword-plugins<${pkgver}-${pkgrel}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i plugins/Makefile \ - -e 's/ collab / /' \ - -e 's/ wpg / /' \ - -e 's/ wmf / /' \ - -e 's/ grammar / /' \ - -e 's/ mathview / /' \ - -e 's/ aiksaurus / /' \ - -e 's/ latex / /' \ - -e 's/ ots / /' \ - -e 's/ wordperfect / /' - make DESTDIR="${pkgdir}" install -} - -package_abiword-plugins() { - pkgdesc="Additional plugins for Abiword" - depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' - 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') - - cd "${srcdir}/${pkgbase}-${pkgver}/plugins" - for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do - make -C ${dir} DESTDIR="${pkgdir}" install - done -} diff --git a/staging/abiword/abiword-2.8.6-libpng15.patch b/staging/abiword/abiword-2.8.6-libpng15.patch deleted file mode 100644 index 7eded4c83..000000000 --- a/staging/abiword/abiword-2.8.6-libpng15.patch +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ - -Fix build with png-1.5. - ---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2009-06-25 04:02:06.000000000 +0000 -+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp -@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap - - /* Clean Up Memory Used */ - -- FREEP(m_pPNGInfo->palette); -+ png_colorp palette; -+ int num_palette; -+ png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette ); -+ FREEP(palette); - DELETEP(pBB); - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - -@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P - UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) - { - /* Reset error handling for libpng */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - return UT_ERROR; -@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P - UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) - { - /* Reset error handling for libpng */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - return UT_ERROR; - -$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ - -Fix build with png-1.5. - ---- plugins/garble/xp/abiword-garble-png.cpp.orig 2009-09-05 15:34:44.000000000 +0000 -+++ plugins/garble/xp/abiword-garble-png.cpp -@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void* - png_set_strip_alpha( png_ptr ); - png_set_interlace_handling( png_ptr ); - png_set_bgr( png_ptr ); -- rowbytes = info_ptr->rowbytes; -+ rowbytes = png_get_rowbytes( png_ptr, info_ptr ); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - } - -$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $ - -Fix build with png-1.5. - ---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2009-07-01 04:02:04.000000000 +0000 -+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp -@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import - /** needed for the stejmp context */ - UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) - { -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - DELETEP(m_pPngBB); - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $ - -Fix build with png-1.5. - ---- src/af/util/xp/ut_png.cpp.orig 2008-02-24 03:33:07.000000000 +0000 -+++ src/af/util/xp/ut_png.cpp -@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL)); diff --git a/staging/abiword/abiword-2.8.6-no-undefined.patch b/staging/abiword/abiword-2.8.6-no-undefined.patch deleted file mode 100644 index c07000edb..000000000 --- a/staging/abiword/abiword-2.8.6-no-undefined.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am ---- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 -+++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 -@@ -107,7 +107,7 @@ - - AbiWord_LDFLAGS = \ - $(DEPS_LIBS) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic \ - -headerpad_max_install_names -@@ -129,7 +129,7 @@ - - abiword_LDFLAGS = \ - $(platform_ldflags) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic - diff --git a/staging/abiword/abiword.install b/staging/abiword/abiword.install deleted file mode 100644 index 2eaa60550..000000000 --- a/staging/abiword/abiword.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/abiword/compat_libwpg_0_9.patch b/staging/abiword/compat_libwpg_0_9.patch deleted file mode 100644 index cf36e188e..000000000 --- a/staging/abiword/compat_libwpg_0_9.patch +++ /dev/null @@ -1,371 +0,0 @@ -diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4 ---- abiword-2.8.6.orig//plugin-configure.m4 2010-06-13 14:17:27.000000000 -0700 -+++ abiword-2.8.6/plugin-configure.m4 2010-12-06 13:59:43.083048588 -0800 -@@ -794,7 +794,7 @@ - AC_SUBST([OPENXML_LIBS]) - - --wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" -+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -@@ -1497,8 +1497,8 @@ - AC_SUBST([EML_LIBS]) - - --wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' -+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4 ---- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 2010-05-30 07:50:46.000000000 -0700 -+++ abiword-2.8.6/plugins/wordperfect/plugin.m4 2010-12-06 13:59:53.929715254 -0800 -@@ -1,6 +1,6 @@ - --wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' -+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp ---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 13:06:11.000000000 -0800 -+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-06 13:59:53.926381921 -0800 -@@ -60,7 +60,7 @@ - - // Stream class - --#include <libwpd/WPXStream.h> -+#include <libwpd-stream/libwpd-stream.h> - - #include <gsf/gsf-input.h> - #include <gsf/gsf-infile.h> -@@ -70,12 +70,7 @@ - #include <libwps/libwps.h> - #endif - --class AbiWordperfectInputStream : --#ifdef HAVE_LIBWPS -- public WPSInputStream --#else -- public WPXInputStream --#endif -+class AbiWordperfectInputStream : public WPXInputStream - { - public: - AbiWordperfectInputStream(GsfInput *input); -@@ -86,7 +81,7 @@ - - virtual WPXInputStream * getDocumentOLEStream(const char * name); - -- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); -+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); - virtual int seek(long offset, WPX_SEEK_TYPE seekType); - virtual long tell(); - virtual bool atEOS(); -@@ -98,11 +93,7 @@ - }; - - AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : --#ifdef HAVE_LIBWPS -- WPSInputStream(), --#else -- WPXInputStream(true), --#endif -+ WPXInputStream(), - m_input(input), - m_ole(NULL) - { -@@ -117,9 +108,9 @@ - g_object_unref(G_OBJECT(m_input)); - } - --const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) -+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) - { -- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); -+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); - - if (buf == NULL) - numBytesRead = 0; -@@ -256,19 +247,12 @@ - { - AbiWordperfectInputStream gsfInput(input); - -- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); -+ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); - - switch (confidence) - { - case WPD_CONFIDENCE_NONE: -- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) -- // however, we'll let the text importer handle such cases -- case WPD_CONFIDENCE_POOR: - return UT_CONFIDENCE_ZILCH; -- case WPD_CONFIDENCE_LIKELY: -- return UT_CONFIDENCE_SOSO; -- case WPD_CONFIDENCE_GOOD: -- return UT_CONFIDENCE_GOOD; - case WPD_CONFIDENCE_EXCELLENT: - return UT_CONFIDENCE_PERFECT; - default: -@@ -328,7 +312,7 @@ - UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); -+ WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL); - - if (error != WPD_OK) - { -@@ -381,9 +365,9 @@ - float marginLeft = 1.0f, marginRight = 1.0f; - - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - - if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ - /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) -@@ -456,15 +440,15 @@ - float marginTop = 0.0f, marginBottom = 0.0f; - float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; - if (propList["fo:margin-top"]) -- marginTop = propList["fo:margin-top"]->getFloat(); -+ marginTop = propList["fo:margin-top"]->getDouble(); - if (propList["fo:margin-bottom"]) -- marginBottom = propList["fo:margin-bottom"]->getFloat(); -+ marginBottom = propList["fo:margin-bottom"]->getDouble(); - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - if (propList["fo:text-indent"]) -- textIndent = propList["fo:text-indent"]->getFloat(); -+ textIndent = propList["fo:text-indent"]->getDouble(); - - m_topMargin = marginTop; - m_bottomMargin = marginBottom; -@@ -487,7 +471,7 @@ - - float lineSpacing = 1.0f; - if (propList["fo:line-height"]) -- lineSpacing = propList["fo:line-height"]->getFloat(); -+ lineSpacing = propList["fo:line-height"]->getDouble(); - - UT_String tmpBuffer; - UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", -@@ -504,7 +488,7 @@ - propBuffer += tmpBuffer; - if (i()["style:position"]) - { -- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); -+ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); - propBuffer += tmpBuffer; - } - -@@ -640,9 +624,9 @@ - - // TODO: support spaceAfter - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - - if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) - m_bSectionChanged = true; -@@ -709,9 +693,9 @@ - if (propList["style:num-format"]) - listType = propList["style:num-format"]->getStr().cstr()[0]; - if (propList["text:space-before"]) -- listLeftOffset = propList["text:space-before"]->getFloat(); -+ listLeftOffset = propList["text:space-before"]->getDouble(); - if (propList["text:min-label-width"]) -- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); -+ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); - - if (!m_pCurrentListDefinition || - m_pCurrentListDefinition->getOutlineHash() != listID || -@@ -749,9 +733,9 @@ - if (propList["libwpd:level"]) - level = propList["libwpd:level"]->getInt(); - if (propList["text:space-before"]) -- listLeftOffset = propList["text:space-before"]->getFloat(); -+ listLeftOffset = propList["text:space-before"]->getDouble(); - if (propList["text:min-label-width"]) -- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); -+ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); - - if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) - { -@@ -871,10 +855,10 @@ - - UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) - + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) -- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); -+ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); - propBuffer += tempBuffer; - UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) -- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); -+ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); - propBuffer += tempBuffer; - - listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; -@@ -1263,7 +1247,7 @@ - virtual UT_Error _loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); -+ WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this)); - - if (error != WPS_OK) - { -@@ -1302,18 +1286,12 @@ - { - AbiWordperfectInputStream gsfInput(input); - -- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); -+ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); - - switch (confidence) - { - case WPS_CONFIDENCE_NONE: - return UT_CONFIDENCE_ZILCH; -- case WPS_CONFIDENCE_POOR: -- return UT_CONFIDENCE_POOR; -- case WPS_CONFIDENCE_LIKELY: -- return UT_CONFIDENCE_SOSO; -- case WPS_CONFIDENCE_GOOD: -- return UT_CONFIDENCE_GOOD; - case WPS_CONFIDENCE_EXCELLENT: - return UT_CONFIDENCE_PERFECT; - default: -diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h ---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 01:55:49.000000000 -0700 -+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-06 13:59:53.929715254 -0800 -@@ -30,13 +30,7 @@ - #define IE_IMP_WP_H - - #include <stdio.h> --#ifdef _WIN32 --#define POINT WPX_POINT --#endif - #include <libwpd/libwpd.h> --#ifdef _WIN32 --#undef POINT --#endif - #include "ie_imp.h" - #include "ut_string.h" - #include "ut_string_class.h" -@@ -98,7 +92,7 @@ - IE_Imp ** ppie); - }; - --class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl -+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface - { - public: - IE_Imp_WordPerfect(PD_Document * pDocument); -@@ -154,6 +148,21 @@ - virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} - virtual void closeTable(); - -+ virtual void definePageStyle(const WPXPropertyList&) {} -+ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} -+ virtual void defineCharacterStyle(const WPXPropertyList&) {} -+ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} -+ virtual void insertSpace() {} -+ virtual void insertField(const WPXString&, const WPXPropertyList&) {} -+ virtual void openComment(const WPXPropertyList&) {} -+ virtual void closeComment() {} -+ virtual void openTextBox(const WPXPropertyList&) {} -+ virtual void closeTextBox() {} -+ virtual void openFrame(const WPXPropertyList&) {} -+ virtual void closeFrame() {} -+ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} -+ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} -+ - - protected: - virtual UT_Error _loadFile(GsfInput * input); -diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4 ---- abiword-2.8.6.orig//plugins/wpg/plugin.m4 2010-05-30 07:50:46.000000000 -0700 -+++ abiword-2.8.6/plugins/wpg/plugin.m4 2010-12-06 13:59:53.929715254 -0800 -@@ -1,5 +1,5 @@ - --wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" -+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp ---- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 14:52:32.000000000 -0700 -+++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-06 13:59:53.923048588 -0800 -@@ -31,11 +31,10 @@ - #include <gsf/gsf-input-memory.h> - #include <gsf/gsf-input-stdio.h> - #include <gsf/gsf-infile-msole.h> --#include <libwpd/WPXStream.h> -+#include <libwpd-stream/libwpd-stream.h> - #include "xap_Module.h" - - using libwpg::WPGraphics; --using libwpg::WPGString; - - ABI_PLUGIN_DECLARE("WPG") - -@@ -48,7 +47,7 @@ - virtual bool isOLEStream(); - virtual WPXInputStream * getDocumentOLEStream(); - virtual WPXInputStream * getDocumentOLEStream(const char * name); -- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); -+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); - virtual int seek(long offset, WPX_SEEK_TYPE seekType); - virtual long tell(); - virtual bool atEOS(); -@@ -60,7 +59,7 @@ - }; - - AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : -- WPXInputStream(true), -+ WPXInputStream(), - m_input(input), - m_ole(NULL) - { -@@ -75,9 +74,9 @@ - g_object_unref(G_OBJECT(m_input)); - } - --const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) -+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) - { -- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); -+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); - - if (buf == NULL) - numBytesRead = 0; -@@ -245,10 +244,10 @@ - UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) - { - AbiWordPerfectGraphicsInputStream gsfInput(input); -- WPGString svgOutput; -+ WPXString svgOutput; - if (WPGraphics::generateSVG(&gsfInput, svgOutput)) - { -- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); -+ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); - UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); - g_object_unref(svgInput); - return result; diff --git a/staging/allegro/PKGBUILD b/staging/allegro/PKGBUILD deleted file mode 100644 index 3533ac18d..000000000 --- a/staging/allegro/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 146877 2012-01-19 02:37:38Z eric $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: arjan <arjan@archlinux.org> - -pkgname=allegro -pkgver=5.0.5 -pkgrel=2 -pkgdesc="Portable library mainly aimed at video game and multimedia programming" -arch=('i686' 'x86_64') -url="http://alleg.sourceforge.net/" -license=('custom') -depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') -makedepends=('cmake' 'mesa' 'freetype2') -source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz) -md5sums=('4d879afe7062f7dc9b8913cba2e44bdf') - -build() { - cd "${srcdir}" - mkdir build && cd build - - cmake "../${pkgname}-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWANT_DOCS=OFF - - make -} - -package() { - cd "${srcdir}"/build - - make DESTDIR="${pkgdir}" install - - install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/alsaplayer/PKGBUILD b/staging/alsaplayer/PKGBUILD deleted file mode 100644 index d723ee447..000000000 --- a/staging/alsaplayer/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 146875 2012-01-19 02:21:54Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=alsaplayer -pkgver=0.99.81 -pkgrel=3 -pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" -arch=('i686' 'x86_64') -url="http://www.alsaplayer.org/" -license=('GPL') -depends=('gcc-libs' 'desktop-file-utils') -makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen') -optdepends=('gtk2: for the gtk2 GUI interface' \ - 'libgl: for the OpenGL visual plugins' \ - 'jack: for JACK audio server output support' \ - 'audiofile: for support of various audio formats like AIFF, WAVE, .snd/.au' \ - 'libid3tag: for flac support' \ - 'flac: for flac support' \ - 'libmad: for MPEG support' \ - 'libsndfile: for sndfile support' \ - 'libvorbis: for ogg vorbis support' \ - 'libmikmod: for mod, s3m, it and xm formats supports') -options=('!libtool') -install=alsaplayer.install -source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-audiofile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/alsaplayer/alsaplayer.install b/staging/alsaplayer/alsaplayer.install deleted file mode 100644 index e111ef946..000000000 --- a/staging/alsaplayer/alsaplayer.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/amule/PKGBUILD b/staging/amule/PKGBUILD deleted file mode 100644 index 22280b542..000000000 --- a/staging/amule/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 146942 2012-01-19 13:36:15Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Henrik Ronellenfitsch <searinox@web.de> -# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> -# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> - -pkgname=amule -pkgver=10708 -pkgrel=2 -pkgdesc="An eMule-like client for ed2k p2p network" -arch=('i686' 'x86_64') -url="http://www.amule.org" -license=('GPL') -depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') -source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3') - -build() { - cd "${srcdir}/aMule-SVN-r${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-cas \ - --enable-wxcas \ - --enable-amule-daemon \ - --enable-amulecmd \ - --enable-amule-gui \ - --enable-alc \ - --enable-alcc \ - --enable-webserver \ - --disable-debug \ - --enable-optimize \ - --enable-ccache \ - --enable-geoip \ - --enable-upnp - - make -} - -package() { - cd "${srcdir}/aMule-SVN-r${pkgver}" - - make DESTDIR=${pkgdir}/ install -} diff --git a/staging/apr-util/PKGBUILD b/staging/apr-util/PKGBUILD deleted file mode 100644 index c5f9410df..000000000 --- a/staging/apr-util/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 145823 2012-01-02 11:42:51Z pierre $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=apr-util -pkgver=1.3.12 -pkgrel=5 -pkgdesc="The Apache Portable Runtime" -arch=('i686' 'x86_64') -url="http://apr.apache.org/" -depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') -options=('!libtool') -license=('APACHE') -source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('0f671b037ca62751a8a7005578085560') - -build() { - cd "${srcdir}/apr-util-${pkgver}" - ./configure --prefix=/usr --with-apr=/usr \ - --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ - --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap - make -} - -package() { - cd "${srcdir}/apr-util-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/at-spi/PKGBUILD b/staging/at-spi/PKGBUILD deleted file mode 100644 index 8cb6c20e9..000000000 --- a/staging/at-spi/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 147108 2012-01-22 10:16:03Z andyrtr $ -# Maintainer: Jan de Groot <jan@archlinux.org> - -pkgname=at-spi -pkgver=1.32.0 -pkgrel=5 -pkgdesc="Assistive Technology Service Provider Interface" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libbonobo' 'libxtst' 'gtk2' 'gconf') -makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=at-spi.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039') - -# !! make sure you 'pacman -Rsc python' from your chroot before building the package or it would use python3 instead of the wanted python2 !! - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/at-spi \ - --enable-relocate - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain at-spi "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/staging/at-spi/at-spi.install b/staging/at-spi/at-spi.install deleted file mode 100644 index b4c75b51c..000000000 --- a/staging/at-spi/at-spi.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=at-spi - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/staging/autopano-sift-c/PKGBUILD b/staging/autopano-sift-c/PKGBUILD deleted file mode 100644 index 35f76e38a..000000000 --- a/staging/autopano-sift-c/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 146969 2012-01-19 19:16:11Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> - -pkgname=autopano-sift-c -pkgver=2.5.1 -pkgrel=3 -pkgdesc="Identify key feature points within arbitrary images" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('GPL2') -depends=('libxml2' 'libpano13' 'gcc-libs') -makedepends=('cmake') -provides=('autopano-sift') -conflicts=('autopano-sift') -replaces=('autopano-sift') -source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz) -md5sums=('b9bade07e8c4f2ea383c22a082c260e0') - -build() { - cd "${srcdir}/autopano-sift-C-${pkgver}" - cmake -DCMAKE_INSTALL_PREFIX=/usr . - sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt - make -} - -package() { - cd "${srcdir}/autopano-sift-C-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/avahi/PKGBUILD b/staging/avahi/PKGBUILD deleted file mode 100644 index b917e9248..000000000 --- a/staging/avahi/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 147194 2012-01-24 04:55:03Z bisson $ -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=avahi -pkgver=0.6.30 -pkgrel=7 -pkgdesc='A multicast/unicast DNS-SD framework' -arch=('i686' 'x86_64') -url='http://www.avahi.org/' -license=('LGPL') -depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') -optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' - 'gtk2: gtk2 bindings' - 'qt3: qt3 bindings' - 'qt: qt bindings' - 'pygtk: avahi-bookmarks, avahi-discover' - 'twisted: avahi-bookmarks' - 'mono: mono bindings' - 'dbus-python: avahi-discover' - 'nss-mdns: NSS support for mDNS') -makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' - 'gtk-sharp-2' 'gobject-introspection' 'gtk3') -backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) -install=install -conflicts=('howl' 'mdnsresponder') -provides=('howl' 'mdnsresponder') -replaces=('howl' 'mdnsresponder') -options=('!libtool') -source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'gnome-nettool.png' - 'rc.d.patch') -sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' - 'cf56387c88aed246b9f435efc182ef44de4d52f3' - '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i "../rc.d.patch" - - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ - PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-xmltoman \ - --enable-compat-libdns_sd \ - --enable-compat-howl \ - --with-distro=archlinux \ - --with-avahi-priv-access-group=network \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png - - cd "${pkgdir}" - sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} - # howl and mdnsresponder compatability - (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) - (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) -} diff --git a/staging/avahi/gnome-nettool.png b/staging/avahi/gnome-nettool.png Binary files differdeleted file mode 100644 index 227d0678a..000000000 --- a/staging/avahi/gnome-nettool.png +++ /dev/null diff --git a/staging/avahi/install b/staging/avahi/install deleted file mode 100644 index 7c75c3dd4..000000000 --- a/staging/avahi/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null - getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null - - cat <<EOF -==> The following daemons may be added to DAEMONS in /etc/rc.conf: -==> avahi-daemon: the mdns responder, you probably want this. -==> dbus needs to be running when you start it. -==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns -==> configuration on dhcp-less networks. - -==> To use some of the client applications you will have to install python. -==> In addition, pygtk is required for the graphical ones and -==> twisted for avahi-bookmarks. -EOF -} - -post_remove() { - getent passwd avahi &>/dev/null && userdel avahi >/dev/null - getent group avahi &>/dev/null && groupdel avahi >/dev/null -} diff --git a/staging/avahi/rc.d.patch b/staging/avahi/rc.d.patch deleted file mode 100644 index fd735734b..000000000 --- a/staging/avahi/rc.d.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in ---- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 -+++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 -@@ -33,6 +33,7 @@ - - case "$1" in - start) -+ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } - stat_busy "Starting $DESC" - $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then diff --git a/staging/bmp/0.9.7.1-visualization.patch b/staging/bmp/0.9.7.1-visualization.patch deleted file mode 100644 index ac03323f6..000000000 --- a/staging/bmp/0.9.7.1-visualization.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- beep/vis.c 2004-12-04 10:04:29.000000000 +0100 -+++ beep/vis.c 2005-02-17 12:02:25.391044008 +0100 -@@ -223,7 +223,8 @@ vis_draw(Widget * w) - /* FIXME: The check "shouldn't" be neccessary? */ - /* if (GTK_IS_WINDOW(vis->vs_window)) { */ - GDK_THREADS_ENTER(); -- gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, -+ if (GDK_IS_DRAWABLE(vis->vs_window)) -+ gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, - vis->vs_widget.x, vis->vs_widget.y, - vis->vs_widget.width, vis->vs_widget.height, - GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data, diff --git a/staging/bmp/PKGBUILD b/staging/bmp/PKGBUILD deleted file mode 100644 index 028372325..000000000 --- a/staging/bmp/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 147143 2012-01-23 05:18:22Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> - -pkgname=bmp -pkgver=0.9.7.1 -pkgrel=9 -pkgdesc="gtk2 port of xmms" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/beepmp/" -license=('GPL') -depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') -makedepends=('libxt') -options=('!libtool') -install=bmp.install -source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ - ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) -md5sums=('c25d5a8d49cc5851d13d525a20023c4c' - 'fa1bdf5a8d03e8539a6bed5caa471176' - '42ad4109ddb66024d4c6d1f3e572ab86') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../${pkgver}-visualization.patch - patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch - LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch deleted file mode 100644 index 4c1e46da9..000000000 --- a/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch +++ /dev/null @@ -1,108 +0,0 @@ -Patch taken from xmms-crossfade 3.10 tarball. Required for crossfade to -work. http://www.eisenlohr.org/xmms-crossfade/ - -diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c ---- bmp-0.9.7.1/beep/mainwin.c 2005-05-09 10:45:39.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/mainwin.c 2005-11-25 00:03:59.000000000 +0100 -@@ -655,9 +655,11 @@ - mainwin_set_shade(!cfg.player_shaded); - } - -+gboolean is_quitting = FALSE; - void - mainwin_quit_cb(void) - { -+ is_quitting = TRUE; - gtk_widget_hide(equalizerwin); - gtk_widget_hide(playlistwin); - gtk_widget_hide(mainwin); -@@ -1318,7 +1320,7 @@ - change_song(guint pos) - { - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - playlist_set_position(pos); - bmp_playback_initiate(); -diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c ---- bmp-0.9.7.1/beep/playback.c 2005-01-26 06:56:15.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.c 2005-11-25 00:03:59.000000000 +0100 -@@ -89,7 +89,7 @@ - return; - - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - vis_clear_data(mainwin_vis); - vis_clear_data(playlistwin_vis); -@@ -135,6 +135,15 @@ - get_current_input_plugin()->pause(ip_data.paused); - } - -+gboolean input_stopped_for_restart = FALSE; -+void -+bmp_playback_stop_for_restart(void) -+{ -+ input_stopped_for_restart = TRUE; -+ bmp_playback_stop(); -+ input_stopped_for_restart = FALSE; -+} -+ - void - bmp_playback_stop(void) - { -diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h ---- bmp-0.9.7.1/beep/playback.h 2004-12-04 10:04:26.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.h 2005-11-25 00:03:59.000000000 +0100 -@@ -26,6 +26,7 @@ - void bmp_playback_initiate(void); - void bmp_playback_pause(void); - void bmp_playback_stop(void); -+void bmp_playback_stop_for_restart(void); - gboolean bmp_playback_play_file(const gchar * filename); - gboolean bmp_playback_get_playing(void); - gboolean bmp_playback_get_paused(void); -diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c ---- bmp-0.9.7.1/beep/playlist.c 2005-08-11 09:25:51.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/playlist.c 2005-11-25 00:03:59.000000000 +0100 -@@ -817,7 +817,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -868,7 +868,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1018,7 +1018,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1047,7 +1047,10 @@ - { - GList *plist_pos_list; - -- bmp_playback_stop(); -+ if (cfg.repeat) -+ bmp_playback_stop_for_restart(); -+ else -+ bmp_playback_stop(); - - PLAYLIST_LOCK(); - plist_pos_list = find_playlist_position_list(); diff --git a/staging/bmp/bmp.install b/staging/bmp/bmp.install deleted file mode 100644 index 2eaa60550..000000000 --- a/staging/bmp/bmp.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/bogofilter/PKGBUILD b/staging/bogofilter/PKGBUILD deleted file mode 100644 index 12b842168..000000000 --- a/staging/bogofilter/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 145934 2012-01-04 12:24:40Z pierre $ -# 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/staging/cairo/PKGBUILD b/staging/cairo/PKGBUILD deleted file mode 100644 index 37aac6a2f..000000000 --- a/staging/cairo/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 146832 2012-01-18 20:00:38Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Brice Carpentier <brice@daknet.org> - -pkgname=cairo -pkgver=1.10.2 -pkgrel=3 -pkgdesc="Cairo vector graphics library" -arch=(i686 x86_64) -license=('LGPL' 'MPL') -url="http://cairographics.org/" -depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh') -options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz - cairo-1.10.0-buggy_gradients.patch) -sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e' - '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-tee - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/cairo/cairo-1.10.0-buggy_gradients.patch b/staging/cairo/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index 368e356d3..000000000 --- a/staging/cairo/cairo-1.10.0-buggy_gradients.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200
-+++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200
-@@ -353,11 +353,7 @@
- /* Prior to Render 0.10, there is no protocol support for gradients and
- * we call function stubs instead, which would silently consume the drawing.
- */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
- display->buggy_gradients = TRUE;
--#else
-- display->buggy_gradients = FALSE;
--#endif
- display->buggy_pad_reflect = FALSE;
- display->buggy_repeat = FALSE;
diff --git a/staging/cairomm/PKGBUILD b/staging/cairomm/PKGBUILD deleted file mode 100644 index d8c952616..000000000 --- a/staging/cairomm/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147110 2012-01-22 10:23:49Z andyrtr $ -# Maintainer: Kevin <kevin@archlinux.org> -# Contributor: criminy <criminy@gmail.com> - -pkgname=cairomm -pkgver=1.10.0 -pkgrel=2 -pkgdesc="C++ bindings to Cairo vector graphics library" -arch=('i686' 'x86_64') -url="http://www.cairographics.org" -license=('LGPL' 'MPL') -depends=('cairo' 'libsigc++') -makedepends=('pkgconfig') -source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz) -options=('!libtool' '!emptydirs') -sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/capi4hylafax/PKGBUILD b/staging/capi4hylafax/PKGBUILD deleted file mode 100644 index 5f5adc139..000000000 --- a/staging/capi4hylafax/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 147956 2012-01-29 03:57:58Z eric $ -#Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=capi4hylafax -pkgver=010300 -pkgrel=5 -pkgdesc="capi plugin for hylafax to enable isdn faxing" -arch=(i686 x86_64) -url="ftp://ftp.avm.de/tools" -license=('GPL') -depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog') -source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz - config.faxCAPI capi4hylafax.rc) -md5sums=('d37dc652ac80d1525ef8693be55ee67f' - '653b60695d21c128f020a86274ca9192' - '1fe40c58289fa3ba625ce6fe2fdb3d07') -install=capi4hylafax.install -backup=(var/spool/hylafax/etc/config.faxCAPI) - -build() { - cd "$srcdir"/$pkgname-01.03.00 -# fix config file - sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in - autoreconf --force --install - ./configure - make -} - -package() { - cd "$srcdir"/$pkgname-01.03.00 - install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend - install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv - install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem - install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI - install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax -# adding FIFO - mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI - chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI - chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI - chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI -# fix /var/spool/hylafax permission - chown 10 "$pkgdir"/var/spool/hylafax - chgrp 14 "$pkgdir"/var/spool/hylafax -# adding udev rule - mkdir -p "$pkgdir"/lib/udev/rules.d -cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules -# CAPI devices -SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp" -SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp" - -EOF -# fix c2faxadd - sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem - echo "main_config_dialog" >> "$pkgdir"/usr/bin/c2faxaddmodem -} diff --git a/staging/capi4hylafax/capi4hylafax.install b/staging/capi4hylafax/capi4hylafax.install deleted file mode 100644 index 20c2d8f63..000000000 --- a/staging/capi4hylafax/capi4hylafax.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { -cat << EOF -For more information about setting up the package, please have a look here: -"http://wiki.archlinux.org/index.php/capi4hylafax" -EOF -} - -post_upgrade() { - post_install $1 -} - -post_remove() { -cat << EOF -Please remove your additions to /var/spool/hylafax/etc/config -EOF -} diff --git a/staging/capi4hylafax/capi4hylafax.rc b/staging/capi4hylafax/capi4hylafax.rc deleted file mode 100755 index 51025b020..000000000 --- a/staging/capi4hylafax/capi4hylafax.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/c2faxrecv` -case "$1" in - start) - stat_busy "Starting capi4hylafax" - if [ -z "$PID" ]; then - /usr/bin/c2faxrecv > /dev/null & - faxmodem faxCAPI - fi - if [ ! -f /var/run/faxq.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -f /var/run/hfaxd.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon capi4hylafax - stat_done - fi - ;; - stop) - stat_busy "Stopping capi4hylafax" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon capi4hylafax - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/capi4hylafax/config.faxCAPI b/staging/capi4hylafax/config.faxCAPI deleted file mode 100644 index b2137757a..000000000 --- a/staging/capi4hylafax/config.faxCAPI +++ /dev/null @@ -1,397 +0,0 @@ -# -# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP -# - -# Grundstzliches: -# - Es gibt fr jeden Wert einen Standardzustand (default), sodass jede Zeile -# der Datei oder auch das komplette Configfile ausgelassen werden kann. -# - Es gibt ausschlielich ein Configfile, in dem alle ntigen Angaben fr -# "c2faxsend/-receive" eingetragen werden knnen. -# - Werden fr HylaFAX mehrere virtuelle Gerte (devices) angelegt, muss es -# fr jedes Device ein Configfile im Format config.[DeviceName] geben. -# Dessen Existenz wird von HylaFAX berprft. Ohne dieses File kann die -# Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer -# solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile -# oder ein minimales "dummy"-ConfigFile nachgewiesen werden. -# -# Basics: -# - There is a default condition for each value, such that each line of the -# file or the complete configfile can be left out. -# - There is only one configfile in which all information required for -# "c2faxsend/-receive" can be entered. -# - If multiple virtual devices are created for HylaFAX, there must be a -# Configfile in the format config.[DeviceName] for each device. HylaFAX -# checks that this file exists. Without this file, it is not possible to -# start working with the device. The easiest way to establish the existence -# of such a file is to create a link to this ConfigFile or a minimum -# "dummy" ConfigFile. - - -# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die -# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die -# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb -# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert. -# -# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX- -# compatible operation or in which received faxes are to be saved in -# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in -# the directory $(SpoolDir)/recvq. -# -# default /var/spool/hylafax -# -SpoolDir: /var/spool/hylafax - - -# "FaxRcvdCmd" gibt das Skript an, das ausgefhrt wird, sobald ein Fax -# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter -# bergeben als fr HylaFAX (mehr dazu im sample_faxrcvd). -# -# "FaxRcvdCmd" indicates the script performed whenever a fax is -# received. Parameters other than the ones for HylaFAX are returned in -# stand-alone operation (see sample_faxrcvd for more information). -# -# default /var/spool/hylafax/bin/faxrcvd -# -FaxRcvdCmd: /var/spool/hylafax/bin/faxrcvd - - -# "PollRcvdCmd" gibt das Skript an, das ausgefhrt wird, sobald ein -# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden -# andereParameter bergeben als fr HylaFAX (mehr dazu im -# sample_faxrcvd). -# -# "PollRcvdCmd" indicates the script performed whenever a fax was -# received by fax polling. Parameters other than the ones for HylaFAX -# are returned in stand-alone operation (see sample_faxrcvd for more -# information). -# -# default /var/spool/hylafax/bin/pollrcvd -# -PollRcvdCmd: /var/spool/hylafax/bin/pollrcvd - - -# "FaxReceiveUser" ist der User, als der c2faxrecv ausgefhrt wird. -# Die nderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte -# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag -# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp" -# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von -# /dev/capi20 nicht gendert werden sollen oder Ihre Linux-Distribution einen -# anderen User voraussetzt. -# -# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be -# changed only by the Superuser or "root" user. If c2faxrecv is started by -# another user, this entry will be ignored. Here it is a good idea to enter a -# value other than the hylafax default value "uucp", for instance, if the -# rights of /dev/capi20 are not to be changed or your Linux distribution -# requires another user. -# -# default "" -# -FaxReceiveUser: uucp -FaxReceiveGroup: uucp - - -# Im "LogFile" werden Informationen ber den Faxablauf abgespeichert. -# -# Information about the order of events in faxing are saved in the "LogFile". -# -# default "" -# -LogFile: /var/spool/hylafax/log/capi4hylafax - - -# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile -# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles. -# -# The "LogTraceLevel" command indicates the amount of data written in a -# LogFile. The range goes from 0 = nothing to 4 = many. -# -# default 0 -# -LogTraceLevel: 0 - - -# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade -# erwhnte LogFile als auch die LogFiles fr HylaFAX angelegt werden. -# -# "LogFileMode" is the mode, on the basis of which both the LogFile just -# mentioned and the LogFiles for HylaFAX are generated. -# -# default 0600 -# -LogFileMode: 0600 - - -# Die geschweiften Klammern geben Anfang und Ende einer Section an. -# Jede Section darf eine oder mehrere SubSections enthalten. -# SubSubSections sind nicht erlaubt. -# Dabei enthlt die Section Angaben zu einem virtuellen Device; -# die Subsection die Angaben fr die Rufannahme jedes Controllers. -# Es knnen beliebig viele Sections und, darin enthalten, jeweils beliebig -# viele Subsections erzeugt werden. -# Jede Section muss aber einen anderen HylafaxDeviceName erhalten; -# zustzlich muss in jeder Subsection innerhalb einer Section ein anderer -# Controller aufgefhrt werden. Beim Stand-Alone-Betrieb ist eine Section mit -# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die -# virtuellen DeviceNamen keine Rolle spielen. -# -# The curved brackets indicate the beginning and end of a section. -# Each section may contain one or more subsections. -# SubSubSections are not permitted. -# The section contains information about a virtual device; the subsection the -# call acceptance information for each controller. -# Any number of sections containing any number of subsections may be -# generated, but each section must receive a different HylafaxDeviceName; and -# a different controller must be listed in every subsection within a section. -# For stand-alone operation, it is sufficient to have just one section with -# as many subsections as required, since virtual DeviceNames do not play -# any role in this mode of operation. -# -{ - - # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als - # "virtuelles Modem" anmeldet. Sollen fr HylaFAX mehrere dieser "Modems" - # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen - # HylafaxDeviceName an. - # - # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as - # a "virtual modem". If multiple "modems" are to be generated for HylaFAX, - # simply create a new section with another HylafaxDeviceName. - # - # default faxCAPI - # - HylafaxDeviceName: faxCAPI - - - # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert - # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.) - # festgelegt. - # - # "RecvFileMode" is the mode, in which received faxes are saved. User and - # Group of the file are determined by the FaxReceiveUser (see above). - # - # default 0600 - # - RecvFileMode: 0600 - - - # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite - # mitgeteilt (sichtbar z. B. im Fax-Journal). - # - # "FAXNumber" is the fax number of the computer itself and is transmitted - # to the remote site (visible in the Fax Journal). - # - # default "" - # - FAXNumber: +49.00.00000 - - - # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der - # Kopfzeile. Ein leerer Eintrag fhrt dazu, dass keine Fax-Kopfzeile - # eingefgt wird. - # - # "LocalIdentifier" is the part of the fax header which can be configured - # from CAPI. An empty entry specifies an empty header. - # - # default "" - # - LocalIdentifier: "AVM CAPI4HylaFAX" - - - # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann - # durch "MaxConcurrentRecvs" angepat werden. Diese Anzahl wird - # durch die Anzahl der durch die Hardware zur Verfgung - # gestellten B-Kanle begrenzt. - # - # The maximum number of faxes that can be received at the same - # time can be adjusted using "MaxConcurrentRecvs". This number - # is limited by the number of B channels provided by the hardware. - # - # default 2 - # - MaxConcurrentRecvs: 2 - - - # ----------- outgoing params ----------- - - # "OutgoingController" gibt den Controller an, ber den eine externe - # Verbindung aufgebaut werden soll. - # - # "OutgoingController" indicates the controller which is to be used to - # establish an external connection. - # - # default 1 - # - OutgoingController: 1 - - - # Die "OutgoingMSN" ist die MSN, die fr ausgehenden Faxe benutzt wird. - # - # The "OutgoingMSN" is the MSN used for outgoing faxes. - # - # default "" - # - OutgoingMSN: - - - # CLIR (Rufnummernunterdrckung) kann ber "SuppressMSN" und den Wert (0) - # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden. - # - # CLIR (Calling Line Identification Restriction) can be switched off using - # the value (0) or switched back on by entering the value (1). - # - # default 0 - # - SuppressMSN: 0 - - - # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei - # Nebenstellenanlagen wichtig, bei denen fr den Aufbau einer externen - # Verbindung eine Ziffer vorgewhlt werden muss. - # - # "NumberPrefix" is set to precede each telephone number. This is - # important for PBX systems which require that a number be dialed to - # obtain an outside line. - # - # default "" - # - NumberPrefix: - - - # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf - # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz - # Audio-Verbindung hergestellt. - # - # When in "UseISDNFaxService" the value is = 1, an outoing call will be - # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz - # audio connection is established. - # - # default 0 - # - UseISDNFaxService: 0 - - - # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die - # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die - # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des - # Wertes 0 nutzt die gesamte Wartezeit. - # - # The duration in seconds you wait for the remote site to accept your - # outgoing call In this way you do not have to use the entire ringing - # duration preset by the telephone company. The default value 0 uses the - # entire ringing duration. - # - # default 0 - # - RingingDuration: 0 - - - # ----------- incoming params ----------- - { - - # Controller, fr den diese Subsection gilt. - # - # Controller for which this subsection is valid. - # - # default 1 - # - Controller: 1 - - - # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung - # "Sprache" angenommen. - # - # If "AcceptSpeech" is set to 1, the service indicator "Voice" also - # will be accepted. - # - # default 0 - # - AcceptSpeech: 1 - - - # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen. - # - # If DDI is to be used, "UseDDI" should be set to a value of 1. - # - # default 0 - # - UseDDI: 0 - - - # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen. - # Der Standardwert fhrt zu keinem korrekten Ergebnis und - # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer - # verndert werden. - # - # "DDIOffset" indicates the DDI offset number which precedes - # extension number. Because the default value can't guarantee - # a correct result, this value should be modified whenever - # "UseDDI" is set to 1. - # - # default "" - # - DDIOffset: "12345" - - - # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern - # werden lediglich als Teil der Empfngernummer mitgeteilt.) Der - # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst - # werden. - # - # "DDILength" indicates the number of digits in the extension. (These - # numbers are only used as a component of the recipient's number.) The - # default value should be adapted whenever DDI is used. - # - # default 0 - # - DDILength: 3 - - - # Bei "IncomingDDIs" knnen in einer durch Komma getrennten Liste alle - # Durchwahlziffern (DDIs) angegeben werden, fr die Rufe angenommen - # werden sollen. Eine Bereichsangabe ist auch mglich (z.B. 100-300), - # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind. - # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert. - # - # In "IncomingDDIs", all extension numbers (DDIs) for which calls are - # to be accepted may be listed, separated by commas. It is also - # possible to specify a range (e.g. 100-300); here no open ranges are - # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the - # parameters for DDILength will be ignored. - # - # default "" - # - IncomingDDIs: - - - # Bei "IncomingMSNs" knnen in einer durch Komma getrennten Liste alle - # MSNs angegeben werden, fr die Rufe angenommen werden sollen. Ist - # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und - # eventuell "Sprache" angenommen. - # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert. - # - # In "IncomingMSNs", all MSNs for which calls are to be accepted may - # be listed, separated by commas. When the list is empty, all calls - # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice". - # When "UseDDI" is set to 1, "IncomingMSNs" is ignored. - # - # default "" - # - IncomingMSNs: - - - # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne - # Zielrufnummer (ohne MSN) angenommen. - # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer - # senden. - # - # If "AcceptGlobalCall" is set to 1, calls without Called Party - # Number also will be accepted. - # Needed on internal ports of some PBX. - # - # default 1 - # - AcceptGlobalCall: 1 - } -} - diff --git a/staging/celestia/PKGBUILD b/staging/celestia/PKGBUILD deleted file mode 100644 index 495903615..000000000 --- a/staging/celestia/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 146981 2012-01-19 21:57:20Z giovanni $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor : Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=celestia -pkgver=1.6.1 -pkgrel=2 -pkgdesc="Real-time space simulation" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.shatters.net/celestia/" -depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg') -options=('!makeflags') -source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" - 'celestia-1.6.1-gcc46.patch' - 'celestia-1.6.1-libpng15.patch' - 'celestia-1.6.1-linking.patch') -sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' - '7c08ca391603806d788cb8f3342acedafc924eef' - '46ecc4e10b24191384bc848c206652498843adf0' - '534c8eee18d13a868c91f0b870ebecc05f3e7ae1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # build patch - patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch" - patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch" - patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch" - - # This version of Celestia has a bug in the font rendering and requires -fsigned-char - export CFLAGS="$CFLAGS -fsigned-char" - export CXXFLAGS="$CXXFLAGS -fsigned-char" - - autoreconf - ./configure --prefix=/usr \ - --with-lua=/usr \ - --datadir=/usr/share \ - --with-gtk \ - --disable-rpath \ - --with-lua - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} - diff --git a/staging/celestia/celestia-1.5.1-gcc44.patch b/staging/celestia/celestia-1.5.1-gcc44.patch deleted file mode 100644 index b1ee896f0..000000000 --- a/staging/celestia/celestia-1.5.1-gcc44.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400 -+++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400 -@@ -10,6 +10,7 @@ - #ifndef _OVERLAY_H_ - #define _OVERLAY_H_ - -+#include <cstdio> - #include <string> - #include <iostream> - #include <celtxf/texturefont.h> ---- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400 -+++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400 -@@ -8,6 +8,7 @@ - // of the License, or (at your option) any later version. - - #include <celmath/mathlib.h> -+#include <cstdio> - #include <cstring> - #include <cassert> - #include "celestia.h" diff --git a/staging/celestia/celestia-1.6.1-gcc46.patch b/staging/celestia/celestia-1.6.1-gcc46.patch deleted file mode 100644 index ddf4036f2..000000000 --- a/staging/celestia/celestia-1.6.1-gcc46.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=366073 - -Patch written by Nils Larsson <ni1s@nerdshack.com> ---- src/celengine/frametree.h -+++ src/celengine/frametree.h -@@ -14,6 +14,7 @@ - #define _CELENGINE_FRAMETREE_H_ - - #include <vector> -+#include <cstddef> - - class Star; - class Body; diff --git a/staging/celestia/celestia-1.6.1-gentoo.patch b/staging/celestia/celestia-1.6.1-gentoo.patch deleted file mode 100644 index 57fffe159..000000000 --- a/staging/celestia/celestia-1.6.1-gentoo.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/celestia/Makefile.am 2011-06-07 19:15:51.502000147 +0200 -+++ src/celestia/Makefile.am.new 2011-06-07 19:15:47.208000302 +0200 -@@ -15,6 +15,7 @@ - if ENABLE_GTK - SUBDIRS += gtk - celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a -+LIBS += $(GTK_LIBS) - endif - - COMMONSOURCES = \ - -Index: src/celengine/frametree.h -=================================================================== ---- src/celengine/frametree.h (revision 5163) -+++ src/celengine/frametree.h (arbetskopia) -@@ -14,6 +14,7 @@ - #define _CELENGINE_FRAMETREE_H_ - - #include <vector> -+#include <cstddef> - - class Star; - class Body; diff --git a/staging/celestia/celestia-1.6.1-libpng15.patch b/staging/celestia/celestia-1.6.1-libpng15.patch deleted file mode 100644 index 5dffbab24..000000000 --- a/staging/celestia/celestia-1.6.1-libpng15.patch +++ /dev/null @@ -1,14 +0,0 @@ -imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope - ---- src/celestia/imagecapture.cpp -+++ src/celestia/imagecapture.cpp -@@ -31,6 +31,9 @@ - #include "png.h" - #endif - -+// Z_BEST_COMPRESSION -+#include <zlib.h> -+ - // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng - #ifndef png_jmpbuf - #define png_jmpbuf(png_ptr) png_ptr->jmpbuf diff --git a/staging/celestia/celestia-1.6.1-linking.patch b/staging/celestia/celestia-1.6.1-linking.patch deleted file mode 100644 index d610d5243..000000000 --- a/staging/celestia/celestia-1.6.1-linking.patch +++ /dev/null @@ -1,54 +0,0 @@ -Fix linking issues: - * underlinking GLUT (bug #372123, #387609) - * as-needed (bug #281258) - ---- a/src/celestia/Makefile.am -+++ b/src/celestia/Makefile.am -@@ -7,14 +7,15 @@ - - if ENABLE_KDE - SUBDIRS += kde --celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ -- $(LIBSOCKET) -lDCOP kde/libkdegui.a -+celestiaKDELIBS = kde/libkdegui.a - celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP - endif - - if ENABLE_GTK - SUBDIRS += gtk --celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a -+celestiaGTKLIBS = gtk/libgtkgui.a -+LIBS += $(GTK_LIBS) - endif - - COMMONSOURCES = \ -@@ -62,6 +63,7 @@ - - if ENABLE_GLUT - GLUTSOURCES = glutmain.cpp -+GLUTLIBS = -lGL - endif - - if ENABLE_THEORA -@@ -80,15 +82,16 @@ - celestia_LDADD = \ - $(celestiaKDELIBS) \ - $(celestiaGTKLIBS) \ -- $(DL_LIBS) \ -- $(LUA_LIBS) \ -- $(THEORA_LIBS) \ - ../celengine/libcelengine.a \ - ../celtxf/libceltxf.a \ - ../cel3ds/libcel3ds.a \ - ../celmath/libcelmath.a \ - ../celutil/libcelutil.a \ -- $(SPICE_LIBS) -+ $(LUA_LIBS) \ -+ $(THEORA_LIBS) \ -+ $(GLUTLIBS) \ -+ $(SPICE_LIBS) \ -+ $(DL_LIBS) - - noinst_HEADERS = $(wildcard *.h) - noinst_DATA = ../../celestia diff --git a/staging/cinepaint/LICENSE b/staging/cinepaint/LICENSE deleted file mode 100644 index 746207229..000000000 --- a/staging/cinepaint/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2005, Kai-Uwe Behrmann -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution.ntributors may be used to endorse or promote - products derived from this software without specific prior written - permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/staging/cinepaint/PKGBUILD b/staging/cinepaint/PKGBUILD deleted file mode 100644 index e205c9c79..000000000 --- a/staging/cinepaint/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 147751 2012-01-27 22:56:00Z eric $ -# Maintainer: tobias [tobias.archlinux.org] -# Contributor: tobias [tobias.justdreams.de] - -pkgname=cinepaint -pkgver=1.0 -pkgrel=2 -pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" -arch=('i686' 'x86_64') -license=('LGPL' 'GPL' 'MIT') -url="http://www.cinepaint.org" -depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') -makedepends=('python2' 'gutenprint') -optdepends=('python2: for python plug-ins' - 'gutenprint: for print plug-ins' - 'ghostscript: for pdf plug-ins') -options=('!libtool') -install=cinepaint.install -source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz - LICENSE cinepaint-libpng15.patch) -md5sums=('7dfdb005d246578392ac9bd500534804' - '169085743f667c250ea2e4022efecf5f' - '682de65ad358512d00a8b76730453664') - -build() { - cd "${srcdir}/${pkgname}" - patch -p1 -i ../cinepaint-libpng15.patch - find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + - sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in - - aclocal -I aclocal - autoconf - LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ - --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 - sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ - plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install - sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ - -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" - sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/cinepaint/cinepaint-libpng15.patch b/staging/cinepaint/cinepaint-libpng15.patch deleted file mode 100644 index e22edafae..000000000 --- a/staging/cinepaint/cinepaint-libpng15.patch +++ /dev/null @@ -1,452 +0,0 @@ -diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c ---- cinepaint.old/plug-ins/png/png.c 2012-01-23 12:39:42.000000000 -0500 -+++ cinepaint/plug-ins/png/png.c 2012-01-23 12:39:50.000000000 -0500 -@@ -390,6 +390,16 @@ - gchar *progress; /* Title for progress display... */ - guchar alpha[256], /* Index -> Alpha */ - *alpha_ptr; /* Temporary pointer */ -+ png_byte color_type; -+ png_byte bit_depth; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ int compression_type; -+ png_bytepp iccp_profile; -+ png_uint_32 iccp_proflen; -+ png_uint_32 width, height; -+ png_byte channels; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -405,7 +415,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. File corrupted?", filename); - return image; -@@ -442,21 +452,26 @@ - */ - - png_read_info(pp, info); -+ color_type = png_get_color_type(pp, info); -+ width=png_get_image_width(pp, info); -+ height=png_get_image_height(pp, info); - - /* - * Latest attempt, this should be my best yet :) - */ - -+ bit_depth = png_get_bit_depth(pp, info); -+ - #ifndef WORDS_BIGENDIAN -- if(info->bit_depth == 16) -+ if(bit_depth == 16) - png_set_swap(pp); - #endif - -- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_expand(pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) { - png_set_packing(pp); - } - -@@ -464,8 +479,8 @@ - * Expand G+tRNS to GA, RGB+tRNS to RGBA - */ - -- if (info->color_type != PNG_COLOR_TYPE_PALETTE && -- (info->valid & PNG_INFO_tRNS)) { -+ if (color_type != PNG_COLOR_TYPE_PALETTE && -+ (png_get_valid(pp, info, PNG_INFO_tRNS))) { - png_set_expand(pp); - } - -@@ -482,7 +497,7 @@ - - #if PNG_LIBPNG_VER > 99 - if (png_get_valid(pp, info, PNG_INFO_tRNS) && -- info->color_type == PNG_COLOR_TYPE_PALETTE) -+ color_type == PNG_COLOR_TYPE_PALETTE) - { - png_get_tRNS(pp, info, &alpha_ptr, &num, NULL); - /* Copy the existing alpha values from the tRNS chunk */ -@@ -505,9 +520,9 @@ - - png_read_update_info(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 6; -@@ -545,7 +560,7 @@ - } - else - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 3; -@@ -582,7 +597,7 @@ - }; - } - -- image = gimp_image_new(info->width, info->height, image_type); -+ image = gimp_image_new(width, height, image_type); - if (image == -1) - { - g_message("Can't allocate new image\n%s", filename); -@@ -595,7 +610,7 @@ - * Create the "background" layer to hold the image... - */ - -- layer = gimp_layer_new(image, _("Background"), info->width, info->height, -+ layer = gimp_layer_new(image, _("Background"), width, height, - layer_type, 100, NORMAL_MODE); - gimp_image_add_layer(image, layer, 0); - -@@ -627,20 +642,21 @@ - - empty= 0; /* by default assume no full transparent palette entries */ - -- if (info->color_type & PNG_COLOR_MASK_PALETTE) { -+ if (color_type & PNG_COLOR_MASK_PALETTE) { - - #if PNG_LIBPNG_VER > 99 -+ png_get_PLTE(pp, info, &palette, &num_palette); - if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty); - /* Calculates number of fully transparent "empty" entries */ - -- gimp_image_set_cmap(image, (guchar *) (info->palette + empty), -- info->num_palette - empty); -+ gimp_image_set_cmap(image, (guchar *) (palette + empty), -+ num_palette - empty); - } else { -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - } - #else -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - #endif /* PNG_LIBPNG_VER > 99 */ - - } -@@ -659,18 +675,19 @@ - */ - - tile_height = gimp_tile_height (); -- pixel = g_new(guchar, tile_height * info->width * bpp); -+ pixel = g_new(guchar, tile_height * width * bpp); - pixels = g_new(guchar *, tile_height); -+ channels=png_get_channels(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i * 2; -+ pixels[i] = pixel + width * channels * i * 2; - } - else - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i; -+ pixels[i] = pixel + width * channels * i; - } - - for (pass = 0; pass < num_passes; pass ++) -@@ -680,11 +697,11 @@ - */ - - for (begin = 0, end = tile_height; -- begin < info->height; -+ begin < height; - begin += tile_height, end += tile_height) - { -- if (end > info->height) -- end = info->height; -+ if (end > height) -+ end = height; - - num = end - begin; - -@@ -697,20 +714,21 @@ - gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin, - drawable->width, num); - -- gimp_progress_update(((double)pass + (double)end / (double)info->height) / -+ gimp_progress_update(((double)pass + (double)end / (double)height) / - (double)num_passes); - }; - }; - - #if defined(PNG_iCCP_SUPPORTED) - /* set icc profile */ -- if (info->iccp_proflen > 0) { -- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen, -- info->iccp_profile, -- ICC_IMAGE_PROFILE); -+ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen); -+ if (iccp_proflen > 0) { -+ gimp_image_set_icc_profile_by_mem (image, iccp_proflen, -+ (gchar *)iccp_profile, -+ ICC_IMAGE_PROFILE); - printf ("%s:%d %s() set embedded profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -808,6 +826,14 @@ - blue; /* Used for palette background */ - time_t cutime; /* Time since epoch */ - struct tm *gmt; /* GMT broken down */ -+ png_byte color_type; -+ png_byte bit_depth; -+ int filter_method=0; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ png_uint_32 height; -+ int compression_type; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -824,7 +849,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. Couldn't save image", filename); - return 0; -@@ -857,15 +882,6 @@ - drawable = gimp_drawable_get (drawable_ID); - type = gimp_drawable_type (drawable_ID); - -- /* -- * Set the image dimensions, bit depth, interlacing and compression -- */ -- -- png_set_compression_level (pp, pngvals.compression_level); -- -- info->width = drawable->width; -- info->height = drawable->height; -- info->interlace_type = pngvals.interlaced; - - /* - * Set color type and remember bytes per pixel count -@@ -874,71 +890,69 @@ - switch (type) - { - case RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 8; - bpp = 3; - break; - case RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 8; - bpp = 4; - break; - case GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 8; - bpp = 1; - break; - case GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 8; - bpp = 2; - break; - case INDEXED_IMAGE : - bpp = 1; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case INDEXEDA_IMAGE : - bpp = 2; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - case U16_RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 16; - bpp = 6; - break; - case U16_RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 16; - bpp = 8; - break; - case U16_GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 16; - bpp = 2; - break; - case U16_GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 16; - bpp = 4; - break; - case U16_INDEXED_IMAGE : - bpp = 2; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case U16_INDEXEDA_IMAGE : - bpp = 4; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - default: -@@ -950,30 +964,36 @@ - * Fix bit depths for (possibly) smaller colormap images - */ - -- if (info->valid & PNG_INFO_PLTE) { -- if (info->num_palette <= 2) -- info->bit_depth= 1; -- else if (info->num_palette <= 4) -- info->bit_depth= 2; -- else if (info->num_palette <= 16) -- info->bit_depth= 4; -+ if (png_get_valid(pp, info, PNG_INFO_PLTE)) { -+ png_get_PLTE(pp, info, &palette, &num_palette); -+ if (num_palette <= 2) -+ bit_depth= 1; -+ else if (num_palette <= 4) -+ bit_depth= 2; -+ else if (num_palette <= 16) -+ bit_depth= 4; - /* otherwise the default is fine */ - } - -+ png_set_compression_level (pp, pngvals.compression_level); -+ png_set_IHDR(pp, info, drawable->width, drawable->height, -+ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method); -+ -+ - // write icc profile - #if defined(PNG_iCCP_SUPPORTED) - if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) { -- int size; -+ int size; - char *buffer; - - buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size, - ICC_IMAGE_PROFILE); - png_set_iCCP (pp, info, - gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE), -- 0, buffer, size); -+ 0, (png_const_bytep)buffer, size); - printf ("%s:%d %s() embedd icc profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -1039,13 +1059,13 @@ - * Convert unpacked pixels to packed if necessary - */ - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) - png_set_packing(pp); - - /* Set swapping for 16 bit per sample images */ - - #ifndef WORDS_BIGENDIAN -- if (info->bit_depth == 16) -+ if (bit_depth == 16) - png_set_swap(pp); - #endif - -@@ -1063,6 +1083,7 @@ - - gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width, - drawable->height, FALSE, FALSE); -+ height=png_get_image_height(pp, info); - - for (pass = 0; pass < num_passes; pass ++) - { -@@ -1077,7 +1098,7 @@ - num = end - begin; - - gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); -- if (info->valid & PNG_INFO_tRNS) { -+ if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1085,7 +1106,7 @@ - } - } - /* Forgot this case before, what if there are too many colors? */ -- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) { -+ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1095,9 +1116,8 @@ - } - - png_write_rows (pp, pixels, num); -- - gimp_progress_update (((double)pass + (double)end / -- (double)info->height) / (double)num_passes); -+ (double)height) / (double)num_passes); - }; - }; - diff --git a/staging/cinepaint/cinepaint.install b/staging/cinepaint/cinepaint.install deleted file mode 100644 index 5e5cfef4d..000000000 --- a/staging/cinepaint/cinepaint.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/claws-mail/PKGBUILD b/staging/claws-mail/PKGBUILD deleted file mode 100644 index 3e6cc2033..000000000 --- a/staging/claws-mail/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 145932 2012-01-04 09:30:31Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=claws-mail -pkgver=3.8.0 -pkgrel=2 -pkgdesc="A GTK+ based e-mail client." -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.claws-mail.org" -depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant' - 'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind') -optdepends=('python2: needed for some tools' - 'perl: needed for some tools' - 'spamassassin: adds support for spamfiltering' - 'bogofilter: adds support for spamfiltering') -replaces=('sylpheed-claws') -provides=('claws') -options=(!libtool) -install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('df9f1657d7f34959a2205344d952c2e3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py - - ./configure --prefix=/usr --disable-static \ - --enable-enchant \ - --enable-gnutls \ - --enable-ldap \ - --disable-dillo-viewer-plugin \ - --enable-crash-dialog \ - --enable-pgpmime-plugin \ - --enable-spamassassin-plugin \ - --enable-bogofilter-plugin \ - --enable-jpilot - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # build and install extra tools - cd tools - make - # all executables and .conf files ; only top directory - find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do - install -D -m755 ${i} \ - ${pkgdir}/usr/lib/claws-mail/tools/${i} - done -} diff --git a/staging/claws-mail/claws-mail.install b/staging/claws-mail/claws-mail.install deleted file mode 100644 index a6ae1eae6..000000000 --- a/staging/claws-mail/claws-mail.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins" - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - diff --git a/staging/db/PKGBUILD b/staging/db/PKGBUILD deleted file mode 100644 index bfa1e8405..000000000 --- a/staging/db/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 145784 2011-12-31 17:44:46Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=db -pkgver=5.3.15 -pkgrel=1 -pkgdesc="The Berkeley DB embedded database system" -arch=('i686' 'x86_64') -url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" -license=('custom') -depends=('gcc-libs' 'sh') -options=('!libtool') -install=db.install -source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('7683b632a01ff3543c379a120809a942ec457738') - -build() { - cd "${srcdir}/$pkgname-${pkgver}/build_unix" - ../dist/configure --prefix=/usr --enable-compat185 \ - --enable-shared --enable-static --enable-cxx --enable-dbm - make LIBSO_LIBS=-lpthread -} - -package() { - cd "${srcdir}/$pkgname-${pkgver}/build_unix" - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/docs - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/staging/db/db.install b/staging/db/db.install deleted file mode 100644 index 03b64042d..000000000 --- a/staging/db/db.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 5.1)" -lt 0 ]; then - echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." - fi -} diff --git a/staging/digikam/PKGBUILD b/staging/digikam/PKGBUILD deleted file mode 100644 index 8f9780a19..000000000 --- a/staging/digikam/PKGBUILD +++ /dev/null @@ -1,104 +0,0 @@ -# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $ -# Maintainer: Ronald van Haren <ronald@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgbase=digikam -pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.5.0 -pkgrel=5 -pkgdesc="Digital photo management application for KDE" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.digikam.org/" -makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' - 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' - 'cmake' 'automoc4' 'doxygen') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "boost148.patch" "libkipi140.patch") -sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' - '93853084905b21309c46ce7d585021e76283d429' - '8a8f624fd0ca768a9dcd706405eb6e4944892d87') -build() { - cd "${srcdir}" - - pushd ${pkgname}-${pkgver}/core - patch -Np0 -i ${srcdir}/boost148.patch - patch -Np1 -i ${srcdir}/libkipi140.patch - popd - - mkdir build - cd build - # Use internal lensfun (FS#21816) - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DLENSFUN_LIBRARY="" \ - -DLENSFUN_INCLUDE_DIR="" - make -} - -package_digikam() { - pkgdesc="Digital photo management application for KDE" - depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' - 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap') - optdepends=('kipi-plugins: for more extras and plugins') - install=digikam.install - - cd "${srcdir}"/build/core - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/po - make DESTDIR="${pkgdir}" install - - # these are in oxygen-icons - rm -rf ${pkgdir}/usr/share/icons -} - -package_libkface() { - pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures" - depends=('kdelibs' 'opencv') - - cd "${srcdir}"/build/extra/libkface - make DESTDIR="${pkgdir}" install -} - -package_libkgeomap() { - pkgdesc="A wrapper around world map components for browsing and arranging photos on a map" - depends=('kdelibs' 'kdeedu-marble' 'libkexiv2') - - cd "${srcdir}"/build/extra/libkgeomap - make DESTDIR="${pkgdir}" install -} - -package_libkvkontakte() { - pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" - depends=('kdelibs' 'qjson') - - cd "${srcdir}"/build/extra/libkvkontakte - make DESTDIR="${pkgdir}" install -} - -package_libmediawiki() { - pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org" - depends=('kdelibs') - - cd "${srcdir}"/build/extra/libmediawiki - make DESTDIR="${pkgdir}" install -} - -package_kipi-plugins() { - pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') - optdepends=('libkgeomap' - 'libmediawiki' - 'libgpod' - 'hugin') - install=kipi-plugins.install - - cd "${srcdir}"/build/extra/kipi-plugins - make DESTDIR="${pkgdir}" install -} diff --git a/staging/digikam/boost148.patch b/staging/digikam/boost148.patch deleted file mode 100644 index 6d3ff585b..000000000 --- a/staging/digikam/boost148.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h ---- libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 08:32:19.837388059 -0500 -+++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 09:17:27.798341897 -0500 -@@ -1198,7 +1198,7 @@ - { - boost::dag_shortest_paths(graph, v, - // we provide a constant weight of 1 -- weight_map(boost::ref_property_map<edge_t,int>(weight)). -+ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)). - // Store distance and predecessors in QMaps, wrapped to serve as property maps - distance_map(VertexIntMapAdaptor(distances)). - predecessor_map(VertexVertexMapAdaptor(predecessors)) -@@ -1218,7 +1218,7 @@ - { - boost::dag_shortest_paths(graph, v, - // we provide a constant weight of 1 -- weight_map(boost::ref_property_map<edge_t,int>(weight)). -+ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)). - // Invert the default compare method: With greater, we get the longest path - distance_compare(std::greater<int>()). - // will be returned if a node is unreachable -@@ -1384,14 +1384,15 @@ - template <class GraphType, typename VertexLessThan> - class lessThanMapEdgeToTarget - { -+ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor; - public: - lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan) - : g(g), vertexLessThan(vertexLessThan) {} - const GraphType& g; - VertexLessThan vertexLessThan; -- bool operator()(const Edge& a, const Edge& b) -+ bool operator()(const edge_descriptor& a, const edge_descriptor& b) - { -- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g)); -+ return vertexLessThan(boost::target(a, g), boost::target(b, g)); - } - }; - -@@ -1402,20 +1403,21 @@ - { - typedef std::pair<Vertex, QList<Edge> > VertexInfo; - -- QList<Edge> outEdges; -+ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor; -+ QList<edge_descriptor> outEdges; - std::vector<VertexInfo> stack; - - boost::put(color, u, boost::gray_color); - vis.discover_vertex(u, g); - -- outEdges = toEdgeList(boost::out_edges(u, g)); -+ outEdges = toList<edge_descriptor>(boost::out_edges(u, g)); - // Sort edges. The lessThan we have takes vertices, so we use a lessThan which - // maps the given edges to their targets, and calls our vertex lessThan. - qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan)); - -- foreach(const Edge& e, outEdges) -+ foreach(const edge_descriptor& e, outEdges) - { -- Vertex v = boost::target(e.toEdge(), g); -+ Vertex v = boost::target(e, g); - vis.examine_edge(e, g); - boost::default_color_type v_color = boost::get(color, v); - if (v_color == boost::white_color) diff --git a/staging/digikam/digikam.install b/staging/digikam/digikam.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/digikam/digikam.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/staging/digikam/kipi-plugins.install b/staging/digikam/kipi-plugins.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/digikam/kipi-plugins.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/staging/digikam/libkipi140.patch b/staging/digikam/libkipi140.patch deleted file mode 100644 index a221b5847..000000000 --- a/staging/digikam/libkipi140.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp -index 0f4030a..b8efb35 100644 ---- a/utilities/setup/setupplugins.cpp -+++ b/utilities/setup/setupplugins.cpp -@@ -6,8 +6,8 @@ - * Date : 2004-01-02 - * Description : setup Kipi plugins tab. - * -- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> -- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> -+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> -+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent) - - panel->setLayout(mainLayout); - -+#if KIPI_VERSION < 0x010400 -+ d->checkAllBtn->setVisible(false); -+ d->clearBtn->setVisible(false); -+#endif -+ - initPlugins(); - - // -------------------------------------------------------- -@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins() - void SetupPlugins::slotCheckAll() - { - QApplication::setOverrideCursor(Qt::WaitCursor); -+#if KIPI_VERSION >= 0x010400 - d->kipiConfig->slotCheckAll(); -+#endif - QApplication::restoreOverrideCursor(); - } - - void SetupPlugins::slotClear() - { - QApplication::setOverrideCursor(Qt::WaitCursor); -+#if KIPI_VERSION >= 0x010400 - d->kipiConfig->slotClear(); -+#endif - QApplication::restoreOverrideCursor(); - } - -diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h -index 271a569..114e0fa 100644 ---- a/utilities/setup/setupplugins.h -+++ b/utilities/setup/setupplugins.h -@@ -6,8 +6,8 @@ - * Date : 2004-01-02 - * Description : setup Kipi plugins tab. - * -- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> -- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> -+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> -+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General - - diff --git a/staging/djvulibre/PKGBUILD b/staging/djvulibre/PKGBUILD deleted file mode 100644 index ef6bc1842..000000000 --- a/staging/djvulibre/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 147068 2012-01-21 14:25:07Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: mgushee - -pkgname=djvulibre -pkgver=3.5.24 -pkgrel=3 -pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents" -arch=("i686" "x86_64") -license=('GPL') -url="http://djvu.sourceforge.net/" -depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme') -makedepends=('pkg-config') -provides=("libdjvu=${pkgver}") -replaces=('libdjvu') -conflicts=('libdjvu') -optdepends=('djview4: Viewer application') -options=('!libtool') -install=djvulibre.install -source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz - git-fixes.patch) -md5sums=('af83d27af5083198432a178d22b259c5' - 'ff3798e383e9c3fae407455d8a51deec') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr --disable-desktopfiles - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - #Install icons for mime-types. - install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48,64x64}/mimetypes - for sz in 22 32 48 64; do - install -m644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png" - done -} diff --git a/staging/djvulibre/djvulibre.install b/staging/djvulibre/djvulibre.install deleted file mode 100644 index 3e9bb5c49..000000000 --- a/staging/djvulibre/djvulibre.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - if [ -x usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q -f usr/share/icons/hicolor - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/djvulibre/git-fixes.patch b/staging/djvulibre/git-fixes.patch deleted file mode 100644 index 3077cf0b4..000000000 --- a/staging/djvulibre/git-fixes.patch +++ /dev/null @@ -1,1607 +0,0 @@ -From 3341545edba359b292a8ef6db1b7d342caf3dcf1 Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Wed, 4 May 2011 21:25:35 -0700 -Subject: [PATCH] Added include <stddef.h> for gcc-4.6 - ---- - libdjvu/BSByteStream.cpp | 1 + - libdjvu/BSEncodeByteStream.cpp | 1 + - libdjvu/ByteStream.cpp | 1 + - libdjvu/DjVuFileCache.cpp | 1 + - libdjvu/DjVuGlobal.cpp | 2 ++ - libdjvu/DjVuGlobalMemory.cpp | 2 ++ - libdjvu/DjVuMessage.cpp | 1 + - libdjvu/DjVuMessageLite.cpp | 2 +- - libdjvu/DjVuPalette.cpp | 2 ++ - libdjvu/DjVuPort.h | 1 + - libdjvu/DjVuToPS.cpp | 1 + - libdjvu/GBitmap.cpp | 2 ++ - libdjvu/GException.cpp | 1 + - libdjvu/GOS.cpp | 1 + - libdjvu/GPixmap.cpp | 2 ++ - libdjvu/GSmartPointer.cpp | 1 + - libdjvu/GSmartPointer.h | 2 ++ - libdjvu/GString.cpp | 1 + - libdjvu/GString.h | 1 + - libdjvu/GThreads.cpp | 2 ++ - libdjvu/GURL.cpp | 1 + - libdjvu/GUnicode.cpp | 2 ++ - libdjvu/IFFByteStream.h | 1 + - libdjvu/IW44EncodeCodec.cpp | 1 + - libdjvu/IW44Image.cpp | 1 + - libdjvu/JPEGDecoder.h | 1 + - libdjvu/MMX.cpp | 1 + - libdjvu/UnicodeByteStream.h | 1 + - libdjvu/XMLParser.cpp | 1 + - libdjvu/ZPCodec.cpp | 2 ++ - libdjvu/atomic.cpp | 1 + - libdjvu/ddjvuapi.cpp | 1 + - libdjvu/ddjvuapi.h | 1 + - libdjvu/miniexp.cpp | 1 + - libdjvu/miniexp.h | 3 ++- - tools/bzz.cpp | 1 + - tools/c44.cpp | 1 + - tools/cjb2.cpp | 1 + - tools/cpaldjvu.cpp | 1 + - tools/csepdjvu.cpp | 1 + - tools/ddjvu.cpp | 1 + - tools/djvm.cpp | 2 +- - tools/djvmcvt.cpp | 1 + - tools/djvudump.cpp | 1 + - tools/djvuextract.cpp | 1 + - tools/djvumake.cpp | 1 + - tools/djvups.cpp | 1 + - tools/djvused.cpp | 1 + - tools/djvuserve.cpp | 1 + - tools/djvutxt.cpp | 1 + - tools/tiff2pdf.h | 1 + - xmltools/djvutoxml.cpp | 1 + - xmltools/djvuxmlparser.cpp | 1 + - 53 files changed, 63 insertions(+), 3 deletions(-) - -diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp -index b762ccf..d662ab0 100644 ---- a/libdjvu/BSByteStream.cpp -+++ b/libdjvu/BSByteStream.cpp -@@ -62,6 +62,7 @@ - - // - Author: Leon Bottou, 07/1998 - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp -index 5d80e51..68bc3e3 100644 ---- a/libdjvu/BSEncodeByteStream.cpp -+++ b/libdjvu/BSEncodeByteStream.cpp -@@ -71,6 +71,7 @@ - #include "GOS.h" - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp -index 158c33c..be01847 100644 ---- a/libdjvu/ByteStream.cpp -+++ b/libdjvu/ByteStream.cpp -@@ -73,6 +73,7 @@ - #include "GOS.h" - #include "GURL.h" - #include "DjVuMessage.h" -+#include <stddef.h> - #include <fcntl.h> - #if defined(WIN32) || defined(__CYGWIN32__) - # include <io.h> -diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp -index 6b1e85d..7d7a192 100644 ---- a/libdjvu/DjVuFileCache.cpp -+++ b/libdjvu/DjVuFileCache.cpp -@@ -63,6 +63,7 @@ - #include "DjVuFileCache.h" - #include "debug.h" - -+#include <stddef.h> - #include <stdlib.h> - - -diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp -index e6d3cec..df9278e 100644 ---- a/libdjvu/DjVuGlobal.cpp -+++ b/libdjvu/DjVuGlobal.cpp -@@ -76,6 +76,8 @@ - #include "GThreads.h" - #include "GException.h" - #include "GContainer.h" -+ -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp -index 3c6012c..c8ba309 100644 ---- a/libdjvu/DjVuGlobalMemory.cpp -+++ b/libdjvu/DjVuGlobalMemory.cpp -@@ -67,6 +67,8 @@ - - #include "DjVuGlobal.h" - #include "GException.h" -+ -+#include <stddef.h> - #include <stdlib.h> - #include <string.h> - #include "debug.h" -diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp -index 6f5a735..1726025 100644 ---- a/libdjvu/DjVuMessage.cpp -+++ b/libdjvu/DjVuMessage.cpp -@@ -71,6 +71,7 @@ - #include "debug.h" - #include <ctype.h> - #include <string.h> -+#include <stddef.h> - #include <stdlib.h> - #ifdef WIN32 - # include <tchar.h> -diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp -index b8c1010..5daa9d9 100644 ---- a/libdjvu/DjVuMessageLite.cpp -+++ b/libdjvu/DjVuMessageLite.cpp -@@ -73,8 +73,8 @@ - #include "debug.h" - #include <ctype.h> - #include <string.h> -+#include <stddef.h> - #include <stdlib.h> --// #include <stdio.h> - #ifdef WIN32 - #include <tchar.h> - #include <windows.h> -diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp -index c489f7b..76b0bf4 100644 ---- a/libdjvu/DjVuPalette.cpp -+++ b/libdjvu/DjVuPalette.cpp -@@ -64,6 +64,8 @@ - #include "ByteStream.h" - #include "BSByteStream.h" - #include "DjVuPalette.h" -+ -+#include <stddef.h> - #include <stdlib.h> - #include <math.h> - -diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h -index f6a92f6..e2b3125 100644 ---- a/libdjvu/DjVuPort.h -+++ b/libdjvu/DjVuPort.h -@@ -65,6 +65,7 @@ - - #include "GThreads.h" - #include "GURL.h" -+#include "stddef.h" - - #ifdef HAVE_NAMESPACES - namespace DJVU { -diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp -index 5517bf3..6914ff9 100644 ---- a/libdjvu/DjVuToPS.cpp -+++ b/libdjvu/DjVuToPS.cpp -@@ -72,6 +72,7 @@ - #include "GPixmap.h" - #include "debug.h" - #include <stdarg.h> -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <time.h> -diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp -index ab5c0de..797edcc 100644 ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -66,6 +66,8 @@ - #include "GString.h" - #include "GThreads.h" - #include "GException.h" -+#include <stddef.h> -+#include <stdlib.h> - #include <string.h> - - // - Author: Leon Bottou, 05/1997 -diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp -index 2ea179a..89da70f 100644 ---- a/libdjvu/GException.cpp -+++ b/libdjvu/GException.cpp -@@ -60,6 +60,7 @@ - # pragma implementation - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp -index e784932..d2088e2 100644 ---- a/libdjvu/GOS.cpp -+++ b/libdjvu/GOS.cpp -@@ -65,6 +65,7 @@ - #include "GOS.h" - #include "GURL.h" - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <ctype.h> -diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp -index 392df54..4bf6f57 100644 ---- a/libdjvu/GPixmap.cpp -+++ b/libdjvu/GPixmap.cpp -@@ -75,6 +75,8 @@ - #include "GThreads.h" - #include "Arrays.h" - #include "JPEGDecoder.h" -+ -+#include <stddef.h> - #include <stdlib.h> - #include <math.h> - #include <assert.h> -diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp -index 6e523e7..58aef5b 100644 ---- a/libdjvu/GSmartPointer.cpp -+++ b/libdjvu/GSmartPointer.cpp -@@ -67,6 +67,7 @@ - // Our original implementation consisted of multiple classes. - // <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>. - -+#include <stddef.h> - #include <string.h> - #if PARANOID_DEBUG - # include <assert.h> -diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h -index 82781bd..8a8bb8a 100644 ---- a/libdjvu/GSmartPointer.h -+++ b/libdjvu/GSmartPointer.h -@@ -97,6 +97,8 @@ - #include "DjVuGlobal.h" - #include "atomic.h" - -+#include <stddef.h> -+ - #ifdef HAVE_NAMESPACES - namespace DJVU { - # ifdef NOT_DEFINED // Just to fool emacs c++ mode -diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp -index 03f6226..350b11b 100644 ---- a/libdjvu/GString.cpp -+++ b/libdjvu/GString.cpp -@@ -73,6 +73,7 @@ - #include "GThreads.h" - #include "debug.h" - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/libdjvu/GString.h b/libdjvu/GString.h -index b63b753..3aa1f76 100644 ---- a/libdjvu/GString.h -+++ b/libdjvu/GString.h -@@ -108,6 +108,7 @@ - #include "DjVuGlobal.h" - #include "GContainer.h" - -+#include <stddef.h> - #include <stdlib.h> - #include <stdarg.h> - #ifdef WIN32 -diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp -index d81f3c3..253fed8 100644 ---- a/libdjvu/GThreads.cpp -+++ b/libdjvu/GThreads.cpp -@@ -71,6 +71,8 @@ - #include "GThreads.h" - #include "GException.h" - #include "DjVuMessageLite.h" -+ -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - -diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp -index c37bf52..a80078c 100644 ---- a/libdjvu/GURL.cpp -+++ b/libdjvu/GURL.cpp -@@ -72,6 +72,7 @@ - #include "GURL.h" - #include "debug.h" - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <ctype.h> -diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp -index 415c081..a8b25b8 100644 ---- a/libdjvu/GUnicode.cpp -+++ b/libdjvu/GUnicode.cpp -@@ -62,6 +62,8 @@ - - #include "GString.h" - -+#include <stddef.h> -+ - #if HAS_ICONV - #include <iconv.h> - #endif -diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h -index a653f8c..e31b216 100644 ---- a/libdjvu/IFFByteStream.h -+++ b/libdjvu/IFFByteStream.h -@@ -124,6 +124,7 @@ - - - #include "DjVuGlobal.h" -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp -index 8d7b12c..49081b7 100644 ---- a/libdjvu/IW44EncodeCodec.cpp -+++ b/libdjvu/IW44EncodeCodec.cpp -@@ -76,6 +76,7 @@ - #include "IFFByteStream.h" - #include "GRect.h" - -+#include <stddef.h> - #include <stdlib.h> - #include <string.h> - #include <math.h> -diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp -index 9476726..4a19fb5 100644 ---- a/libdjvu/IW44Image.cpp -+++ b/libdjvu/IW44Image.cpp -@@ -76,6 +76,7 @@ - #include "IFFByteStream.h" - #include "GRect.h" - -+#include <stddef.h> - #include <stdlib.h> - #include <string.h> - #include <math.h> -diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h -index bd430a0..fad1d4c 100644 ---- a/libdjvu/JPEGDecoder.h -+++ b/libdjvu/JPEGDecoder.h -@@ -64,6 +64,7 @@ - - #ifdef NEED_JPEG_DECODER - -+#include <stddef.h> - #include <string.h> - #include <setjmp.h> - -diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp -index 5ab60bb..528dab6 100644 ---- a/libdjvu/MMX.cpp -+++ b/libdjvu/MMX.cpp -@@ -62,6 +62,7 @@ - - #include "MMX.h" - #include <stdio.h> -+#include <stddef.h> - #include <stdlib.h> - - -diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h -index 0ae112b..9b49a17 100644 ---- a/libdjvu/UnicodeByteStream.h -+++ b/libdjvu/UnicodeByteStream.h -@@ -88,6 +88,7 @@ - #include "GString.h" - #include "ByteStream.h" - -+#include <stddef.h> - - #ifdef HAVE_NAMESPACES - namespace DJVU { -diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp -index 84386c5..7da923a 100644 ---- a/libdjvu/XMLParser.cpp -+++ b/libdjvu/XMLParser.cpp -@@ -75,6 +75,7 @@ - #include "debug.h" - #include <stdio.h> - #include <ctype.h> -+#include <stddef.h> - #include <stdlib.h> - - -diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp -index f6e971d..ff5b9bf 100644 ---- a/libdjvu/ZPCodec.cpp -+++ b/libdjvu/ZPCodec.cpp -@@ -66,6 +66,8 @@ - #include "ZPCodec.h" - #include "ByteStream.h" - #include "GException.h" -+ -+#include <stddef.h> - #include <stdlib.h> - #include <assert.h> - #include <math.h> -diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp -index bdc193e..63fd483 100644 ---- a/libdjvu/atomic.cpp -+++ b/libdjvu/atomic.cpp -@@ -28,6 +28,7 @@ - # include "config.h" - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <assert.h> - #include "atomic.h" -diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp -index b18b84b..f40f5aa 100644 ---- a/libdjvu/ddjvuapi.cpp -+++ b/libdjvu/ddjvuapi.cpp -@@ -60,6 +60,7 @@ - # pragma implementation "ddjvuapi.h" - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h -index d0ed48f..841f223 100644 ---- a/libdjvu/ddjvuapi.h -+++ b/libdjvu/ddjvuapi.h -@@ -64,6 +64,7 @@ extern "C" { - } - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - -diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp -index e0fb087..fc51297 100644 ---- a/libdjvu/miniexp.cpp -+++ b/libdjvu/miniexp.cpp -@@ -23,6 +23,7 @@ - # pragma implementation "miniexp.h" - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <ctype.h> -diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h -index 91e345d..993005b 100644 ---- a/libdjvu/miniexp.h -+++ b/libdjvu/miniexp.h -@@ -38,7 +38,8 @@ extern "C" { - #ifndef MINILISPAPI - # define MINILISPAPI /**/ - #endif -- -+ -+#include <stddef.h> - - /* -------------------------------------------------- */ - /* LISP EXPRESSIONS */ -diff --git a/tools/bzz.cpp b/tools/bzz.cpp -index ca092e1..2ebc7b9 100644 ---- a/tools/bzz.cpp -+++ b/tools/bzz.cpp -@@ -94,6 +94,7 @@ - #include "GURL.h" - #include "DjVuMessage.h" - #include <locale.h> -+#include <stddef.h> - #include <stdlib.h> - - static const char *program = "(unknown)"; -diff --git a/tools/c44.cpp b/tools/c44.cpp -index 6f23b53..855504b 100644 ---- a/tools/c44.cpp -+++ b/tools/c44.cpp -@@ -226,6 +226,7 @@ - #include <locale.h> - #include <stdio.h> - #include <string.h> -+#include <stddef.h> - #include <stdlib.h> - - // command line data -diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp -index 8cf89b9..11eb662 100644 ---- a/tools/cjb2.cpp -+++ b/tools/cjb2.cpp -@@ -120,6 +120,7 @@ - #include "jb2tune.h" - - #include <locale.h> -+#include <stddef.h> - #include <stdlib.h> - #if HAVE_TIFF - #include <tiffio.h> -diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp -index 111cbd3..b640a7a 100644 ---- a/tools/cpaldjvu.cpp -+++ b/tools/cpaldjvu.cpp -@@ -118,6 +118,7 @@ - #include "jb2tune.h" - - #include <locale.h> -+#include <stddef.h> - #include <stdlib.h> - #include <math.h> - -diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp -index cd721f8..d5203d5 100644 ---- a/tools/csepdjvu.cpp -+++ b/tools/csepdjvu.cpp -@@ -162,6 +162,7 @@ - #include "jb2tune.h" - - #include <locale.h> -+#include <stddef.h> - #include <stdlib.h> - - #undef MIN -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index 817e045..981a270 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -62,6 +62,7 @@ - # include "config.h" - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> -diff --git a/tools/djvm.cpp b/tools/djvm.cpp -index 951bd66..6ea88c2 100644 ---- a/tools/djvm.cpp -+++ b/tools/djvm.cpp -@@ -135,9 +135,9 @@ - #include "DjVuMessage.h" - - #include <locale.h> -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> --#include <stdlib.h> - - static const char * progname; - -diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp -index 9ca1c54..20b468a 100644 ---- a/tools/djvmcvt.cpp -+++ b/tools/djvmcvt.cpp -@@ -144,6 +144,7 @@ - - #include <locale.h> - #include <stdio.h> -+#include <stddef.h> - #include <stdlib.h> - - static const char * progname; -diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp -index 6a0215a..2dddbdf 100644 ---- a/tools/djvudump.cpp -+++ b/tools/djvudump.cpp -@@ -119,6 +119,7 @@ xxx - #include <locale.h> - #include <stdio.h> - #include <ctype.h> -+#include <stddef.h> - #include <stdlib.h> - - void -diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp -index 4a9f381..907b99c 100644 ---- a/tools/djvuextract.cpp -+++ b/tools/djvuextract.cpp -@@ -105,6 +105,7 @@ - #include "GOS.h" - #include "DjVuMessage.h" - #include <locale.h> -+#include <stddef.h> - #include <stdlib.h> - - -diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp -index 7020484..4c5fc0f 100644 ---- a/tools/djvumake.cpp -+++ b/tools/djvumake.cpp -@@ -153,6 +153,7 @@ - - #include <locale.h> - #include <stdio.h> -+#include <stddef.h> - #include <stdlib.h> - #include <ctype.h> - -diff --git a/tools/djvups.cpp b/tools/djvups.cpp -index 51aa999..632b832 100644 ---- a/tools/djvups.cpp -+++ b/tools/djvups.cpp -@@ -57,6 +57,7 @@ - # include "config.h" - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> -diff --git a/tools/djvused.cpp b/tools/djvused.cpp -index de84dcd..687fdca 100644 ---- a/tools/djvused.cpp -+++ b/tools/djvused.cpp -@@ -61,6 +61,7 @@ - #endif - - #include <stdio.h> -+#include <stddef.h> - #include <stdlib.h> - #include <stdarg.h> - #include <errno.h> -diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp -index 19a17da..818fe78 100644 ---- a/tools/djvuserve.cpp -+++ b/tools/djvuserve.cpp -@@ -73,6 +73,7 @@ - - #include <locale.h> - #include <stdio.h> -+#include <stddef.h> - #include <stdlib.h> - #include <sys/stat.h> - #include <time.h> -diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp -index ba2c745..9e9124c 100644 ---- a/tools/djvutxt.cpp -+++ b/tools/djvutxt.cpp -@@ -61,6 +61,7 @@ - # include "config.h" - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> -diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h -index 082f5fb..656dc43 100644 ---- a/tools/tiff2pdf.h -+++ b/tools/tiff2pdf.h -@@ -22,6 +22,7 @@ - # endif - # if HAVE_TIFF - # include <stdio.h> -+# include <stddef.h> - # include <stdlib.h> - # include <tiff.h> - # include <tiffio.h> -diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp -index 17c769b..b40535e 100644 ---- a/xmltools/djvutoxml.cpp -+++ b/xmltools/djvutoxml.cpp -@@ -71,6 +71,7 @@ - - #include <locale.h> - #include <stdio.h> -+#include <stddef.h> - #include <stdlib.h> - #include <sys/stat.h> - #include <assert.h> -diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp -index bdc5768..6679a9d 100644 ---- a/xmltools/djvuxmlparser.cpp -+++ b/xmltools/djvuxmlparser.cpp -@@ -70,6 +70,7 @@ - #include <stdio.h> - #include <ctype.h> - #include <locale.h> -+#include <stddef.h> - #include <stdlib.h> - - static void --- -1.7.4.1 - -From 3cc41e2a72bbd6d34e81a9a214abbebf41cc00c7 Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Sat, 21 May 2011 09:27:17 -0700 -Subject: [PATCH] Added ddjvu option to skip corrupted pages. - ---- - tools/ddjvu.1 | 7 +++++++ - tools/ddjvu.cpp | 49 +++++++++++++++++++++++++++++++++---------------- - 2 files changed, 40 insertions(+), 16 deletions(-) - -diff --git a/tools/ddjvu.1 b/tools/ddjvu.1 -index 29285c3..7d3d105 100644 ---- a/tools/ddjvu.1 -+++ b/tools/ddjvu.1 -@@ -178,6 +178,13 @@ select specific layers of a DjVu image. - These modes can fail if the DjVu image does - not contain the selected layer. - .RE -+.TP -+.BI "-skip" -+Instead of aborting when encountering a corrupted page, -+this option causes -+.BR ddjvu -+to simply skip the corrupted page and continue with the next. -+This is useful for processing certain damaged files. - - .SH RESOLUTION OPTIONS - The following options control the resolution of the output image. -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index 981a270..b9cb038 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -132,6 +132,7 @@ ddjvu_rect_t info_size; - ddjvu_rect_t info_segment; - const char *inputfilename = 0; - const char *outputfilename = 0; -+int flag_skip_corrupted = 0; - - #if HAVE_TIFF2PDF - char *tempfilename = 0; -@@ -164,7 +165,6 @@ handle(int wait) - if (msg->m_error.filename) - fprintf(stderr,"ddjvu: '%s:%d'\n", - msg->m_error.filename, msg->m_error.lineno); -- exit(10); - default: - break; - } -@@ -554,8 +554,16 @@ dopage(int pageno) - while (! ddjvu_page_decoding_done(page)) - handle(TRUE); - if (ddjvu_page_decoding_error(page)) -- die(i18n("Cannot decode page %d."), pageno); -- -+ { -+ handle(FALSE); -+ fprintf(stderr,"ddjvu: "); -+ fprintf(stderr,i18n("Cannot decode page %d."), pageno); -+ fprintf(stderr,"\n"); -+ if (flag_skip_corrupted) -+ return; -+ else -+ exit(10); -+ } - timingdata[1] = ticks(); - /* Open files */ - if (flag_format == 't') -@@ -753,19 +761,20 @@ usage() - i18n("DjVu decompression utility\n\n" - "Usage: ddjvu [options] [<djvufile> [<outputfile>]]\n\n" - "Options:\n" -- " -verbose Prints various informational messages.\n" -- " -format=FMT Selects output format: pbm,pgm,ppm,pnm,rle,tiff.\n" -- " -scale=N Selects display scale.\n" -- " -size=WxH Selects size of rendered image.\n" -- " -subsample=N Selects direct subsampling factor.\n" -- " -aspect=no Authorizes aspect ratio changes\n" -- " -segment=WxH+X+Y Selects which segment of the rendered image\n" -- " -mode=black Renders a meaningful bitonal image.\n" -- " -mode=mask Only renders the mask layer.\n" -- " -mode=foreground Only renders the foreground layer.\n" -- " -mode=background Only renders the background layer.\n" -- " -page=PAGESPEC Selects page(s) to be decoded.\n" -- " -quality=QUALITY Specifies jpeg quality for lossy tiff output.\n" -+ " -verbose Print various informational messages.\n" -+ " -format=FMT Select output format: pbm,pgm,ppm,pnm,rle,tiff.\n" -+ " -scale=N Select display scale.\n" -+ " -size=WxH Select size of rendered image.\n" -+ " -subsample=N Select direct subsampling factor.\n" -+ " -aspect=no Authorize aspect ratio changes\n" -+ " -segment=WxH+X+Y Select which segment of the rendered image\n" -+ " -mode=black Render a meaningful bitonal image.\n" -+ " -mode=mask Only render the mask layer.\n" -+ " -mode=foreground Only render the foreground layer.\n" -+ " -mode=background Only render the background layer.\n" -+ " -page=PAGESPEC Select page(s) to be decoded.\n" -+ " -skip Skip corrupted pages instead of aborting.\n" -+ " -quality=QUALITY Specify jpeg quality for lossy tiff output.\n" - "\n" - "If <outputfile> is a single dash or omitted, the decompressed image\n" - "is sent to the standard output. If <djvufile> is a single dash or\n" -@@ -846,6 +855,12 @@ parse_option(int argc, char **argv, int i) - die(i18n(errarg), opt); - flag_verbose = 1; - } -+ if (!strcmp(opt,"skip")) -+ { -+ if (arg) -+ die(i18n(errarg), opt); -+ flag_skip_corrupted = 1; -+ } - else if (!strcmp(opt,"scale")) - { - if (!arg) -@@ -1012,6 +1027,8 @@ main(int argc, char **argv) - die(i18n("Cannot open djvu document '%s'."), inputfilename); - while (! ddjvu_document_decoding_done(doc)) - handle(TRUE); -+ if (ddjvu_document_decoding_error(doc)) -+ die(i18n("Cannot decode document.")); - - /* Process all pages */ - i = ddjvu_document_get_pagenum(doc); --- -1.7.4.1 - -From 6a6e6a047b41a431cfc091bd71fcad554fd79437 Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Mon, 30 May 2011 18:52:33 -0700 -Subject: [PATCH] Added option -o outputfile to djvudump. - ---- - tools/djvudump.1 | 2 +- - tools/djvudump.cpp | 34 +++++++++++++++++++++++++--------- - 2 files changed, 26 insertions(+), 10 deletions(-) - -diff --git a/tools/djvudump.1 b/tools/djvudump.1 -index c86b7d5..e39a318 100644 ---- a/tools/djvudump.1 -+++ b/tools/djvudump.1 -@@ -27,7 +27,7 @@ - djvudump \- Display internal structure of DjVu files. - - .SH SYNOPSIS --.BI "djvudump " "djvufiles" "..." -+.BI "djvudump [-o " "outputfile" "] " "djvufiles" "..." - - .SH DESCRIPTION - Program -diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp -index 2dddbdf..6daaf2c 100644 ---- a/tools/djvudump.cpp -+++ b/tools/djvudump.cpp -@@ -122,6 +122,9 @@ xxx - #include <stddef.h> - #include <stdlib.h> - -+const char *outputfile = 0; -+FILE *outputf = stdout; -+ - void - display(const GURL &url) - { -@@ -134,7 +137,7 @@ display(const GURL &url) - obs->seek(0); - obs->readall(buf, size); - GNativeString ns = str; -- fputs((const char*)ns, stdout); -+ fputs((const char*)ns, outputf); - } - - -@@ -146,7 +149,7 @@ usage() - "DJVUDUMP --- DjVuLibre-" DJVULIBRE_VERSION "\n" - #endif - "Describes DjVu and IFF85 files\n\n" -- "Usage: djvudump <iff_filenames>\n" ); -+ "Usage: djvudump [-o outputfile] <iff_filenames>\n" ); - exit(1); - } - -@@ -156,24 +159,37 @@ main(int argc, char **argv) - setlocale(LC_ALL,""); - setlocale(LC_NUMERIC,"C"); - djvu_programname(argv[0]); -- GArray<GUTF8String> dargv(0,argc-1); -+ // get output file name -+ if (argc>2 && !strcmp(argv[1],"-o")) -+ { -+ outputfile = argv[2]; -+ argv += 2; -+ argc -= 2; -+ } -+ // convert iff file name -+ GArray<GUTF8String> dargv(0, argc-1); - for(int i=0;i<argc;++i) - dargv[i]=GNativeString(argv[i]); -+ if (argc <= 1) -+ usage(); -+ if (outputfile && !(outputf = fopen(outputfile,"w"))) -+ { -+ DjVuPrintErrorUTF8("djvudump: Cannot open output file.\n"); -+ exit(1); -+ } - G_TRY - { -- if (argc<=1) -- usage(); - for (int i=1; i<argc; i++) -- { -+ { - const GURL::Filename::UTF8 url(dargv[i]); - display(url); -- } -+ } - } - G_CATCH(ex) -- { -+ { - ex.perror(); - exit(1); -- } -+ } - G_ENDCATCH; - return 0; - } --- -1.7.4.1 - -From 6db359d1ad5e7e863fac53301e7ff884cfe44423 Mon Sep 17 00:00:00 2001 -From: Bill C Riemers <briemers@redhat.com> -Date: Thu, 2 Jun 2011 13:17:27 -0400 -Subject: [PATCH] Correct error copying an error in the annotation class of assigning a tempory - GUTF8String directly to a const char *. - ---- - libdjvu/DjVuAnno.cpp | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp -index 6ca5b4e..e2a9108 100644 ---- a/libdjvu/DjVuAnno.cpp -+++ b/libdjvu/DjVuAnno.cpp -@@ -261,7 +261,8 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const - to_print=buffer.format("%d",number); - break; - case STRING: -- to_print=make_c_string(string); -+ buffer=make_c_string(string); -+ to_print=(const char *)buffer; - break; - case SYMBOL: - to_print=buffer.format("%s",(const char *)symbol); --- -1.7.4.1 - -From 2b26415c3c46ffb7532ca250990668564be62d39 Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Thu, 2 Jun 2011 09:48:49 -0700 -Subject: [PATCH] Corrected polarity of xmp annotation saving - ---- - libdjvu/DjVuAnno.cpp | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp -index e2a9108..8e16dd8 100644 ---- a/libdjvu/DjVuAnno.cpp -+++ b/libdjvu/DjVuAnno.cpp -@@ -254,25 +254,24 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const - if (!cur_pos) { cur_pos = &local_cur_pos; } - - GUTF8String buffer; -- const char * to_print=0; - switch(type) - { - case NUMBER: -- to_print=buffer.format("%d",number); -+ buffer.format("%d",number); - break; - case STRING: -- buffer=make_c_string(string); -- to_print=(const char *)buffer; -+ buffer = make_c_string(string); - break; - case SYMBOL: -- to_print=buffer.format("%s",(const char *)symbol); -+ buffer.format("%s",(const char *)symbol); - break; - case LIST: -- to_print=buffer.format("(%s",(const char *)name); -+ buffer.format("(%s",(const char *)name); - break; - case INVALID: - break; - } -+ const char * to_print = (const char*)buffer; - if (!compact && *cur_pos+strlen(to_print)>70) - { - char ch='\n'; -@@ -1375,7 +1374,7 @@ DjVuANT::encode_raw(void) const - } - //*** XMP Metadata - del_all_items(XMP_TAG, parser); -- if (!xmpmetadata) -+ if (!!xmpmetadata) - { - GUTF8String mdatabuffer("("); - mdatabuffer += XMP_TAG; -@@ -1385,8 +1384,10 @@ DjVuANT::encode_raw(void) const - //*** Mapareas - del_all_items(GMapArea::MAPAREA_TAG, parser); - for(GPosition pos=map_areas;pos;++pos) -- parser.parse(map_areas[pos]->print()); -- -+ { -+ GUTF8String mapareabuffer = map_areas[pos]->print(); -+ parser.parse(mapareabuffer); -+ } - GP<ByteStream> gstr=ByteStream::create(); - ByteStream &str=*gstr; - parser.print(str, 1); --- -1.7.4.1 - -From 65600b5801d11ff8ca8db3a25bf004fc06f4515b Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Sat, 4 Jun 2011 15:29:18 -0700 -Subject: [PATCH] Eliminate warnings with gcc-4.6.0 - ---- - libdjvu/Arrays.cpp | 2 - - libdjvu/DjVuDocEditor.cpp | 37 +++++++++---------- - libdjvu/GString.cpp | 44 ++++++++-------------- - libdjvu/JPEGDecoder.cpp | 2 - - libdjvu/XMLParser.cpp | 7 +--- - tools/ddjvu.cpp | 2 +- - tools/jb2cmp/patterns.cpp | 87 +------------------------------------------- - tools/tiff2pdf.c | 9 ++--- - 8 files changed, 40 insertions(+), 150 deletions(-) - -diff --git a/libdjvu/Arrays.cpp b/libdjvu/Arrays.cpp -index c4f74ca..6c7f23a 100644 ---- a/libdjvu/Arrays.cpp -+++ b/libdjvu/Arrays.cpp -@@ -239,9 +239,7 @@ ArrayRep::ins(int n, const void * what, unsigned int howmany) - copy(ndata, lobound-minlo, hibound-minlo, - data, lobound-minlo, hibound-minlo); - destroy(data, lobound-minlo, hibound-minlo); -- void *tmp=data; - data=ndata; -- tmp=data; - maxhi = nmaxhi; - } - -diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp -index 2247e40..f1d8b0d 100644 ---- a/libdjvu/DjVuDocEditor.cpp -+++ b/libdjvu/DjVuDocEditor.cpp -@@ -555,27 +555,24 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page, - can_compress_flag); - } - -- // Oh. It does exist... Check that it has IFF structure -+ // Oh. It does exist... Check that it has IFF structure - { -- const GP<IFFByteStream> giff( -- IFFByteStream::create(file_pool->get_stream())); -- IFFByteStream &iff=*giff; -- GUTF8String chkid; -- -- int length; -- length=iff.get_chunk(chkid); -- if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" && -- chkid!="FORM:BM44" && chkid!="FORM:PM44") -- G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"+file_url.get_string()); -- -- // Wonderful. It's even a DjVu file. Scan for NDIR chunks. -- // If NDIR chunk is found, ignore the file -- while(iff.get_chunk(chkid)) -- { -- if (chkid=="NDIR") -- return false; -- iff.close_chunk(); -- } -+ const GP<IFFByteStream> giff( -+ IFFByteStream::create(file_pool->get_stream())); -+ IFFByteStream &iff=*giff; -+ GUTF8String chkid; -+ if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" && -+ chkid!="FORM:BM44" && chkid!="FORM:PM44") -+ G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t" -+ + file_url.get_string()); -+ // Wonderful. It's even a DjVu file. Scan for NDIR chunks. -+ // If NDIR chunk is found, ignore the file -+ while(iff.get_chunk(chkid)) -+ { -+ if (chkid=="NDIR") -+ return false; -+ iff.close_chunk(); -+ } - } - return insert_file(file_pool,file_url,is_page,file_pos,name2id,source); - } -diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp -index 350b11b..ed92a7f 100644 ---- a/libdjvu/GString.cpp -+++ b/libdjvu/GString.cpp -@@ -643,26 +643,22 @@ GBaseString::UTF8ToNative( - const char *source=(*this); - GP<GStringRep> retval; - if(source && source[0]) -- { --#if DO_CHANGELOCALE -- GUTF8String lc_ctype(setlocale(LC_CTYPE,0)); --#endif -- bool repeat; -- for(repeat=!currentlocale;;repeat=false) - { -- retval=(*this)->toNative((GStringRep::EscapeMode)escape); - #if DO_CHANGELOCALE -- if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,""))) -+ GUTF8String lc_ctype(setlocale(LC_CTYPE,0)); -+ bool repeat; -+ for(repeat=!currentlocale;;repeat=false) -+ { - #endif -- break; -- } -+ retval=(*this)->toNative((GStringRep::EscapeMode)escape); - #if DO_CHANGELOCALE -- if(!repeat) -- { -+ if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,""))) -+ break; -+ } -+ if(!repeat) - setlocale(LC_CTYPE,(const char *)lc_ctype); -- } - #endif -- } -+ } - return GNativeString(retval); - } - -@@ -697,27 +693,19 @@ GBaseString::NativeToUTF8(void) const - const char *source=(*this); - #if DO_CHANGELOCALE - GUTF8String lc_ctype=setlocale(LC_CTYPE,0); --#endif - bool repeat; - for(repeat=true;;repeat=false) -- { -- if( (retval=GStringRep::NativeToUTF8(source)) ) - { -- if(GStringRep::cmp(retval->toNative(),source)) -- { -- retval=GStringRep::UTF8::create((unsigned int)0); -- } -- } --#if DO_CHANGELOCALE -- if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,""))) - #endif -- break; -- } -+ if( (retval=GStringRep::NativeToUTF8(source)) ) -+ if(GStringRep::cmp(retval->toNative(),source)) -+ retval=GStringRep::UTF8::create((unsigned int)0); - #if DO_CHANGELOCALE -+ if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,""))) -+ break; -+ } - if(!repeat) -- { - setlocale(LC_CTYPE,(const char *)lc_ctype); -- } - #endif - } - return GUTF8String(retval); -diff --git a/libdjvu/JPEGDecoder.cpp b/libdjvu/JPEGDecoder.cpp -index cb7aa97..f22f77a 100644 ---- a/libdjvu/JPEGDecoder.cpp -+++ b/libdjvu/JPEGDecoder.cpp -@@ -153,7 +153,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix) - - JSAMPARRAY buffer; /* Output row buffer */ - int row_stride; /* physical row width in output buffer */ -- int full_buf_size; - int isGrey,i; - - cinfo.err = jpeg_std_error(&jerr.pub); -@@ -184,7 +183,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix) - - /* JSAMPLEs per row in output buffer */ - row_stride = cinfo.output_width * cinfo.output_components; -- full_buf_size = row_stride * cinfo.output_height; - - /* Make a one-row-high sample array that will go away when done with image */ - buffer = (*cinfo.mem->alloc_sarray) -diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp -index 7da923a..026b27d 100644 ---- a/libdjvu/XMLParser.cpp -+++ b/libdjvu/XMLParser.cpp -@@ -646,17 +646,12 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags, GURL *pdjvufile) - GPosition datapos=args.contains("data"); - if(datapos) - { -- bool isDjVuType=false; - GPosition typePos(args.contains("type")); - if(typePos) -- { -- if(args[typePos] != mimetype) - { -- // DjVuPrintErrorUTF8("Ignoring %s Object tag\n",mimetype); -+ if(args[typePos] != mimetype) - continue; - } -- isDjVuType=true; -- } - const GURL url = (pdjvufile) ? *pdjvufile - : GURL::UTF8(args[datapos], - (args[datapos][0] == '/') ? codebase.base() : codebase); -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index b9cb038..3b4ce16 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -855,7 +855,7 @@ parse_option(int argc, char **argv, int i) - die(i18n(errarg), opt); - flag_verbose = 1; - } -- if (!strcmp(opt,"skip")) -+ else if (!strcmp(opt,"skip")) - { - if (arg) - die(i18n(errarg), opt); -diff --git a/tools/jb2cmp/patterns.cpp b/tools/jb2cmp/patterns.cpp -index e456902..b31cf4e 100644 ---- a/tools/jb2cmp/patterns.cpp -+++ b/tools/jb2cmp/patterns.cpp -@@ -303,11 +303,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2, - int32 (*compare_row)(byte *, byte *, int32), - int32 (*compare_with_white)(byte *, int32), int32 ceiling) - { -- byte **p1, **p2; - int32 w1, w2, h1, h2; - int32 shift_x, shift_y; /* of i1's coordinate system with respect to i2 */ -- /*int32 s = 0, i, i_start, i_cap; -- int32 right_margin_start, right_margin_width;*/ - - /* make i1 to be narrower than i2 */ - if (i1->width > i2->width) -@@ -317,8 +314,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2, - i2 = img; - } - -- w1 = i1->width; h1 = i1->height; p1 = i1->pixels; -- w2 = i2->width; h2 = i2->height; p2 = i2->pixels; -+ w1 = i1->width; h1 = i1->height; -+ w2 = i2->width; h2 = i2->height; - - /* (shift_x, shift_y) */ - /* is what should be added to i1's coordinates to get i2's coordinates. */ -@@ -339,86 +336,6 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2, - - return distance_by_pixeldiff_functions_by_shift( - i1, i2, compare_row, compare_with_white, ceiling, shift_x, shift_y); -- --/* FIXME */ --#if 0 -- /* Compute difference in the non-overlapping top margin */ -- -- if (shift_y < 0) -- { -- /* i1 has top rows not covered by i2 */ -- i_cap = -shift_y; -- for (i = 0; i < i_cap; i++) -- { -- assert(i >= 0 && i < h1); -- s += compare_with_white(p1[i], w1); -- if (s > ceiling) return maxint; -- } -- i_start = i_cap; /* topmost overlapping row in i1's coords */ -- } -- else -- { -- /* i2 has top rows not covered by i1 */ -- for (i = 0; i < shift_y; i++) -- { -- assert(i >= 0 && i < h2); -- s += compare_with_white(p2[i], w2); -- if (s > ceiling) return maxint; -- } -- i_start = 0; -- } -- -- /* Compute difference in the overlapping area */ -- -- i_cap = h2 - shift_y; -- if (h1 < i_cap) i_cap = h1; -- -- right_margin_start = shift_x + w1; -- right_margin_width = w2 - right_margin_start; -- -- for (i = i_start; i < i_cap; i++) /* i is a coordinate in i1 system */ -- { -- int32 y = i + shift_y; /* same row coordinate in i2 system */ -- assert(y >= 0 && y < h2); -- s += compare_with_white(p2[y], shift_x); -- if (s > ceiling) return maxint; -- assert(i >= 0 && i < h1); -- assert(shift_x + w1 <= w2); -- assert(i < h1); -- s += compare_row(p2[y] + shift_x, p1[i], w1); -- if (s > ceiling) return maxint; -- s += compare_with_white(p2[y] + right_margin_start, right_margin_width); -- if (s > ceiling) return maxint; -- } -- -- -- /* Compute difference in the non-overlapping bottom margin */ -- -- if (i_cap == h1) -- { -- /* i2 has bottom rows not covered by i1 */ -- i_start = i_cap + shift_y; -- for (i = i_start; i < h2; i++) -- { -- assert(i >= 0 && i < h2); -- s += compare_with_white(p2[i], w2); -- if (s > ceiling) return maxint; -- } -- } -- else -- { -- /* i1 has bottom rows not covered by i2 */ -- i_start = i_cap; -- for (i = i_cap; i < h1; i++) -- { -- assert(i >= 0 && i < h1); -- s += compare_with_white(p1[i], w1); -- if (s > ceiling) return maxint; -- } -- } -- -- return s; --#endif - } - - #endif -diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c -index 36949f1..2db8703 100644 ---- a/tools/tiff2pdf.c -+++ b/tools/tiff2pdf.c -@@ -721,7 +721,6 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv) - const char *outfilename = "<null>"; - T2P *t2p = NULL; - TIFF *output = NULL; -- tsize_t written=0; - int c; - - /* T2P */ -@@ -874,7 +873,7 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv) - TIFFSeekFile(output, (toff_t) 0, SEEK_SET); - - /* Write */ -- written = t2p_write_pdf(t2p, input, output); -+ t2p_write_pdf(t2p, input, output); - if(t2p->t2p_error != 0){ - TIFFError(TIFF2PDF_MODULE, "An error occurred creating output PDF file"); - goto fail; -@@ -2633,7 +2632,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, - tsize_t read=0; - uint16 i=0; - ttile_t tilecount=0; -- tsize_t tilesize=0; - ttile_t septilecount=0; - tsize_t septilesize=0; - #ifdef JPEG_SUPPORT -@@ -2819,7 +2817,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, - if(t2p->pdf_sample == T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG){ - septilesize=TIFFTileSize(input); - septilecount=TIFFNumberOfTiles(input); -- tilesize=septilesize*t2p->tiff_samplesperpixel; - tilecount=septilecount/t2p->tiff_samplesperpixel; - buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize); - if(buffer==NULL){ -@@ -3802,7 +3799,6 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){ - tsize_t written=0; - char* info; - char buffer[512]; -- int buflen=0; - - if(t2p->pdf_datetime==NULL){ - t2p_pdf_tifftime(t2p, input); -@@ -3815,7 +3811,8 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){ - } - written += TIFFWriteFile(output, (tdata_t) "\r/Producer ", 11); - _TIFFmemset((tdata_t)buffer, 0x00, 512); -- buflen=sprintf(buffer, "libtiff / tiff2pdf - %d / %s", TIFFLIB_VERSION, T2P_VERSION); -+ sprintf(buffer, "libtiff / tiff2pdf - %d / %s", -+ TIFFLIB_VERSION, T2P_VERSION); - written += t2p_write_pdf_string(buffer, output); - written += TIFFWriteFile(output, (tdata_t) "\r", 1); - if(t2p->pdf_creator != NULL){ --- -1.7.4.1 - -From 5b3d074c2b315e7339ce279c559c3a99f26bef6a Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Sat, 4 Jun 2011 17:37:00 -0700 -Subject: [PATCH] Fix MMX code when using gcc-4.6 - -Fix MMX macros -Enable MMX on x86_64 ---- - libdjvu/MMX.cpp | 17 ++++++++++++++++- - libdjvu/MMX.h | 11 ++++++----- - tools/ddjvu.cpp | 1 - - 3 files changed, 22 insertions(+), 7 deletions(-) - -diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp -index 528dab6..e70fdd8 100644 ---- a/libdjvu/MMX.cpp -+++ b/libdjvu/MMX.cpp -@@ -167,8 +167,23 @@ MMXControl::enable_mmx() - : "=m" (cpuflags) : - : "eax","ecx","edx"); - #endif -+#if defined(MMX) && defined(__GNUC__) && defined(__x86_64__) -+ // Detection of MMX for GCC -+ __asm__ volatile (// Check that CR0:EM is clear -+ "xorl %%edx,%%edx\n\t" -+ "smsw %%ax\n\t" -+ "andl $4,%%eax\n\t" -+ "jnz 1f\n\t" -+ // Execute CPUID -+ "movl $1,%%eax\n\t" -+ "cpuid\n" -+ // Finish -+ "1:\tmovl %%edx, %0" -+ : "=m" (cpuflags) : -+ : "eax","ebx","ecx","edx"); -+#endif - #if defined(MMX) && defined(_MSC_VER) && defined(_M_IX86) -- // Detection of MMX for MSVC -+ // Detection of MMX for MSVC 32 bits - __asm { pushfd - pop ecx - xor edx,edx -diff --git a/libdjvu/MMX.h b/libdjvu/MMX.h -index b0af5e5..f8780af 100644 ---- a/libdjvu/MMX.h -+++ b/libdjvu/MMX.h -@@ -143,17 +143,18 @@ class MMXControl - - #ifndef NO_MMX - --#if defined(__GNUC__) && defined(__i386__) -+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -+typedef struct{ char c[8]; } MMX_t; - #define MMXemms \ - __asm__ volatile("emms" : : : "memory" ) - #define MMXrr(op,src,dst) \ -- __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory") -+ __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory" ) - #define MMXir(op,imm,dst) \ -- __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory") -+ __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory" ) - #define MMXar(op,addr,dst) \ -- __asm__ volatile( #op " %0,%%" #dst : : "m" (*(addr)) : "memory") -+ __asm__ volatile( #op " %0,%%" #dst : : "m" (*(MMX_t*)(addr)) : "memory" ) - #define MMXra(op,src,addr) \ -- __asm__ volatile( #op " %%" #src ",%0" : : "m" (*(addr)) : "memory") -+ __asm__ volatile( #op " %%" #src ",%0" : "=m" (*(MMX_t*)(addr)) : : "memory") - #define MMX 1 - #endif - -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index 3b4ce16..216c6cb 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -846,7 +846,6 @@ parse_option(int argc, char **argv, int i) - arg = opt; - opt = "subsample"; - } -- - /* Parse options */ - if (!strcmp(opt,"v") || - !strcmp(opt,"verbose")) --- -1.7.4.1 - -From fbed8e51e5970b12ce36afb0dec8c4e02992c0f8 Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Thu, 9 Jun 2011 14:37:52 -0700 -Subject: [PATCH] Fixed regression in djvm. - ---- - libdjvu/DjVuDocEditor.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp -index f1d8b0d..baeb7dd 100644 ---- a/libdjvu/DjVuDocEditor.cpp -+++ b/libdjvu/DjVuDocEditor.cpp -@@ -561,6 +561,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page, - IFFByteStream::create(file_pool->get_stream())); - IFFByteStream &iff=*giff; - GUTF8String chkid; -+ iff.get_chunk(chkid); - if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" && - chkid!="FORM:BM44" && chkid!="FORM:PM44") - G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t" --- -1.7.4.1 - -From f63327438954b8831a1a9f43afc8b6d16e1d3baf Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Wed, 15 Jun 2011 00:05:50 -0700 -Subject: [PATCH] Encode oblique text as separate lines. - ---- - tools/csepdjvu.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp -index d5203d5..08f7a27 100644 ---- a/tools/csepdjvu.cpp -+++ b/tools/csepdjvu.cpp -@@ -1288,7 +1288,7 @@ Comments::textmark(GP<TxtMark> mark) - int shx = (mark->x - lastx) * 100 / fontsize; - int shy = (mark->y - lasty) * 100 / fontsize; - int inter = dirx * shx + diry * shy; -- if ( (dirx == lastdirx) && (diry == lastdiry) && -+ if ( (dirx || diry) && (dirx == lastdirx) && (diry == lastdiry) && - (inter > -150) && (inter < 300) && - abs(diry * shx + dirx * shy) < 80 ) - mark->inter = inter; --- -1.7.4.1 - -From ea9fd2acab2e298ba721eb79f5026d34e6ef141f Mon Sep 17 00:00:00 2001 -From: Barak A. Pearlmutter <barak+git@cs.nuim.ie> -Date: Wed, 22 Jun 2011 11:21:41 +0100 -Subject: [PATCH] consistent prototype for ddjvu_anno_get_xmp - ---- - libdjvu/ddjvuapi.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h -index 841f223..14b63eb 100644 ---- a/libdjvu/ddjvuapi.h -+++ b/libdjvu/ddjvuapi.h -@@ -1619,7 +1619,7 @@ ddjvu_anno_get_metadata(miniexp_t annotations, miniexp_t key); - Returns zero if no such key is present. */ - - DDJVUAPI const char * --ddjvu_anno_get_xmp(miniexp_t annotations, miniexp_t xmp); -+ddjvu_anno_get_xmp(miniexp_t annotations); - - - /* -------------------------------------------------- */ --- -1.7.4.1 - -From 701d1261493e175955aac97921949f4e4241750d Mon Sep 17 00:00:00 2001 -From: Leon Bottou <leon@bottou.org> -Date: Sun, 11 Sep 2011 09:59:26 -0700 -Subject: [PATCH] Fixed typo in man page. - ---- - tools/ddjvu.1 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tools/ddjvu.1 b/tools/ddjvu.1 -index 7d3d105..cbb8307 100644 ---- a/tools/ddjvu.1 -+++ b/tools/ddjvu.1 -@@ -66,7 +66,7 @@ and - .BR "ppm" - respectively produce a Portable Bitmap (PBM), - Portable Graymap (PGM), --or Portable Pixmap (PGM) file. -+or Portable Pixmap (PPM) file. - Format - .B "pnm" - produces a PBM, PGM, or PPM --- -1.7.4.1 - diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD deleted file mode 100644 index 849754c1e..000000000 --- a/staging/dvdauthor/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 146985 2012-01-19 22:25:27Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> -# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> - -pkgname=dvdauthor -pkgver=0.7.0 -pkgrel=4 -pkgdesc="DVD authoring tools" -arch=('i686' 'x86_64') -url="http://dvdauthor.sourceforge.net/" -license=('GPL') -depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') -options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'dvdauthor-0.7.0-libpng15.patch') -md5sums=('33a447fb98ab3293ac40f869eedc17ff' - '9ea90bbea6adb0469c8c1b2f7d033f11') - -build() { - cd "${srcdir}/${pkgname}" - - patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch deleted file mode 100644 index 2bb636380..000000000 --- a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/spuunmux.c -+++ src/spuunmux.c -@@ -39,6 +39,7 @@ - #include <netinet/in.h> - - #include <png.h> -+#include <zlib.h> - - #include "rgb.h" - #include "common.h" -@@ -610,7 +611,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - return -1; - } /*if*/ -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(fp); diff --git a/staging/emacs/PKGBUILD b/staging/emacs/PKGBUILD deleted file mode 100644 index ec5d8568e..000000000 --- a/staging/emacs/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 147096 2012-01-21 21:55:38Z eric $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> - -pkgname=emacs -_majorver=23.3 -_minorver=b -# We want something like "23.3.a" so pacman version comparison works, but -# upstream uses "23.3a", which is a bit silly and interpreted as alpha. -pkgver=$_majorver.$_minorver -_realver=$_majorver$_minorver -pkgrel=2 -pkgdesc="The extensible, customizable, self-documenting real-time display editor" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') -install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.bz2{,.sig} emacs-subversion17.patch) -md5sums=('917ce0054ef63773078a6e99b55df1ee' - '4f987fbb906c0ee73e05904b0f7ce5ec' - '12e2e7a66df5cc5ded54e1d30083a1fb') - -build() { - cd "$srcdir"/$pkgname-$_majorver - patch -p1 -i ../emacs-subversion17.patch - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=gtk --with-xft - make -} - -package() { - cd "$srcdir"/$pkgname-$_majorver - make DESTDIR="$pkgdir" install - - # remove conflict with ctags package - mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} - mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1} - # fix all the 777 perms on directories - find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; - # fix user/root permissions on usr/share files - find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \; - # fix perms on /var/games - chmod 775 "$pkgdir"/var/games - chmod 775 "$pkgdir"/var/games/emacs - chmod 664 "$pkgdir"/var/games/emacs/* - chown -R root:games "$pkgdir"/var/games -} diff --git a/staging/emacs/emacs-subversion17.patch b/staging/emacs/emacs-subversion17.patch deleted file mode 100644 index e7969de81..000000000 --- a/staging/emacs/emacs-subversion17.patch +++ /dev/null @@ -1,83 +0,0 @@ -From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001 -From: Karl Pflästerer <k@rl.pflaesterer.de> -Date: Sat, 12 Feb 2011 01:12:53 +0000 -Subject: Adapt to Subversion change, with no .svn directory in each sub directory. - -http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html - -* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root. -(vc-svn-root): New function. Make vc-svn-responsible-p an alias. -(vc-svn-repository-hostname): Use "svn info". ---- -(limited to 'lisp/vc/vc-svn.el') - -diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el -index aefef50..20c7689 100644 ---- a/lisp/vc-svn.el -+++ b/lisp/vc-svn.el -@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t." - ;;;###autoload (getenv "SVN_ASP_DOT_NET_HACK")) - ;;;###autoload "_svn") - ;;;###autoload (t ".svn")))) --;;;###autoload (when (file-readable-p (expand-file-name --;;;###autoload (concat admin-dir "/entries") --;;;###autoload (file-name-directory f))) -+;;;###autoload (when (vc-find-root f admin-dir) - ;;;###autoload (load "vc-svn") - ;;;###autoload (vc-svn-registered f)))) - - (defun vc-svn-registered (file) - "Check if FILE is SVN registered." -- (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory -- "/entries") -- (file-name-directory file))) -+ (when (vc-svn-root file) - (with-temp-buffer - (cd (file-name-directory file)) - (let* (process-file-side-effects -@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches' - to the SVN command." - (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register))) - --(defun vc-svn-responsible-p (file) -- "Return non-nil if SVN thinks it is responsible for FILE." -- (file-directory-p (expand-file-name vc-svn-admin-directory -- (if (file-directory-p file) -- file -- (file-name-directory file))))) -+(defun vc-svn-root (file) -+ (vc-find-root file vc-svn-admin-directory)) - --(defalias 'vc-svn-could-register 'vc-svn-responsible-p -+(defalias 'vc-svn-responsible-p 'vc-svn-root) -+ -+(defalias 'vc-svn-could-register 'vc-svn-root - "Return non-nil if FILE could be registered in SVN. - This is only possible if SVN is responsible for FILE's directory.") - -@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." - - (defun vc-svn-repository-hostname (dirname) - (with-temp-buffer -- (let ((coding-system-for-read -- (or file-name-coding-system -- default-file-name-coding-system))) -- (vc-insert-file (expand-file-name (concat vc-svn-admin-directory -- "/entries") -- dirname))) -+ (let (process-file-side-effects) -+ (vc-svn-command t t dirname "info" "--xml")) - (goto-char (point-min)) -- (when (re-search-forward -- ;; Old `svn' used name="svn:this_dir", newer use just name="". -- (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*" -- "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?" -- "url=\"\\(?1:[^\"]+\\)\"" -- ;; Yet newer ones don't use XML any more. -- "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t) -+ (when (re-search-forward "<url>\\(.*\\)</url>" nil t) - ;; This is not a hostname but a URL. This may actually be considered - ;; as a feature since it allows vc-svn-stay-local to specify different - ;; behavior for different modules on the same server. --- -cgit v0.9.0.2 diff --git a/staging/emacs/emacs.install b/staging/emacs/emacs.install deleted file mode 100644 index d84f1de14..000000000 --- a/staging/emacs/emacs.install +++ /dev/null @@ -1,32 +0,0 @@ -ICON_PATH=usr/share/icons/hicolor -INFO_DIR=usr/share/info - -INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake -forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar tramp url vip viper widget woman) - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null - done -} diff --git a/staging/enblend-enfuse/PKGBUILD b/staging/enblend-enfuse/PKGBUILD deleted file mode 100644 index b8e04522a..000000000 --- a/staging/enblend-enfuse/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 146965 2012-01-19 18:31:50Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=enblend-enfuse -pkgver=4.0 -pkgrel=5 -pkgdesc="Intelligent blend tool for overlapping picture" -arch=("i686" "x86_64") -license=('GPL') -url="http://enblend.sourceforge.net" -depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng') -makedepends=('boost') -replaces=('enblend') -conflicts=('enblend') -provides=('enblend') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \ - libpng-1.4.patch enblend-4.0-libpng15.patch) -sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' - 'aac6364b29b0a9d6c61c3db0982f52ce1579e934' - 'eae6cf48ea082865130302d0b4d1ca0b884a563b' - '71e961d90be842eafe9d473d8d70b04b29077036') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" - sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx - patch -p1 -i ../libpng-1.4.patch - patch -p0 -i ../enblend-4.0-libpng15.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" - make DESTDIR="${pkgdir}" install - install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" - install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" -} diff --git a/staging/enblend-enfuse/enblend-4.0-libpng15.patch b/staging/enblend-enfuse/enblend-4.0-libpng15.patch deleted file mode 100644 index d4465ccad..000000000 --- a/staging/enblend-enfuse/enblend-4.0-libpng15.patch +++ /dev/null @@ -1,220 +0,0 @@ ---- src/vigra_impex/png.cxx -+++ src/vigra_impex/png.cxx -@@ -81,7 +81,7 @@ - static void PngError( png_structp png_ptr, png_const_charp error_msg ) - { - png_error_message = std::string(error_msg); -- longjmp( png_ptr->jmpbuf, 1 ); -+ longjmp( png_jmpbuf( png_ptr ), 1 ); - } - - // called on non-fatal errors -@@ -213,7 +213,7 @@ - vigra_postcondition( png != 0, "could not create the read struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); - } -@@ -221,14 +221,14 @@ - vigra_postcondition( info != 0, "could not create the info struct." ); - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } - png_init_io( png, file.get() ); - - // specify that the signature was already read -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); - } -@@ -244,13 +244,13 @@ - void PngDecoderImpl::init() - { - // read all chunks up to the image data -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); - png_read_info( png, info ); - - // pull over the header fields - int interlace_method, compression_method, filter_method; -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); - png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, - &interlace_method, &compression_method, &filter_method ); -@@ -264,7 +264,7 @@ - - // transform palette to rgb - if ( color_type == PNG_COLOR_TYPE_PALETTE) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); - png_set_palette_to_rgb(png); - color_type = PNG_COLOR_TYPE_RGB; -@@ -273,7 +273,7 @@ - - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); - png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; -@@ -283,7 +283,7 @@ - #if 0 - // strip alpha channel - if ( color_type & PNG_COLOR_MASK_ALPHA ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); - png_set_strip_alpha(png); - color_type ^= PNG_COLOR_MASK_ALPHA; -@@ -323,12 +323,12 @@ - - // read icc profile - #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) -- char * dummyName; -+ png_charpp dummyName; - int dummyCompType; -- char * profilePtr; -+ png_bytepp profilePtr; - png_uint_32 profileLen; -- if (info->valid & PNG_INFO_iCCP) { -- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; -+ if (png_get_valid(png, info, PNG_INFO_iCCP)) { -+ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; - iccProfilePtr = (unsigned char *) profilePtr; - iccProfileLength = profileLen; - } -@@ -340,7 +340,7 @@ - // image gamma - double image_gamma = 0.45455; - if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); - png_get_gAMA( png, info, &image_gamma ); - } -@@ -349,26 +349,26 @@ - double screen_gamma = 2.2; - - // set gamma correction -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); - png_set_gamma( png, screen_gamma, image_gamma ); - #endif - - // interlace handling, get number of read passes needed -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); - n_interlace_passes = png_set_interlace_handling(png); - - // update png library state to reflect any changes that were made -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); - png_read_update_info( png, info ); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); - n_channels = png_get_channels(png, info); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); - rowsize = png_get_rowbytes(png, info); - -@@ -379,7 +379,7 @@ - void PngDecoderImpl::nextScanline() - { - for (int i=0; i < n_interlace_passes; i++) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); - png_read_row(png, row_data.begin(), NULL); - } -@@ -545,7 +545,7 @@ - vigra_postcondition( png != 0, "could not create the write struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); - } -@@ -556,7 +556,7 @@ - } - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } -@@ -571,7 +571,7 @@ - void PngEncoderImpl::finalize() - { - // write the IHDR -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); - png_set_IHDR( png, info, width, height, bit_depth, color_type, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, -@@ -579,7 +579,7 @@ - - // set resolution - if (x_resolution > 0 && y_resolution > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); - png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5), - (png_uint_32) (y_resolution / 0.0254 + 0.5), -@@ -588,7 +588,7 @@ - - // set offset - if (position.x > 0 && position.y > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); - png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); - } -@@ -597,12 +597,12 @@ - // set icc profile - if (iccProfile.size() > 0) { - png_set_iCCP(png, info, "icc", 0, -- (char *)iccProfile.begin(), iccProfile.size()); -+ iccProfile.begin(), iccProfile.size()); - } - #endif - - // write the info struct -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); - png_write_info( png, info ); - -@@ -634,10 +634,10 @@ - } - - // write the whole image -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); - png_write_image( png, row_pointers.begin() ); -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); - png_write_end(png, info); - } diff --git a/staging/enblend-enfuse/enblend-enfuse.install b/staging/enblend-enfuse/enblend-enfuse.install deleted file mode 100644 index 24ea28a4e..000000000 --- a/staging/enblend-enfuse/enblend-enfuse.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(enblend.info enfuse.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 -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/enblend-enfuse/libpng-1.4.patch b/staging/enblend-enfuse/libpng-1.4.patch deleted file mode 100644 index 3bf852b58..000000000 --- a/staging/enblend-enfuse/libpng-1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx ---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 -+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 -@@ -275,8 +275,8 @@ - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - diff --git a/staging/evince/PKGBUILD b/staging/evince/PKGBUILD deleted file mode 100644 index 3920b1772..000000000 --- a/staging/evince/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 147248 2012-01-25 02:33:36Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evince -pkgver=3.2.1 -pkgrel=3 -pkgdesc="Simply a document viewer" -url="http://projects.gnome.org/evince/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') -makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') -optdepends=('texlive-bin: DVI support') -groups=('gnome-extra') -install=evince.install -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/evince \ - --disable-static --enable-nautilus \ - --enable-pdf --enable-tiff \ - --enable-djvu --enable-dvi \ - --enable-t1lib --enable-comics \ - --disable-scrollkeeper --disable-schemas-compile \ - --enable-introspection - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/evince/evince.install b/staging/evince/evince.install deleted file mode 100644 index 9643a9ba0..000000000 --- a/staging/evince/evince.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall evince - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/evolution-data-server/PKGBUILD b/staging/evolution-data-server/PKGBUILD deleted file mode 100644 index b49dbed88..000000000 --- a/staging/evolution-data-server/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 145813 2012-01-02 10:05:49Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-data-server -pkgver=3.2.2 -pkgrel=2 -pkgdesc="Centralized access to appointments and contacts" -arch=('i686' 'x86_64') -depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') -options=('!libtool') -url="http://www.gnome.org" -license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-openldap=yes \ - --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/evolution-exchange/PKGBUILD b/staging/evolution-exchange/PKGBUILD deleted file mode 100644 index 14d003a4d..000000000 --- a/staging/evolution-exchange/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 145815 2012-01-02 10:16:37Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-exchange -pkgver=3.2.1 -pkgrel=2 -pkgdesc="Ximian Connector Exchange plugin for Evolution" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.ximian.com" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') -makedepends=('intltool' 'evolution') -options=('!libtool' '!emptydirs') -install=evolution-exchange.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/evolution --disable-static \ - --with-libdb=/usr --with-krb5=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas -} diff --git a/staging/evolution-exchange/evolution-exchange.install b/staging/evolution-exchange/evolution-exchange.install deleted file mode 100644 index 1179887f9..000000000 --- a/staging/evolution-exchange/evolution-exchange.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=evolution-exchange - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/staging/evolution-groupwise/PKGBUILD b/staging/evolution-groupwise/PKGBUILD deleted file mode 100644 index a5f6a12cc..000000000 --- a/staging/evolution-groupwise/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 145817 2012-01-02 10:20:33Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=evolution-groupwise -pkgver=3.2.1 -pkgrel=2 -pkgdesc="GroupWise connector for evolution" -arch=(i686 x86_64) -url="http://projects.gnome.org/evolution/" -license=(LGPL) -depends=('evolution-data-server' 'gtkhtml4') -makedepends=(intltool evolution) -optdepends=('evolution: evolution plugin') -options=(!libtool) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - diff --git a/staging/fbida/PKGBUILD b/staging/fbida/PKGBUILD deleted file mode 100644 index c7fa1f6d6..000000000 --- a/staging/fbida/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 146887 2012-01-19 03:44:47Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=fbida -pkgver=2.08 -pkgrel=2 -pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" -arch=('i686' 'x86_64') -url="http://www.kraxel.org/blog/linux/fbida/" -license=('GPL2') -depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl') -makedepends=('libxpm') -optdepends=('ghostscript: to use fbgs') -source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('9b3693ab26a58194e36b479bffb61ed0') -sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/ungif/gif/' GNUmakefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" prefix=/usr install -} diff --git a/staging/feh/PKGBUILD b/staging/feh/PKGBUILD deleted file mode 100644 index 794de592d..000000000 --- a/staging/feh/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 146881 2012-01-19 03:22:03Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=feh -pkgver=2.2 -pkgrel=2 -pkgdesc='Fast and light imlib2-based image viewer' -url='http://feh.finalrewind.org/' -license=('MIT') -arch=('i686' 'x86_64') -depends=('giblib' 'curl' 'libxinerama') -optdepends=('perl: feh-cam, webcam wrapper for feh') -makedepends=('libxt') -source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/ffmpegthumbnailer/PKGBUILD b/staging/ffmpegthumbnailer/PKGBUILD deleted file mode 100644 index 7cc1baea4..000000000 --- a/staging/ffmpegthumbnailer/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: boromil@gmail.com - -pkgname=ffmpegthumbnailer -pkgver=2.0.7 -pkgrel=3 -pkgdesc="Lightweight video thumbnailer that can be used by file managers." -url="http://code.google.com/p/ffmpegthumbnailer/" -license=('GPL2') -arch=('i686' 'x86_64') -depends=('ffmpeg' 'libjpeg' 'libpng') -optdepends=('gvfs: support for gio uris') -source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" - 'ffmpegthumbnailer.desktop') -options=('!libtool') -sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' - 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --enable-gio - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # FS#24105: Generate thumbnails in nautilus - install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \ - "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop" -} diff --git a/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop deleted file mode 100644 index 79203e5bc..000000000 --- a/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Thumbnailer Entry] -TryExec=ffmpegthumbnailer -Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10 -MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v; diff --git a/staging/fltk/PKGBUILD b/staging/fltk/PKGBUILD deleted file mode 100644 index 2a830946f..000000000 --- a/staging/fltk/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 146979 2012-01-19 21:29:09Z eric $ -# Maintainer: - -pkgbase=fltk -pkgname=('fltk' 'fltk-docs' 'fltk-games') -pkgver=1.3.0 -pkgrel=3 -arch=('i686' 'x86_64') -license=('custom:LGPL') -url="http://www.fltk.org/" -makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \ - 'alsa-lib' 'desktop-file-utils') -source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz) -md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3') - -build() { - cd "$srcdir/$pkgbase-$pkgver" - sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \ - -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile - ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared - make - cd documentation - make html -} - -package_fltk() { - pkgdesc="Graphical user interface toolkit for X" - depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \ - 'desktop-file-utils' 'xdg-utils') - options=('!docs') - install=fltk.install - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - (cd fluid; make DESTDIR="$pkgdir" install install-linux) - chmod 644 "$pkgdir"/usr/lib/*.a - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_fltk-docs() { - pkgdesc="Graphical user interface toolkit for X (documentation)" - - cd "$srcdir/$pkgbase-$pkgver/documentation" - install -d "$pkgdir"/usr/share/doc/fltk/ - for _file in html/* ; do - install -m644 $_file "$pkgdir"/usr/share/doc/fltk/ - done - cd ../test - make DESTDIR="$pkgdir" install - install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_fltk-games() { - pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku" - depends=('alsa-lib' 'fltk') - install=fltk-games.install - - cd "$srcdir/$pkgbase-$pkgver/test" - make DESTDIR="$pkgdir" install-linux - (cd ../documentation; make DESTDIR="$pkgdir" install-linux) - install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/fltk/fltk-games.install b/staging/fltk/fltk-games.install deleted file mode 100644 index f3fe2b08b..000000000 --- a/staging/fltk/fltk-games.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/staging/fltk/fltk.install b/staging/fltk/fltk.install deleted file mode 100644 index f89ec8213..000000000 --- a/staging/fltk/fltk.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/staging/fontforge/PKGBUILD b/staging/fontforge/PKGBUILD deleted file mode 100644 index f5dc25f1a..000000000 --- a/staging/fontforge/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 146903 2012-01-19 04:55:00Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=fontforge -pkgver=20120119 -pkgrel=1 -pkgdesc='Outline and bitmap font editor' -arch=('i686' 'x86_64') -url='http://fontforge.sourceforge.net/' -license=('BSD') -depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro') -options=('!libtool' '!makeflags') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c') - -# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/python /python2 /g' Makefile.dynamic.in - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-type3 \ - --enable-devicetables \ - --enable-double \ - --with-regular-link \ - --with-python=python2 \ - --enable-pyextension \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/fvwm/PKGBUILD b/staging/fvwm/PKGBUILD deleted file mode 100644 index 89af20969..000000000 --- a/staging/fvwm/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 146983 2012-01-19 22:19:37Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=fvwm -pkgver=2.6.3 -pkgrel=2 -pkgdesc="A multiple large virtual desktop window manager originally derived from twm" -arch=('i686' 'x86_64') -url="http://www.fvwm.org" -license=('GPL' 'custom') -depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') -makedepends=('libxslt') -provides=('fvwm-devel') -conflicts=('fvwm-devel') -replaces=('fvwm-devel') -options=('!emptydirs' '!makeflags') -source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) -sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39' - '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm" - install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/staging/fvwm/fvwm.desktop b/staging/fvwm/fvwm.desktop deleted file mode 100644 index e297a6109..000000000 --- a/staging/fvwm/fvwm.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=FVWM -Comment=The fvwm window manager -Type=XSession -Exec=/usr/bin/fvwm -TryExec=/usr/bin/fvwm diff --git a/staging/gd/PKGBUILD b/staging/gd/PKGBUILD deleted file mode 100644 index d2c40835a..000000000 --- a/staging/gd/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 146845 2012-01-18 20:23:55Z ibiru $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -pkgname=gd -pkgver=2.0.36RC1 -pkgrel=5 -pkgdesc="Library for the dynamic creation of images by programmers" -arch=('i686' 'x86_64') -url="http://www.libgd.org/" -license=('custom') -depends=('libpng' 'fontconfig' 'libjpeg') -optdepends=('perl: bdftogd script') -options=('!libtool') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'libpng14.patch') -md5sums=('e876979ca3130623a4e7866d9579171a' - '7921556f4960e8d66cf4fb67ea7101b5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ${srcdir}/libpng14.patch - ./configure --prefix=/usr --without-xpm - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/gd/libpng14.patch b/staging/gd/libpng14.patch deleted file mode 100644 index 19a3fda91..000000000 --- a/staging/gd/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c ---- gd-2.0.36RC1.orig/gd_png.c 2007-11-27 10:30:34.000000000 +0200 -+++ gd-2.0.36RC1/gd_png.c 2010-01-17 17:14:11.000000000 +0200 -@@ -151,7 +151,7 @@ - return NULL; - } - -- if (!png_check_sig (sig, 8)) { /* bad signature */ -+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ - return NULL; /* bad signature */ - } - diff --git a/staging/gdk-pixbuf2/PKGBUILD b/staging/gdk-pixbuf2/PKGBUILD deleted file mode 100644 index bf38ef13e..000000000 --- a/staging/gdk-pixbuf2/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 146826 2012-01-18 19:45:40Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=gdk-pixbuf2 -pkgver=2.24.1 -pkgrel=2 -pkgdesc="An image loading library" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') -makedepends=('gtk-doc' 'gobject-introspection') -options=('!libtool') -install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1') - -build() { - cd "$srcdir/gdk-pixbuf-$pkgver" - - ./configure --prefix=/usr \ - --without-libjasper \ - --with-x11 \ - --with-included-loaders=png - make -} - -package() { - cd "$srcdir/gdk-pixbuf-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/gdk-pixbuf2/gdk-pixbuf2.install b/staging/gdk-pixbuf2/gdk-pixbuf2.install deleted file mode 100644 index 1b35942cb..000000000 --- a/staging/gdk-pixbuf2/gdk-pixbuf2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache -} diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD deleted file mode 100644 index 9fecb8b2e..000000000 --- a/staging/gegl/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 146879 2012-01-19 03:20:59Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gegl -pkgver=0.1.8 -pkgrel=2 -pkgdesc="Graph based image processing framework" -arch=('i686' 'x86_64') -url="http://www.gegl.org/" -license=('GPL3' 'LGPL3') -depends=('babl' 'gtk2') -makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') -optdepends=('openexr: for using the openexr plugin' \ - 'ffmpeg: for using the ffmpeg plugin' \ - 'librsvg: for using the svg plugin' \ - 'jasper: for using the jasper plugin') -options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ - --with-libavformat --with-jasper --disable-docs - make -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make check -#} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gif2png/PKGBUILD b/staging/gif2png/PKGBUILD deleted file mode 100644 index 2e530eaba..000000000 --- a/staging/gif2png/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 146933 2012-01-19 11:45:57Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: eric <eric@archlinux.org> -# Contributor: Andrew Rose <ody@netrux.com> - -pkgname=gif2png -pkgver=2.5.4 -pkgrel=3 -pkgdesc="A GIF to PNG image format converter" -arch=('i686' 'x86_64') -url="http://www.catb.org/~esr/gif2png/" -license=('ZLIB') -depends=('libpng') -optdepends=('python2: for using web2png') -source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gif2png-2.5.4-libpng15.patch') -md5sums=('d63ea3fc6b6119589e8d4d6fead30df9' - 'd4d6d31e04e7448315eae56bb12d4df6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's#env python#env python2#' web2png - patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch - - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/gif2png/gif2png-2.5.4-libpng15.patch b/staging/gif2png/gif2png-2.5.4-libpng15.patch deleted file mode 100644 index 9e5c333bb..000000000 --- a/staging/gif2png/gif2png-2.5.4-libpng15.patch +++ /dev/null @@ -1,43 +0,0 @@ -ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa - ---- gif2png.c -+++ gif2png.c -@@ -10,6 +10,7 @@ - #include <string.h> - #include <stdlib.h> - #include <unistd.h> /* for isatty() */ -+#include <zlib.h> - - #if !defined(TRUE) - #define FALSE 0 -@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc - int colors_used = 0; - byte remap[MAXCMSIZE]; - int low_prec; -- png_struct *png_ptr = xalloc(sizeof (png_struct)); -- png_info *info_ptr = xalloc(sizeof (png_info)); -+ png_struct *png_ptr; -+ png_info *info_ptr; - int p; - int gray_bitdepth; - png_color pal_rgb[MAXCMSIZE], *pltep; -@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc - png_text software; - png_text comment; - -+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); -+ if (png_ptr == NULL) { -+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); -+ fprintf(stderr, "gif2png: exiting ungracefully\n"); -+ exit(1); -+ } -+ info_ptr = png_create_info_struct(png_ptr); -+ if (info_ptr == NULL) { -+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); -+ fprintf(stderr, "gif2png: exiting ungracefully\n"); -+ exit(1); -+ } -+ - /* these volatile declarations prevent gcc warnings ("variable might be - * clobbered by `longjmp' or `vfork'") */ - volatile int gray = TRUE; diff --git a/staging/gimp-dbp/PKGBUILD b/staging/gimp-dbp/PKGBUILD deleted file mode 100644 index 7575150dc..000000000 --- a/staging/gimp-dbp/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 147086 2012-01-21 18:00:41Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gimp-dbp -pkgver=1.1.9 -pkgrel=3 -pkgdesc="David's batch processor for the GIMP" -arch=('i686' 'x86_64') -url="http://members.ozemail.com.au/~hodsond/dbp.html" -license=('GPL') -depends=('gimp') -source=(http://www.ozemail.com.au/~hodsond/dbpSrc-${pkgver//./-}.tgz) -md5sums=('1106625707798ab8ea1317ac6bece1c5') - -build() { - cd "${srcdir}/dbp-${pkgver}" - sed -i "s|<string>|<cstring>|" op.h - make -} - -package() { - cd "${srcdir}/dbp-${pkgver}" - install -D -m755 dbp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/dbp" -} diff --git a/staging/gimp-devel/PKGBUILD b/staging/gimp-devel/PKGBUILD deleted file mode 100644 index 4f5e74b22..000000000 --- a/staging/gimp-devel/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 147053 2012-01-21 05:38:18Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gimp-devel -pkgver=2.7.4 -pkgrel=2 -pkgdesc="GNU Image Manipulation Program (Development Version)" -arch=('i686' 'x86_64') -url="http://www.gimp.org/" -license=('GPL3' 'LGPL3') -depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \ - 'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') -optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' - 'libwebkit: for the help browser or web-page plug-ins' - 'poppler-glib: for pdf support' - 'alsa-lib: for MIDI event controller module' - 'curl: for URI support') -options=('!libtool' '!makeflags') -conflicts=('gimp') -provides=("gimp=${pkgver}") -install=gimp-devel.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl) -md5sums=('bda95a29c3483b8ff458b06b1543f867' - 'bb27bc214261d36484093e857f015f38') - -build() { - cd "${srcdir}/gimp-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-mp --enable-gimp-console --enable-python --with-libcurl \ - --with-gif-compression=lzw --without-aa --without-gvfs - make -} - -#check() { -# cd "${srcdir}/gimp-${pkgver}" -# make check -#} - -package() { - cd "${srcdir}/gimp-${pkgver}" - make DESTDIR="${pkgdir}" install - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py - install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" - - ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" - ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz" - ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" - ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz" - - ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp" - ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console" - ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" -} diff --git a/staging/gimp-devel/gimp-devel.install b/staging/gimp-devel/gimp-devel.install deleted file mode 100644 index c317fbaca..000000000 --- a/staging/gimp-devel/gimp-devel.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/gimp-devel/linux.gpl b/staging/gimp-devel/linux.gpl deleted file mode 100644 index 0a73d8979..000000000 --- a/staging/gimp-devel/linux.gpl +++ /dev/null @@ -1,19 +0,0 @@ -GIMP Palette -Name: linux -# - 0 0 0 - 0 0 170 - 0 170 0 - 0 170 170 -170 0 0 -170 0 170 -170 85 0 -170 170 170 - 85 85 85 - 85 85 255 - 85 255 85 - 85 255 255 -255 85 85 -255 85 255 -255 255 85 -255 255 255 diff --git a/staging/gimp-ufraw/PKGBUILD b/staging/gimp-ufraw/PKGBUILD deleted file mode 100644 index 229159b5e..000000000 --- a/staging/gimp-ufraw/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 147080 2012-01-21 17:07:06Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> - -pkgname=gimp-ufraw -pkgver=0.18 -pkgrel=4 -pkgdesc="Standalone or gimp plugin converter for raw files" -url="http://ufraw.sourceforge.net/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils') -makedepends=('gimp' 'cinepaint') -optdepends=('gimp: to use the gimp import plugin for raw images' - 'cinepaint: to use the cinepaint import plugin for raw images') -install=gimp-ufraw.install -source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz) -sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2') - -build() { - cd "${srcdir}/ufraw-${pkgver}" - - ./configure --prefix=/usr \ - --enable-extras \ - --enable-mime \ - --enable-openmp - sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile - make -} - -package() { - cd "${srcdir}/ufraw-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/bin/dcraw" -} diff --git a/staging/gimp-ufraw/gimp-ufraw.install b/staging/gimp-ufraw/gimp-ufraw.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/gimp-ufraw/gimp-ufraw.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/gimp/PKGBUILD b/staging/gimp/PKGBUILD deleted file mode 100644 index 6a95fb2b3..000000000 --- a/staging/gimp/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 147055 2012-01-21 08:27:32Z eric $ -# Maintainer: tobias <tobias@archlinux.org> - -pkgname=gimp -pkgver=2.6.11 -pkgrel=8 -pkgdesc="GNU Image Manipulation Program" -arch=('i686' 'x86_64') -url="http://www.gimp.org/" -license=('GPL' 'LGPL') -depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ - 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') -optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' - 'libwebkit: for the help browser' - 'poppler-glib: for pdf support' - 'alsa-lib: for MIDI event controller module' - 'curl: for URI support') -options=('!libtool' '!makeflags') -conflicts=('gimp-devel') -install=gimp.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl - uri-backend-libcurl.patch gimp-poppler-0.18.patch libpng_compile.patch) -sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c' - '110ce9798173b19a662d086ed7b882b4729f06cf' - 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4' - '1479a6d80be7adf74f66a3b88057a5029fe892e8' - '5ce329d2e2cb136e93f16117fa79ab6e31866f68') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../uri-backend-libcurl.patch - patch -p1 < ../gimp-poppler-0.18.patch - patch -p1 < ../libpng_compile.patch - PYTHON=/usr/bin/python2 LIBS+="-lgobject-2.0 -lglib-2.0 -lm" \ - ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-mp --enable-gimp-console --enable-gimp-remote \ - --enable-python --with-gif-compression=lzw --with-libcurl \ - --without-aa --without-hal --without-gvfs --without-gnomevfs - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py - install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" - - rm "${pkgdir}/usr/share/man/man1/gimp-console.1" - ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" - ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" - ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" -} diff --git a/staging/gimp/gimp-poppler-0.18.patch b/staging/gimp/gimp-poppler-0.18.patch deleted file mode 100644 index 0715460bc..000000000 --- a/staging/gimp/gimp-poppler-0.18.patch +++ /dev/null @@ -1,476 +0,0 @@ -From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Fri, 6 May 2011 11:58:44 +0200 -Subject: [PATCH] patch: poppler-0.17 - -Squashed commit of the following: - -commit 529d940222dfc352d41fbf72de29134421aa4002 -Author: Nils Philippsen <nils@redhat.com> -Date: Fri May 6 11:50:30 2011 +0200 - - use code based on pixbufs instead of cairo surfaces - - this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for - hints how to do this - -commit f8671d8767d4cdab830dc06310e96c63a88ec0fd -Author: Mukund Sivaraman <muks@banu.com> -Date: Thu Apr 21 13:57:13 2011 +0530 - - file-pdf-load: Update attribution, removing bogus copyright - (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019) - -commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70 -Author: Nils Philippsen <nils@redhat.com> -Date: Thu Apr 21 13:52:18 2011 +0200 - - file-pdf-load: Use better API + cleanups - - * fixes issues with poppler 0.17 completely - * uses new libgimp API to pass surfaces instead of pixbufs - * uses GTK+ 3 API to convert surfaces to pixbufs where available - (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2) - -commit 4e92302c4a14a961f112587a0ad86696c88da2f8 -Author: Nils Philippsen <nils@redhat.com> -Date: Thu Apr 21 13:38:08 2011 +0200 - - file-pdf-load: Don't use deprecated API (bug #646947) - - (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237) - - Conflicts: - - plug-ins/common/file-pdf.c ---- - plug-ins/common/file-pdf.c | 323 ++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 283 insertions(+), 40 deletions(-) - -diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c -index a43b459..43c2b7d 100644 ---- a/plug-ins/common/file-pdf.c -+++ b/plug-ins/common/file-pdf.c -@@ -4,6 +4,9 @@ - * - * Copyright (C) 2005 Nathan Summers - * -+ * Some code in render_page_to_surface() borrowed from -+ * poppler.git/glib/poppler-page.cc. -+ * - * 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 -@@ -80,16 +83,20 @@ static gboolean load_dialog (PopplerDocument *doc, - static PopplerDocument * open_document (const gchar *filename, - GError **error); - --static GdkPixbuf * get_thumbnail (PopplerDocument *doc, -+static cairo_surface_t * get_thumb_surface (PopplerDocument *doc, -+ gint page, -+ gint preferred_size); -+ -+static GdkPixbuf * get_thumb_pixbuf (PopplerDocument *doc, - gint page, - gint preferred_size); - - static gint32 layer_from_pixbuf (gint32 image, -- const gchar *layer_name, -- gint position, -- GdkPixbuf *buf, -- gdouble progress_start, -- gdouble progress_scale); -+ const gchar *layer_name, -+ gint position, -+ GdkPixbuf *pixbuf, -+ gdouble progress_start, -+ gdouble progress_scale); - - /** - ** the following was formerly part of -@@ -433,11 +440,12 @@ run (const gchar *name, - } - else - { -- gdouble width = 0; -- gdouble height = 0; -- gdouble scale; -- gint32 image = -1; -- GdkPixbuf *pixbuf = NULL; -+ gdouble width = 0; -+ gdouble height = 0; -+ gdouble scale; -+ gint32 image = -1; -+ gint num_pages = 0; -+ GdkPixbuf *pixbuf = NULL; - - /* Possibly retrieve last settings */ - gimp_get_data (LOAD_PROC, &loadvals); -@@ -455,7 +463,10 @@ run (const gchar *name, - g_object_unref (page); - } - -- pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32); -+ num_pages = poppler_document_get_n_pages (doc); -+ -+ pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32); -+ - g_object_unref (doc); - } - -@@ -548,6 +559,187 @@ open_document (const gchar *filename, - return doc; - } - -+/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */ -+ -+#if (!GTK_CHECK_VERSION (3, 0, 0)) -+ -+static cairo_format_t -+gdk_cairo_format_for_content (cairo_content_t content) -+{ -+ switch (content) -+ { -+ case CAIRO_CONTENT_COLOR: -+ return CAIRO_FORMAT_RGB24; -+ case CAIRO_CONTENT_ALPHA: -+ return CAIRO_FORMAT_A8; -+ case CAIRO_CONTENT_COLOR_ALPHA: -+ default: -+ return CAIRO_FORMAT_ARGB32; -+ } -+} -+ -+static cairo_surface_t * -+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, -+ cairo_content_t content, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ cairo_surface_t *copy; -+ cairo_t *cr; -+ -+ copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), -+ width, -+ height); -+ -+ cr = cairo_create (copy); -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_set_source_surface (cr, surface, -src_x, -src_y); -+ cairo_paint (cr); -+ cairo_destroy (cr); -+ -+ return copy; -+} -+ -+static void -+convert_alpha (guchar *dest_data, -+ int dest_stride, -+ guchar *src_data, -+ int src_stride, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ int x, y; -+ -+ src_data += src_stride * src_y + src_x * 4; -+ -+ for (y = 0; y < height; y++) { -+ guint32 *src = (guint32 *) src_data; -+ -+ for (x = 0; x < width; x++) { -+ guint alpha = src[x] >> 24; -+ -+ if (alpha == 0) -+ { -+ dest_data[x * 4 + 0] = 0; -+ dest_data[x * 4 + 1] = 0; -+ dest_data[x * 4 + 2] = 0; -+ } -+ else -+ { -+ dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; -+ dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; -+ dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; -+ } -+ dest_data[x * 4 + 3] = alpha; -+ } -+ -+ src_data += src_stride; -+ dest_data += dest_stride; -+ } -+} -+ -+static void -+convert_no_alpha (guchar *dest_data, -+ int dest_stride, -+ guchar *src_data, -+ int src_stride, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ int x, y; -+ -+ src_data += src_stride * src_y + src_x * 4; -+ -+ for (y = 0; y < height; y++) { -+ guint32 *src = (guint32 *) src_data; -+ -+ for (x = 0; x < width; x++) { -+ dest_data[x * 3 + 0] = src[x] >> 16; -+ dest_data[x * 3 + 1] = src[x] >> 8; -+ dest_data[x * 3 + 2] = src[x]; -+ } -+ -+ src_data += src_stride; -+ dest_data += dest_stride; -+ } -+} -+ -+/** -+ * gdk_pixbuf_get_from_surface: -+ * @surface: surface to copy from -+ * @src_x: Source X coordinate within @surface -+ * @src_y: Source Y coordinate within @surface -+ * @width: Width in pixels of region to get -+ * @height: Height in pixels of region to get -+ * -+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A) -+ * representation inside a #GdkPixbuf. This allows you to efficiently read -+ * individual pixels from cairo surfaces. For #GdkWindows, use -+ * gdk_pixbuf_get_from_window() instead. -+ * -+ * This function will create an RGB pixbuf with 8 bits per channel. -+ * The pixbuf will contain an alpha channel if the @surface contains one. -+ * -+ * Return value: (transfer full): A newly-created pixbuf with a reference -+ * count of 1, or %NULL on error -+ */ -+static GdkPixbuf * -+gdk_pixbuf_get_from_surface (cairo_surface_t *surface, -+ gint src_x, -+ gint src_y, -+ gint width, -+ gint height) -+{ -+ cairo_content_t content; -+ GdkPixbuf *dest; -+ -+ /* General sanity checks */ -+ g_return_val_if_fail (surface != NULL, NULL); -+ g_return_val_if_fail (width > 0 && height > 0, NULL); -+ -+ content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; -+ dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, -+ !!(content & CAIRO_CONTENT_ALPHA), -+ 8, -+ width, height); -+ -+ surface = gdk_cairo_surface_coerce_to_image (surface, content, -+ src_x, src_y, -+ width, height); -+ cairo_surface_flush (surface); -+ if (cairo_surface_status (surface) || dest == NULL) -+ { -+ cairo_surface_destroy (surface); -+ return NULL; -+ } -+ -+ if (gdk_pixbuf_get_has_alpha (dest)) -+ convert_alpha (gdk_pixbuf_get_pixels (dest), -+ gdk_pixbuf_get_rowstride (dest), -+ cairo_image_surface_get_data (surface), -+ cairo_image_surface_get_stride (surface), -+ 0, 0, -+ width, height); -+ else -+ convert_no_alpha (gdk_pixbuf_get_pixels (dest), -+ gdk_pixbuf_get_rowstride (dest), -+ cairo_image_surface_get_data (surface), -+ cairo_image_surface_get_stride (surface), -+ 0, 0, -+ width, height); -+ -+ cairo_surface_destroy (surface); -+ return dest; -+} -+ -+#endif -+ - static gint32 - layer_from_pixbuf (gint32 image, - const gchar *layer_name, -@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32 image, - return layer; - } - -+static cairo_surface_t * -+render_page_to_surface (PopplerPage *page, -+ int width, -+ int height, -+ double scale) -+{ -+ cairo_surface_t *surface; -+ cairo_t *cr; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); -+ cr = cairo_create (surface); -+ -+ cairo_save (cr); -+ cairo_translate (cr, 0.0, 0.0); -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ return surface; -+} -+ -+static GdkPixbuf * -+render_page_to_pixbuf (PopplerPage *page, -+ int width, -+ int height, -+ double scale) -+{ -+ GdkPixbuf *pixbuf; -+ cairo_surface_t *surface; -+ -+ surface = render_page_to_surface (page, width, height, scale); -+ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, -+ cairo_image_surface_get_width (surface), -+ cairo_image_surface_get_height (surface)); -+ cairo_surface_destroy (surface); -+ -+ return pixbuf; -+} -+ - static gint32 - load_image (PopplerDocument *doc, - const gchar *filename, -@@ -597,7 +837,7 @@ load_image (PopplerDocument *doc, - gdouble page_width; - gdouble page_height; - -- GdkPixbuf *buf; -+ GdkPixbuf *pixbuf; - gint width; - gint height; - -@@ -627,15 +867,13 @@ load_image (PopplerDocument *doc, - gimp_image_set_resolution (image_ID, resolution, resolution); - } - -- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); -- -- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); -+ pixbuf = render_page_to_pixbuf (page, width, height, scale); - -- layer_from_pixbuf (image_ID, page_label, i, buf, -+ layer_from_pixbuf (image_ID, page_label, i, pixbuf, - doc_progress, 1.0 / pages->n_pages); - - g_free (page_label); -- g_object_unref (buf); -+ g_object_unref(pixbuf); - - doc_progress = (double) (i + 1) / pages->n_pages; - gimp_progress_update (doc_progress); -@@ -676,30 +914,22 @@ load_image (PopplerDocument *doc, - return image_ID; - } - --static GdkPixbuf * --get_thumbnail (PopplerDocument *doc, -- gint page_num, -- gint preferred_size) -+static cairo_surface_t * -+get_thumb_surface (PopplerDocument *doc, -+ gint page_num, -+ gint preferred_size) - { - PopplerPage *page; -- GdkPixbuf *pixbuf; -+ cairo_surface_t *surface; - - page = poppler_document_get_page (doc, page_num); - - if (! page) - return NULL; - -- /* XXX: Remove conditional when we depend on poppler 0.8.0, but also -- * add configure check to make sure POPPLER_WITH_GDK is enabled! -- */ --#ifdef POPPLER_WITH_GDK -- pixbuf = poppler_page_get_thumbnail_pixbuf (page); --#else -- pixbuf = poppler_page_get_thumbnail (page); --#endif -- -+ surface = poppler_page_get_thumbnail (page); - -- if (! pixbuf) -+ if (! surface) - { - gdouble width; - gdouble height; -@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc, - width *= scale; - height *= scale; - -- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, -- width, height); -- -- poppler_page_render_to_pixbuf (page, -- 0, 0, width, height, scale, 0, pixbuf); -+ surface = render_page_to_surface (page, width, height, scale); - } - - g_object_unref (page); - -+ return surface; -+} -+ -+static GdkPixbuf * -+get_thumb_pixbuf (PopplerDocument *doc, -+ gint page_num, -+ gint preferred_size) -+{ -+ cairo_surface_t *surface; -+ GdkPixbuf *pixbuf; -+ -+ surface = get_thumb_surface (doc, page_num, preferred_size); -+ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, -+ cairo_image_surface_get_width (surface), -+ cairo_image_surface_get_height (surface)); -+ cairo_surface_destroy (surface); -+ - return pixbuf; - } - -@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data) - idle_data->page_no = i; - - /* FIXME get preferred size from somewhere? */ -- idle_data->pixbuf = get_thumbnail (thread_data->document, i, -- THUMBNAIL_SIZE); -+ idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i, -+ THUMBNAIL_SIZE); - - g_idle_add (idle_set_thumbnail, idle_data); - --- -1.7.5 diff --git a/staging/gimp/gimp.install b/staging/gimp/gimp.install deleted file mode 100644 index c317fbaca..000000000 --- a/staging/gimp/gimp.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/gimp/libpng_compile.patch b/staging/gimp/libpng_compile.patch deleted file mode 100644 index 26d3f9427..000000000 --- a/staging/gimp/libpng_compile.patch +++ /dev/null @@ -1,984 +0,0 @@ -Description: fix compilation against libpng 1.5 -Origin: upstream, 2.6 branch, diff of 2917a0e..e7469007 -Bug-Debian: http://bugs.debian.org/649972 - -diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c -index 29dd155..8054504 100644 ---- a/plug-ins/common/file-mng.c -+++ b/plug-ins/common/file-mng.c -@@ -136,7 +136,6 @@ struct mng_data_t - gint32 default_dispose; - }; - -- - /* Values of the instance of the above struct when the plug-in is - * first invoked. */ - -@@ -160,6 +159,21 @@ static struct mng_data_t mng_data = - }; - - -+/* These are not saved or restored. */ -+ -+struct mng_globals_t -+{ -+ gboolean has_trns; -+ png_bytep trans; -+ int num_trans; -+ gboolean has_plte; -+ png_colorp palette; -+ int num_palette; -+}; -+ -+static struct mng_globals_t mngg; -+ -+ - /* The output FILE pointer which is used by libmng; - * passed around as user data. */ - struct mnglib_userdata_t -@@ -196,7 +210,8 @@ static gboolean respin_cmap (png_structp png_ptr, - png_infop png_info_ptr, - guchar *remap, - gint32 image_id, -- GimpDrawable *drawable); -+ GimpDrawable *drawable, -+ int *bit_depth); - - static gboolean mng_save_image (const gchar *filename, - gint32 image_id, -@@ -414,6 +429,18 @@ ia_has_transparent_pixels (guchar *pixels, - return FALSE; - } - -+static int -+get_bit_depth_for_palette (int num_palette) -+{ -+ if (num_palette <= 2) -+ return 1; -+ else if (num_palette <= 4) -+ return 2; -+ else if (num_palette <= 16) -+ return 4; -+ else -+ return 8; -+} - - /* Spins the color map (palette) putting the transparent color at - * index 0 if there is space. If there isn't any space, warn the user -@@ -422,11 +449,12 @@ ia_has_transparent_pixels (guchar *pixels, - */ - - static gboolean --respin_cmap (png_structp png_ptr, -- png_infop png_info_ptr, -+respin_cmap (png_structp pp, -+ png_infop info, - guchar *remap, - gint32 image_id, -- GimpDrawable *drawable) -+ GimpDrawable *drawable, -+ int *bit_depth) - { - static guchar trans[] = { 0 }; - guchar *before; -@@ -464,10 +492,13 @@ respin_cmap (png_structp png_ptr, - - if (transparent != -1) - { -- png_color palette[256] = { {0, 0, 0} }; -+ static png_color palette[256] = { {0, 0, 0} }; - gint i; - -- png_set_tRNS (png_ptr, png_info_ptr, (png_bytep) trans, 1, NULL); -+ /* Set tRNS chunk values for writing later. */ -+ mngg.has_trns = TRUE; -+ mngg.trans = trans; -+ mngg.num_trans = 1; - - /* Transform all pixels with a value = transparent to - * 0 and vice versa to compensate for re-ordering in palette -@@ -489,7 +520,12 @@ respin_cmap (png_structp png_ptr, - palette[i].blue = before[3 * remap[i] + 2]; - } - -- png_set_PLTE (png_ptr, png_info_ptr, (png_colorp) palette, colors); -+ /* Set PLTE chunk values for writing later. */ -+ mngg.has_plte = TRUE; -+ mngg.palette = palette; -+ mngg.num_palette = colors; -+ -+ *bit_depth = get_bit_depth_for_palette (colors); - - return TRUE; - } -@@ -500,7 +536,10 @@ respin_cmap (png_structp png_ptr, - } - } - -- png_set_PLTE (png_ptr, png_info_ptr, (png_colorp) before, colors); -+ mngg.has_plte = TRUE; -+ mngg.palette = (png_colorp) before; -+ mngg.num_palette = colors; -+ *bit_depth = get_bit_depth_for_palette (colors); - - return FALSE; - } -@@ -777,7 +816,6 @@ mng_save_image (const gchar *filename, - - for (i = (num_layers - 1); i >= 0; i--) - { -- gint num_colors; - GimpImageType layer_drawable_type; - GimpDrawable *layer_drawable; - gint layer_offset_x, layer_offset_y; -@@ -795,8 +833,8 @@ mng_save_image (const gchar *filename, - gchar frame_mode; - int frame_delay; - gchar *temp_file_name; -- png_structp png_ptr; -- png_infop png_info_ptr; -+ png_structp pp; -+ png_infop info; - FILE *infile, *outfile; - int num_passes; - int tile_height; -@@ -804,6 +842,8 @@ mng_save_image (const gchar *filename, - int pass, j, k, begin, end, num; - guchar *fixed; - guchar layer_remap[256]; -+ int color_type; -+ int bit_depth; - - layer_name = gimp_drawable_get_name (layers[i]); - layer_chunks_type = parse_chunks_type_from_layer_name (layer_name); -@@ -948,9 +988,9 @@ mng_save_image (const gchar *filename, - goto err3; - } - -- png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, -+ pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, - NULL, NULL, NULL); -- if (NULL == png_ptr) -+ if (NULL == pp) - { - g_warning ("Unable to png_create_write_struct() in mng_save_image()"); - fclose (outfile); -@@ -958,89 +998,97 @@ mng_save_image (const gchar *filename, - goto err3; - } - -- png_info_ptr = png_create_info_struct (png_ptr); -- if (NULL == png_info_ptr) -+ info = png_create_info_struct (pp); -+ if (NULL == info) - { - g_warning - ("Unable to png_create_info_struct() in mng_save_image()"); -- png_destroy_write_struct (&png_ptr, NULL); -+ png_destroy_write_struct (&pp, NULL); - fclose (outfile); - g_unlink (temp_file_name); - goto err3; - } - -- if (setjmp (png_ptr->jmpbuf) != 0) -+ if (setjmp (png_jmpbuf (pp)) != 0) - { - g_warning ("HRM saving PNG in mng_save_image()"); -- png_destroy_write_struct (&png_ptr, &png_info_ptr); -+ png_destroy_write_struct (&pp, &info); - fclose (outfile); - g_unlink (temp_file_name); - goto err3; - } - -- png_init_io (png_ptr, outfile); -- png_set_compression_level (png_ptr, mng_data.compression_level); -+ png_init_io (pp, outfile); - -- png_info_ptr->width = layer_cols; -- png_info_ptr->height = layer_rows; -- png_info_ptr->interlace_type = (mng_data.interlaced == 0 ? 0 : 1); -- png_info_ptr->bit_depth = 8; -+ bit_depth = 8; - - switch (layer_drawable_type) - { - case GIMP_RGB_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; - break; - case GIMP_RGBA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - break; - case GIMP_GRAY_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -+ color_type = PNG_COLOR_TYPE_GRAY; - break; - case GIMP_GRAYA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - break; - case GIMP_INDEXED_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- png_info_ptr->valid |= PNG_INFO_PLTE; -- png_info_ptr->palette = -- (png_colorp) gimp_image_get_colormap (image_id, &num_colors); -- png_info_ptr->num_palette = num_colors; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ mngg.has_plte = TRUE; -+ mngg.palette = (png_colorp) -+ gimp_image_get_colormap (image_id, &mngg.num_palette); -+ bit_depth = get_bit_depth_for_palette (mngg.num_palette); - break; - case GIMP_INDEXEDA_IMAGE: -- png_info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -+ color_type = PNG_COLOR_TYPE_PALETTE; - layer_has_unique_palette = -- respin_cmap (png_ptr, png_info_ptr, layer_remap, -- image_id, layer_drawable); -+ respin_cmap (pp, info, layer_remap, -+ image_id, layer_drawable, -+ &bit_depth); - break; - default: - g_warning ("This can't be!\n"); -- png_destroy_write_struct (&png_ptr, &png_info_ptr); -+ png_destroy_write_struct (&pp, &info); - fclose (outfile); - g_unlink (temp_file_name); - goto err3; - } - -- if ((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE) -+ /* Note: png_set_IHDR() must be called before any other -+ png_set_*() functions. */ -+ png_set_IHDR (pp, info, layer_cols, layer_rows, -+ bit_depth, -+ color_type, -+ mng_data.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, -+ PNG_COMPRESSION_TYPE_BASE, -+ PNG_FILTER_TYPE_BASE); -+ -+ if (mngg.has_trns) -+ { -+ png_set_tRNS (pp, info, mngg.trans, mngg.num_trans, NULL); -+ } -+ -+ if (mngg.has_plte) - { -- if (png_info_ptr->num_palette <= 2) -- png_info_ptr->bit_depth = 1; -- else if (png_info_ptr->num_palette <= 4) -- png_info_ptr->bit_depth = 2; -- else if (png_info_ptr->num_palette <= 16) -- png_info_ptr->bit_depth = 4; -+ png_set_PLTE (pp, info, mngg.palette, mngg.num_palette); - } - -- png_write_info (png_ptr, png_info_ptr); -+ png_set_compression_level (pp, mng_data.compression_level); -+ -+ png_write_info (pp, info); - - if (mng_data.interlaced != 0) -- num_passes = png_set_interlace_handling (png_ptr); -+ num_passes = png_set_interlace_handling (pp); - else - num_passes = 1; - -- if ((png_info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) && -- (png_info_ptr->bit_depth < 8)) -- png_set_packing (png_ptr); -+ if ((color_type == PNG_COLOR_TYPE_PALETTE) && -+ (bit_depth < 8)) -+ png_set_packing (pp); - - tile_height = gimp_tile_height (); - layer_pixel = g_new (guchar, tile_height * layer_cols * layer_bpp); -@@ -1065,7 +1113,7 @@ mng_save_image (const gchar *filename, - gimp_pixel_rgn_get_rect (&layer_pixel_rgn, layer_pixel, 0, - begin, layer_cols, num); - -- if ((png_info_ptr->valid & PNG_INFO_tRNS) == PNG_INFO_tRNS) -+ if (png_get_valid (pp, info, PNG_INFO_tRNS)) - { - for (j = 0; j < num; j++) - { -@@ -1077,7 +1125,7 @@ mng_save_image (const gchar *filename, - } - } - else -- if (((png_info_ptr->valid & PNG_INFO_PLTE) == PNG_INFO_PLTE) -+ if (png_get_valid (pp, info, PNG_INFO_PLTE) - && (layer_bpp == 2)) - { - for (j = 0; j < num; j++) -@@ -1089,12 +1137,12 @@ mng_save_image (const gchar *filename, - } - } - -- png_write_rows (png_ptr, layer_pixels, num); -+ png_write_rows (pp, layer_pixels, num); - } - } - -- png_write_end (png_ptr, png_info_ptr); -- png_destroy_write_struct (&png_ptr, &png_info_ptr); -+ png_write_end (pp, info); -+ png_destroy_write_struct (&pp, &info); - - g_free (layer_pixels); - g_free (layer_pixel); -diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c -index d42afff..8fa8983 100644 ---- a/plug-ins/common/file-png.c -+++ b/plug-ins/common/file-png.c -@@ -106,6 +106,17 @@ typedef struct - } - PngSaveGui; - -+/* These are not saved or restored. */ -+typedef struct -+{ -+ gboolean has_trns; -+ png_bytep trans; -+ int num_trans; -+ gboolean has_plte; -+ png_colorp palette; -+ int num_palette; -+} -+PngGlobals; - - /* - * Local functions... -@@ -127,7 +138,7 @@ static gboolean save_image (const gchar *filename, - gint32 orig_image_ID, - GError **error); - --static void respin_cmap (png_structp pp, -+static int respin_cmap (png_structp pp, - png_infop info, - guchar *remap, - gint32 image_ID, -@@ -175,6 +186,7 @@ static const PngSaveVals defaults = - }; - - static PngSaveVals pngvals; -+static PngGlobals pngg; - - - /* -@@ -653,13 +665,25 @@ on_read_error (png_structp png_ptr, png_const_charp error_msg) - error_data->drawable->width, num); - } - -- longjmp (png_ptr->jmpbuf, 1); -+ longjmp (png_jmpbuf (png_ptr), 1); -+} -+ -+static int -+get_bit_depth_for_palette (int num_palette) -+{ -+ if (num_palette <= 2) -+ return 1; -+ else if (num_palette <= 4) -+ return 2; -+ else if (num_palette <= 16) -+ return 4; -+ else -+ return 8; - } - - /* - * 'load_image()' - Load a PNG image into a new image window. - */ -- - static gint32 - load_image (const gchar *filename, - gboolean interactive, -@@ -695,9 +719,20 @@ load_image (const gchar *filename, - gint num_texts; - - pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); -+ if (!pp) -+ { -+ /* this could happen if the compile time and run-time libpng -+ versions do not match. */ -+ -+ g_set_error (error, 0, 0, -+ _("Error creating PNG read struct while saving '%s'."), -+ gimp_filename_to_utf8 (filename)); -+ return -1; -+ } -+ - info = png_create_info_struct (pp); - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf (pp))) - { - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Error while reading '%s'. File corrupted?"), -@@ -705,10 +740,6 @@ load_image (const gchar *filename, - return image; - } - -- /* initialise image here, thus avoiding compiler warnings */ -- -- image = -1; -- - /* - * Open the file and initialize the PNG read "engine"... - */ -@@ -738,17 +769,19 @@ load_image (const gchar *filename, - * Latest attempt, this should be my best yet :) - */ - -- if (info->bit_depth == 16) -+ if (png_get_bit_depth (pp, info) == 16) - { - png_set_strip_16 (pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) -+ if (png_get_color_type (pp, info) == PNG_COLOR_TYPE_GRAY && -+ png_get_bit_depth (pp, info) < 8) - { - png_set_expand (pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (png_get_color_type (pp, info) == PNG_COLOR_TYPE_PALETTE && -+ png_get_bit_depth (pp, info) < 8) - { - png_set_packing (pp); - } -@@ -757,8 +790,8 @@ load_image (const gchar *filename, - * Expand G+tRNS to GA, RGB+tRNS to RGBA - */ - -- if (info->color_type != PNG_COLOR_TYPE_PALETTE && -- (info->valid & PNG_INFO_tRNS)) -+ if (png_get_color_type (pp, info) != PNG_COLOR_TYPE_PALETTE && -+ png_get_valid (pp, info, PNG_INFO_tRNS)) - { - png_set_expand (pp); - } -@@ -775,7 +808,7 @@ load_image (const gchar *filename, - */ - - if (png_get_valid (pp, info, PNG_INFO_tRNS) && -- info->color_type == PNG_COLOR_TYPE_PALETTE) -+ png_get_color_type (pp, info) == PNG_COLOR_TYPE_PALETTE) - { - png_get_tRNS (pp, info, &alpha_ptr, &num, NULL); - /* Copy the existing alpha values from the tRNS chunk */ -@@ -797,7 +830,7 @@ load_image (const gchar *filename, - - png_read_update_info (pp, info); - -- switch (info->color_type) -+ switch (png_get_color_type (pp, info)) - { - case PNG_COLOR_TYPE_RGB: /* RGB */ - bpp = 3; -@@ -836,7 +869,9 @@ load_image (const gchar *filename, - return -1; - } - -- image = gimp_image_new (info->width, info->height, image_type); -+ image = gimp_image_new (png_get_image_width (pp, info), -+ png_get_image_height (pp, info), -+ image_type); - if (image == -1) - { - g_set_error (error, 0, 0, -@@ -849,7 +884,9 @@ load_image (const gchar *filename, - * Create the "background" layer to hold the image... - */ - -- layer = gimp_layer_new (image, _("Background"), info->width, info->height, -+ layer = gimp_layer_new (image, _("Background"), -+ png_get_image_width (pp, info), -+ png_get_image_height (pp, info), - layer_type, 100, GIMP_NORMAL_MODE); - gimp_image_add_layer (image, layer, 0); - -@@ -883,7 +920,8 @@ load_image (const gchar *filename, - - gimp_layer_set_offsets (layer, offset_x, offset_y); - -- if ((abs (offset_x) > info->width) || (abs (offset_y) > info->height)) -+ if ((abs (offset_x) > png_get_image_width (pp, info)) || -+ (abs (offset_y) > png_get_image_height (pp, info))) - { - if (interactive) - g_message (_("The PNG file specifies an offset that caused " -@@ -938,23 +976,27 @@ load_image (const gchar *filename, - - empty = 0; /* by default assume no full transparent palette entries */ - -- if (info->color_type & PNG_COLOR_MASK_PALETTE) -+ if (png_get_color_type (pp, info) & PNG_COLOR_MASK_PALETTE) - { -+ png_colorp palette; -+ int num_palette; -+ -+ png_get_PLTE (pp, info, &palette, &num_palette); - if (png_get_valid (pp, info, PNG_INFO_tRNS)) - { - for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty) - /* Calculates number of fully transparent "empty" entries */; - - /* keep at least one entry */ -- empty = MIN (empty, info->num_palette - 1); -+ empty = MIN (empty, num_palette - 1); - -- gimp_image_set_colormap (image, (guchar *) (info->palette + empty), -- info->num_palette - empty); -+ gimp_image_set_colormap (image, (guchar *) (palette + empty), -+ num_palette - empty); - } - else - { -- gimp_image_set_colormap (image, (guchar *) info->palette, -- info->num_palette); -+ gimp_image_set_colormap (image, (guchar *) palette, -+ num_palette); - } - } - -@@ -972,18 +1014,19 @@ load_image (const gchar *filename, - */ - - tile_height = gimp_tile_height (); -- pixel = g_new0 (guchar, tile_height * info->width * bpp); -+ pixel = g_new0 (guchar, tile_height * png_get_image_width (pp, info) * bpp); - pixels = g_new (guchar *, tile_height); - - for (i = 0; i < tile_height; i++) -- pixels[i] = pixel + info->width * info->channels * i; -+ pixels[i] = pixel + png_get_image_width (pp, info) * -+ png_get_channels (pp, info) * i; - - /* Install our own error handler to handle incomplete PNG files better */ - error_data.drawable = drawable; - error_data.pixel = pixel; - error_data.tile_height = tile_height; -- error_data.width = info->width; -- error_data.height = info->height; -+ error_data.width = png_get_image_width (pp, info); -+ error_data.height = png_get_image_height (pp, info); - error_data.bpp = bpp; - error_data.pixel_rgn = &pixel_rgn; - -@@ -996,10 +1039,11 @@ load_image (const gchar *filename, - */ - - for (begin = 0, end = tile_height; -- begin < info->height; begin += tile_height, end += tile_height) -+ begin < png_get_image_height (pp, info); -+ begin += tile_height, end += tile_height) - { -- if (end > info->height) -- end = info->height; -+ if (end > png_get_image_height (pp, info)) -+ end = png_get_image_height (pp, info); - - num = end - begin; - -@@ -1016,11 +1060,13 @@ load_image (const gchar *filename, - gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0, begin, - drawable->width, num); - -- memset (pixel, 0, tile_height * info->width * bpp); -+ memset (pixel, 0, -+ tile_height * png_get_image_width (pp, info) * bpp); - -- gimp_progress_update (((gdouble) pass + -- (gdouble) end / (gdouble) info->height) / -- (gdouble) num_passes); -+ gimp_progress_update -+ (((gdouble) pass + -+ (gdouble) end / (gdouble) png_get_image_height (pp, info)) / -+ (gdouble) num_passes); - } - } - -@@ -1189,7 +1235,6 @@ save_image (const gchar *filename, - GimpPixelRgn pixel_rgn; /* Pixel region for layer */ - png_structp pp; /* PNG read pointer */ - png_infop info; /* PNG info pointer */ -- gint num_colors; /* Number of colors in colormap */ - gint offx, offy; /* Drawable offsets from origin */ - guchar **pixels, /* Pixel rows */ - *fixed, /* Fixed-up pixel data */ -@@ -1200,56 +1245,28 @@ save_image (const gchar *filename, - guchar red, green, blue; /* Used for palette background */ - time_t cutime; /* Time since epoch */ - struct tm *gmt; /* GMT broken down */ -+ int color_type; -+ int bit_depth; - - guchar remap[256]; /* Re-mapping for the palette */ - - png_textp text = NULL; - -- if (pngvals.comment) -+ pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); -+ if (!pp) - { -- GimpParasite *parasite; -- gsize text_length = 0; -- -- parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment"); -- if (parasite) -- { -- gchar *comment = g_strndup (gimp_parasite_data (parasite), -- gimp_parasite_data_size (parasite)); -+ /* this could happen if the compile time and run-time libpng -+ versions do not match. */ - -- gimp_parasite_free (parasite); -- -- text = g_new0 (png_text, 1); -- text->key = "Comment"; -- --#ifdef PNG_iTXt_SUPPORTED -- -- text->compression = PNG_ITXT_COMPRESSION_NONE; -- text->text = comment; -- text->itxt_length = strlen (comment); -- --#else -- -- text->compression = PNG_TEXT_COMPRESSION_NONE; -- text->text = g_convert (comment, -1, -- "ISO-8859-1", "UTF-8", -- NULL, &text_length, -- NULL); -- text->text_length = text_length; -- --#endif -- -- if (!text->text) -- { -- g_free (text); -- text = NULL; -- } -- } -+ g_set_error (error, 0, 0, -+ _("Error creating PNG write struct while saving '%s'."), -+ gimp_filename_to_utf8 (filename)); -+ return FALSE; - } - -- pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct (pp); - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf (pp))) - { - g_set_error (error, 0, 0, - _("Error while saving '%s'. Could not save image."), -@@ -1257,9 +1274,6 @@ save_image (const gchar *filename, - return FALSE; - } - -- if (text) -- png_set_text (pp, info, text, 1); -- - /* - * Open the file and initialize the PNG write "engine"... - */ -@@ -1286,17 +1300,6 @@ save_image (const gchar *filename, - type = gimp_drawable_type (drawable_ID); - - /* -- * Set the image dimensions, bit depth, interlacing and compression -- */ -- -- png_set_compression_level (pp, pngvals.compression_level); -- -- info->width = drawable->width; -- info->height = drawable->height; -- info->bit_depth = 8; -- info->interlace_type = pngvals.interlaced; -- -- /* - * Initialise remap[] - */ - for (i = 0; i < 256; i++) -@@ -1306,42 +1309,44 @@ save_image (const gchar *filename, - * Set color type and remember bytes per pixel count - */ - -+ bit_depth = 8; -+ - switch (type) - { - case GIMP_RGB_IMAGE: -- info->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; - bpp = 3; - break; - - case GIMP_RGBA_IMAGE: -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - bpp = 4; - break; - - case GIMP_GRAY_IMAGE: -- info->color_type = PNG_COLOR_TYPE_GRAY; -+ color_type = PNG_COLOR_TYPE_GRAY; - bpp = 1; - break; - - case GIMP_GRAYA_IMAGE: -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - bpp = 2; - break; - - case GIMP_INDEXED_IMAGE: - bpp = 1; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette = -- (png_colorp) gimp_image_get_colormap (image_ID, &num_colors); -- info->num_palette = num_colors; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ pngg.has_plte = TRUE; -+ pngg.palette = (png_colorp) gimp_image_get_colormap (image_ID, -+ &pngg.num_palette); -+ bit_depth = get_bit_depth_for_palette (pngg.num_palette); - break; - - case GIMP_INDEXEDA_IMAGE: - bpp = 2; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ color_type = PNG_COLOR_TYPE_PALETTE; - /* fix up transparency */ -- respin_cmap (pp, info, remap, image_ID, drawable); -+ bit_depth = respin_cmap (pp, info, remap, image_ID, drawable); - break; - - default: -@@ -1349,21 +1354,29 @@ save_image (const gchar *filename, - return FALSE; - } - -- /* -- * Fix bit depths for (possibly) smaller colormap images -- */ -+ /* Note: png_set_IHDR() must be called before any other png_set_*() -+ functions. */ -+ png_set_IHDR (pp, info, drawable->width, drawable->height, -+ bit_depth, -+ color_type, -+ pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, -+ PNG_COMPRESSION_TYPE_BASE, -+ PNG_FILTER_TYPE_BASE); -+ -+ if (pngg.has_trns) -+ { -+ png_set_tRNS (pp, info, pngg.trans, pngg.num_trans, NULL); -+ } - -- if (info->valid & PNG_INFO_PLTE) -+ if (pngg.has_plte) - { -- if (info->num_palette <= 2) -- info->bit_depth = 1; -- else if (info->num_palette <= 4) -- info->bit_depth = 2; -- else if (info->num_palette <= 16) -- info->bit_depth = 4; -- /* otherwise the default is fine */ -+ png_set_PLTE (pp, info, pngg.palette, pngg.num_palette); - } - -+ /* Set the compression level */ -+ -+ png_set_compression_level (pp, pngvals.compression_level); -+ - /* All this stuff is optional extras, if the user is aiming for smallest - possible file size she can turn them all off */ - -@@ -1462,6 +1475,52 @@ save_image (const gchar *filename, - } - #endif - -+ if (pngvals.comment) -+ { -+ GimpParasite *parasite; -+#ifndef PNG_iTXt_SUPPORTED -+ gsize text_length = 0; -+#endif /* PNG_iTXt_SUPPORTED */ -+ -+ parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment"); -+ if (parasite) -+ { -+ gchar *comment = g_strndup (gimp_parasite_data (parasite), -+ gimp_parasite_data_size (parasite)); -+ -+ gimp_parasite_free (parasite); -+ -+ text = g_new0 (png_text, 1); -+ text->key = "Comment"; -+ -+#ifdef PNG_iTXt_SUPPORTED -+ -+ text->compression = PNG_ITXT_COMPRESSION_NONE; -+ text->text = comment; -+ text->itxt_length = strlen (comment); -+ -+#else -+ -+ text->compression = PNG_TEXT_COMPRESSION_NONE; -+ text->text = g_convert (comment, -1, -+ "ISO-8859-1", "UTF-8", -+ NULL, &text_length, -+ NULL); -+ text->text_length = text_length; -+ -+#endif -+ -+ if (!text->text) -+ { -+ g_free (text); -+ text = NULL; -+ } -+ } -+ } -+ -+ if (text) -+ png_set_text (pp, info, text, 1); -+ - png_write_info (pp, info); - - /* -@@ -1477,7 +1536,8 @@ save_image (const gchar *filename, - * Convert unpacked pixels to packed if necessary - */ - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (color_type == PNG_COLOR_TYPE_PALETTE && -+ bit_depth < 8) - png_set_packing (pp); - - /* -@@ -1507,7 +1567,9 @@ save_image (const gchar *filename, - - gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, - drawable->width, num); -- /*if we are with a RGBA image and have to pre-multiply the alpha channel */ -+ -+ /* If we are with a RGBA image and have to pre-multiply the -+ alpha channel */ - if (bpp == 4 && ! pngvals.save_transp_pixels) - { - for (i = 0; i < num; ++i) -@@ -1529,7 +1591,7 @@ save_image (const gchar *filename, - - /* If we're dealing with a paletted image with - * transparency set, write out the remapped palette */ -- if (info->valid & PNG_INFO_tRNS) -+ if (png_get_valid (pp, info, PNG_INFO_tRNS)) - { - guchar inverse_remap[256]; - -@@ -1547,9 +1609,11 @@ save_image (const gchar *filename, - } - } - } -+ - /* Otherwise if we have a paletted image and transparency - * couldn't be set, we ignore the alpha channel */ -- else if (info->valid & PNG_INFO_PLTE && bpp == 2) -+ else if (png_get_valid (pp, info, PNG_INFO_PLTE) && -+ bpp == 2) - { - for (i = 0; i < num; ++i) - { -@@ -1564,7 +1628,7 @@ save_image (const gchar *filename, - png_write_rows (pp, pixels, num); - - gimp_progress_update (((double) pass + (double) end / -- (double) info->height) / -+ (double) drawable->height) / - (double) num_passes); - } - } -@@ -1694,14 +1758,14 @@ find_unused_ia_color (GimpDrawable *drawable, - } - - --static void -+static int - respin_cmap (png_structp pp, - png_infop info, - guchar *remap, - gint32 image_ID, - GimpDrawable *drawable) - { -- static const guchar trans[] = { 0 }; -+ static guchar trans[] = { 0 }; - - gint colors; - guchar *before; -@@ -1728,10 +1792,13 @@ respin_cmap (png_structp pp, - * index - do like gif2png and swap - * index 0 and index transparent */ - { -- png_color palette[256]; -+ static png_color palette[256]; - gint i; - -- png_set_tRNS (pp, info, (png_bytep) trans, 1, NULL); -+ /* Set tRNS chunk values for writing later. */ -+ pngg.has_trns = TRUE; -+ pngg.trans = trans; -+ pngg.num_trans = 1; - - /* Transform all pixels with a value = transparent to - * 0 and vice versa to compensate for re-ordering in palette -@@ -1752,7 +1819,10 @@ respin_cmap (png_structp pp, - palette[i].blue = before[3 * remap[i] + 2]; - } - -- png_set_PLTE (pp, info, palette, colors); -+ /* Set PLTE chunk values for writing later. */ -+ pngg.has_plte = TRUE; -+ pngg.palette = palette; -+ pngg.num_palette = colors; - } - else - { -@@ -1760,14 +1830,22 @@ respin_cmap (png_structp pp, - * transparency & just use the full palette */ - g_message (_("Couldn't losslessly save transparency, " - "saving opacity instead.")); -- png_set_PLTE (pp, info, (png_colorp) before, colors); -+ -+ /* Set PLTE chunk values for writing later. */ -+ pngg.has_plte = TRUE; -+ pngg.palette = (png_colorp) before; -+ pngg.num_palette = colors; - } - } - else - { -- png_set_PLTE (pp, info, (png_colorp) before, colors); -+ /* Set PLTE chunk values for writing later. */ -+ pngg.has_plte = TRUE; -+ pngg.palette = (png_colorp) before; -+ pngg.num_palette = colors; - } - -+ return get_bit_depth_for_palette (colors); - } - - static gboolean diff --git a/staging/gimp/linux.gpl b/staging/gimp/linux.gpl deleted file mode 100644 index 0a73d8979..000000000 --- a/staging/gimp/linux.gpl +++ /dev/null @@ -1,19 +0,0 @@ -GIMP Palette -Name: linux -# - 0 0 0 - 0 0 170 - 0 170 0 - 0 170 170 -170 0 0 -170 0 170 -170 85 0 -170 170 170 - 85 85 85 - 85 85 255 - 85 255 85 - 85 255 255 -255 85 85 -255 85 255 -255 255 85 -255 255 255 diff --git a/staging/gimp/uri-backend-libcurl.patch b/staging/gimp/uri-backend-libcurl.patch deleted file mode 100644 index 85da2fc7f..000000000 --- a/staging/gimp/uri-backend-libcurl.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c ---- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200 -+++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200 -@@ -4,9 +4,9 @@ - * libcurl backend for the URI plug-in - * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org> - * -- * This program is free software; you can redistribute it and/or modify -+ * 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 -+ * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, -@@ -15,8 +15,7 @@ - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - - #include "config.h" -@@ -24,7 +23,6 @@ - #include <errno.h> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <glib/gstdio.h> -@@ -63,7 +61,7 @@ - - vinfo = curl_version_info (CURLVERSION_NOW); - -- protocols = g_string_new ("http:,ftp:"); -+ protocols = g_string_new ("http:,ftp:,gopher:"); - - if (vinfo->features & CURL_VERSION_SSL) - { -@@ -153,7 +151,7 @@ - FILE *out_file; - CURL *curl_handle; - CURLcode result; -- gint response_code; -+ glong response_code; - - gimp_progress_init (_("Connecting to server")); - -@@ -195,12 +193,12 @@ - - curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code); - -- if (response_code != 200) -+ if (response_code != 200 && response_code != 226 && response_code != 0) - { - fclose (out_file); - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Opening '%s' for reading resulted in HTTP " -- "response code: %d"), -+ "response code: %ld"), - uri, response_code); - curl_easy_cleanup (curl_handle); - return FALSE; -@@ -224,3 +222,10 @@ - - return FALSE; - } -+ -+gchar * -+uri_backend_map_image (const gchar *uri, -+ GimpRunMode run_mode) -+{ -+ return NULL; -+} diff --git a/staging/glade-perl/PKGBUILD b/staging/glade-perl/PKGBUILD deleted file mode 100644 index 47a027b19..000000000 --- a/staging/glade-perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147196 2012-01-24 05:13:43Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=glade-perl -_realname=Gtk2-GladeXML -pkgver=1.007 -pkgrel=5 -pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('libglade' 'gtk2-perl' 'perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('e6ca234e2a9f0221263acd2a593c583b') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/glhack/PKGBUILD b/staging/glhack/PKGBUILD deleted file mode 100644 index 6ac706ee1..000000000 --- a/staging/glhack/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 146929 2012-01-19 10:08:04Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=glhack -pkgver=1.2 -pkgrel=6 -pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D" -arch=('i686' 'x86_64') -url="http://glhack.sourceforge.net/" -license=('custom') -depends=('sdl' 'libpng' 'libgl') -makedepends=('mesa') -options=('!makeflags') -install=glhack.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz glhack-libpng15.patch) -sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae' - '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d') - -build(){ - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../glhack-libpng15.patch - sed -i 's|/usr/lib/games|/usr/share|' include/config.h - sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h - sed -i -e 's|PREFIX = /usr|PREFIX = $(DESTDIR)/usr|' Makefile - sed -i -e 's|VARDIR = /var/lib/games/glhack|VARDIR = $(DESTDIR)/var/games/glhack|' Makefile - sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile - sed -i -e 's|GAMEDIR = $(PREFIX)/lib/games/$(GAME)|GAMEDIR = $(PREFIX)/share/$(GAME)|' Makefile - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}"/usr/share/man/man{5,6} - make DESTDIR="$pkgdir" install - install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license" - -# Renaming man pages which conflicts with nethack - cd "${pkgdir}/usr/share/man/man6" - for manpage in dgn_comp dlb lev_comp nethack recover; do - mv $manpage.6 $manpage-glhack.6 - done - cd "${srcdir}/${pkgname}-${pkgver}" - - mv "${pkgdir}/usr/share/glhack/glhack" "${pkgdir}/usr/bin/glhack" - mv "${pkgdir}/usr/share/glhack/recover_glhack" "${pkgdir}/usr/bin/recover_glhack" - - chown -R root:root "${pkgdir}/usr/share/glhack" - - rm -r "${pkgdir}"/var/games/glhack - install -d "${pkgdir}/var/games/glhack/save" - chmod -R 775 "${pkgdir}/var/games" - chown -R root:games "${pkgdir}/var/games" -} diff --git a/staging/glhack/glhack-libpng15.patch b/staging/glhack/glhack-libpng15.patch deleted file mode 100644 index d8e644d1c..000000000 --- a/staging/glhack/glhack-libpng15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- win/gl/gl_image.c.old 2012-01-19 04:01:26.000000000 -0500 -+++ win/gl/gl_image.c 2012-01-19 04:03:04.000000000 -0500 -@@ -486,7 +486,7 @@ - /* set error handling since we are using the setjmp/longjmp method - * (this is the normal method of doing things with libpng). - */ -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - sdlgl_warning("Problem within LibPNG (unknown)\n"); - goto failed; diff --git a/staging/glhack/glhack.install b/staging/glhack/glhack.install deleted file mode 100644 index 78e1655bc..000000000 --- a/staging/glhack/glhack.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - touch var/games/glhack/{record,perm,logfile} - chown root:games var/games/glhack/{record,perm,logfile} - chmod 664 var/games/glhack/{record,perm,logfile} -} - -pre_upgrade() { - install -d -m775 var/games/glhack - chown root:games var/games/glhack - [ -e usr/share/glhack/record ] && cp usr/share/glhack/record var/games/glhack - [ -e usr/share/glhack/perm ] && cp usr/share/glhack/perm var/games/glhack - [ -e usr/share/glhack/logfile ] && cp usr/share/glhack/logfile var/games/glhack - if [ -d usr/share/glhack/save ]; then - chmod g-s usr/share/glhack/save - mv usr/share/glhack/save var/games/glhack - else - install -d -m775 var/games/glhack/save - fi - chown root:games var/games/glhack/save -} - -post_upgrade() { - post_install -} diff --git a/staging/gmime/PKGBUILD b/staging/gmime/PKGBUILD deleted file mode 100644 index 013a38c82..000000000 --- a/staging/gmime/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 146576 2012-01-13 20:06:15Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=gmime -pkgver=2.6.4 -pkgrel=1 -pkgdesc="Core mime parsing library" -arch=('i686' 'x86_64') -license=('GPL') -url="http://spruce.sourceforge.net/gmime/" -depends=('glib2' 'gpgme' 'zlib') -makedepends=('gtk-sharp-2') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163') - -build() { - # get rid of that .wapi errors in fakeroot - export MONO_SHARED_DIR="$srcdir/weird" - mkdir -p "$MONO_SHARED_DIR" - - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/gnome-color-manager/PKGBUILD b/staging/gnome-color-manager/PKGBUILD deleted file mode 100644 index 3fcef2e0e..000000000 --- a/staging/gnome-color-manager/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 147672 2012-01-26 09:42:51Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-color-manager -pkgver=3.2.2 -pkgrel=2 -pkgdesc="Color profile manager for the GNOME desktop" -arch=(i686 x86_64) -url="http://projects.gnome.org/gnome-color-manager/" -license=(GPL2) -depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash' 'shared-color-profiles' 'shared-color-targets') -makedepends=('intltool' 'gtk-doc') -install=gnome-color-manager.install -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a') - -build(){ - cd "$srcdir/$pkgname-$pkgver" - - # man pages need docbook-sgml, which we don't have - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-color-manager \ - --disable-static --disable-man-pages - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/gnome-color-manager/gnome-color-manager.install b/staging/gnome-color-manager/gnome-color-manager.install deleted file mode 100644 index 04fda0ddc..000000000 --- a/staging/gnome-color-manager/gnome-color-manager.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-color-manager - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/gnome-desktop2/PKGBUILD b/staging/gnome-desktop2/PKGBUILD deleted file mode 100644 index 130dbeaff..000000000 --- a/staging/gnome-desktop2/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 147230 2012-01-24 20:46:21Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jan@archlinux.org> - -_pkgname=gnome-desktop -pkgname=${_pkgname}2 -pkgver=2.32.1 -pkgrel=2 -pkgdesc="Library with common API for various GNOME modules (legacy version)" -arch=(i686 x86_64) -license=(GPL LGPL) -depends=(gconf gtk2 startup-notification) -makedepends=(gnome-doc-utils intltool) -url="http://www.gnome.org" -options=(!libtool !emptydirs) -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2) -sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-gnome-distributor="Archlinux" \ - --disable-scrollkeeper \ - --disable-gnome-about --disable-desktop-docs - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/gnome-perl/PKGBUILD b/staging/gnome-perl/PKGBUILD deleted file mode 100644 index a5c2d68ad..000000000 --- a/staging/gnome-perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147560 2012-01-25 23:03:24Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-perl -_realname=Gnome2 -pkgver=1.042 -pkgrel=7 -pkgdesc="Perl bindings for libgnome" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('gnomecanvas-perl' 'gnome-vfs-perl' 'libgnomeui' 'perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('eb7b624114e45e54e022a633ffc1cce6') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gnome-python/PKGBUILD b/staging/gnome-python/PKGBUILD deleted file mode 100644 index 7e6fce33b..000000000 --- a/staging/gnome-python/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 147212 2012-01-24 19:17:06Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgbase=gnome-python -pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs') -pkgver=2.28.1 -pkgrel=8 -arch=(i686 x86_64) -license=('LGPL') -makedepends=('pygtk' 'pyorbit' 'libgnomeui') -options=('!libtool') -url="http://www.pygtk.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2) -sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8') - -build() { - cd "${srcdir}/gnome-python-${pkgver}" - PYTHON=python2 ./configure --prefix=/usr - make -} - -package_gnome-python() { - pkgdesc="PyGNOME Python extension module" - depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs') - - cd "${srcdir}/gnome-python-${pkgver}" - make install-pkgconfigDATA DESTDIR="${pkgdir}" -} - -package_python2-bonobo(){ - pkgdesc="Python bindings for interacting with Bonobo" - depends=('pygtk' 'libbonoboui' 'pyorbit' 'python2-gnomecanvas') - - cd "${srcdir}/gnome-python-${pkgver}" - make -C bonobo install DESTDIR="${pkgdir}" -} - -package_python2-gconf(){ - pkgdesc="Python bindings for interacting with GConf" - depends=('pygtk' 'gconf') - - cd "${srcdir}/gnome-python-${pkgver}" - make -C gconf install DESTDIR="${pkgdir}" -} - -package_python2-libgnome() { - pkgdesc="Python bindings for libgnome" - depends=('pygtk' 'libgnomeui' 'python2-gnomevfs' 'python2-gnomecanvas' 'python2-bonobo') - - cd "${srcdir}/gnome-python-${pkgver}" - make -C gnome install DESTDIR="${pkgdir}" -} - -package_python2-gnomecanvas() { - pkgdesc="Python bindings for the GNOME Canvas" - depends=('pygtk' 'libgnomecanvas') - - cd "${srcdir}/gnome-python-${pkgver}" - make -C gnomecanvas install DESTDIR="${pkgdir}" -} - -package_python2-gnomevfs() { - pkgdesc="Python bindings for interacting with gnome-vfs" - depends=('python2' 'libbonobo' 'gnome-vfs') - - cd "${srcdir}/gnome-python-${pkgver}" - make -C gnomevfs install DESTDIR="${pkgdir}" -} diff --git a/staging/gnome-sharp/PKGBUILD b/staging/gnome-sharp/PKGBUILD deleted file mode 100644 index a02143afc..000000000 --- a/staging/gnome-sharp/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 147553 2012-01-25 22:28:03Z eric $ -# Maintainer: tobias <tobias@archlinux.org> - -pkgbase=gnome-sharp -pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp') -pkgver=2.24.2 -pkgrel=2 -arch=(i686 x86_64) -license=(LGPL) -url="http://gtk-sharp.sourceforge.net" -makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('3b38f53960c736d4afb8f04204efe98b') - -build() { - # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR="${srcdir}/weird" - mkdir -p "${MONO_SHARED_DIR}" - - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package_gnome-sharp() { - pkgdesc="GNOME bindings for C#" - depends=('art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp') -} - -package_art-sharp() { - pkgdesc="Mono bindings for libart" - depends=('gtk-sharp-2' 'libart-lgpl') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C art install DESTDIR="${pkgdir}" -} - -package_gconf-sharp() { - pkgdesc="Mono bindings for GConf" - depends=('gtk-sharp-2' 'gconf') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gconf/GConf install DESTDIR="${pkgdir}" - make -C gconf/tools install DESTDIR="${pkgdir}" -} - -package_gconf-sharp-peditors() { - pkgdesc="Mono bindings for GConf - Property Editing classes" - depends=('gconf-sharp' 'libgnome-sharp') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gconf/GConf.PropertyEditors install DESTDIR="${pkgdir}" -} - -package_libgnome-sharp() { - pkgdesc="Mono bindings for libgnome" - depends=('art-sharp' 'gnome-vfs-sharp' 'libgnomeui') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gnome install DESTDIR="${pkgdir}" -} - -package_gnome-vfs-sharp() { - pkgdesc="Mono bindings for GNOME-VFS" - depends=('gtk-sharp-2' 'gnome-vfs') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gnomevfs install DESTDIR="${pkgdir}" -} diff --git a/staging/gnomecanvas-perl/PKGBUILD b/staging/gnomecanvas-perl/PKGBUILD deleted file mode 100644 index 2bdc00f77..000000000 --- a/staging/gnomecanvas-perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147550 2012-01-25 21:35:36Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnomecanvas-perl -_realname=Gnome2-Canvas -pkgver=1.002 -pkgrel=9 -pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('gtk2-perl' 'libgnomecanvas' 'perl') -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('93405a987ba4bbd03c2f91592b88f5cb') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/grafx2/PKGBUILD b/staging/grafx2/PKGBUILD deleted file mode 100644 index 597f6472c..000000000 --- a/staging/grafx2/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 62289 2012-01-19 00:16:04Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Simon Parzer <simon.parzer@gmail.com> -pkgname=grafx2 -pkgver=2.3 -pkgrel=3 -pkgdesc="Pixelart-oriented painting program" -arch=('x86_64' 'i686') -url="http://code.google.com/p/grafx2/" -license=('GPL2') -install=grafx2.install -depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') -source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz" - "grafx2.desktop") -md5sums=('916a35c4762e85b4210a1041fbbfd830' - '9b3ecb5c2d44b987d65257184f46e6c4') - -build() { - cd "$srcdir/$pkgname/src" - - msg2 "Compiling..." - make -} - -package() { - cd "$srcdir/$pkgname/src" - - msg2 "Packaging files..." - make prefix="/usr" DESTDIR="$pkgdir" install - msg2 "Packaging shortcut..." - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - msg2 "Packaging documentation..." - install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ - "$pkgdir/usr/share/doc/$pkgname/readme.txt" - msg2 "Packaging license..." - install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - msg2 "Cleaning up..." - rmdir "$pkgdir/usr/share/grafx2/scripts/libs" -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/grafx2/grafx2.desktop b/staging/grafx2/grafx2.desktop deleted file mode 100644 index d58bc5ed3..000000000 --- a/staging/grafx2/grafx2.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -GenericName=GrafX2 -Name=GrafX2 -Comment=Pixelart-oriented painting program -Exec=grafx2 %U -TryExec=grafx2 -Icon=grafx2 -Terminal=false -Type=Application -Categories=Graphics;2DGraphics;RasterGraphics -MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff diff --git a/staging/grafx2/grafx2.install b/staging/grafx2/grafx2.install deleted file mode 100644 index 12589796c..000000000 --- a/staging/grafx2/grafx2.install +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=grafx2 - -post_upgrade() { - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/graphicsmagick/PKGBUILD b/staging/graphicsmagick/PKGBUILD deleted file mode 100644 index 7ca0a92e3..000000000 --- a/staging/graphicsmagick/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 146915 2012-01-19 05:34:57Z bisson $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Anton Leontiev <bunder@t-25.ru> - -pkgname=graphicsmagick -pkgver=1.3.13 -pkgrel=2 -pkgdesc='Image processing system' -url='http://www.graphicsmagick.org/' -arch=('i686' 'x86_64') -license=('MIT') -makedepends=('perl') -depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' - 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") -sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6') - -build() { - cd "${srcdir}/GraphicsMagick-${pkgver}" - - ./configure \ - --prefix=/usr \ - --with-perl \ - --enable-shared \ - --disable-static \ - --with-gs-font-dir=/usr/share/fonts/Type1 \ - - make -} - -package() { - cd "${srcdir}/GraphicsMagick-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # Install MIT license - install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt" - - # Install perl bindings - # The patching was introduced in order to build perl module without installing package itself and - # not to introduce unnecessary path into LD_RUN_PATH - cd PerlMagick - sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL - perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}" - sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile - make - make install - - # Remove perllocal.pod and .packlist - rm -rf "${pkgdir}/usr/lib/perl5/core_perl" - rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist" -} diff --git a/staging/graphviz/LICENSE b/staging/graphviz/LICENSE deleted file mode 100644 index 16cc69a52..000000000 --- a/staging/graphviz/LICENSE +++ /dev/null @@ -1,87 +0,0 @@ -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/staging/graphviz/PKGBUILD b/staging/graphviz/PKGBUILD deleted file mode 100644 index 41270f5fb..000000000 --- a/staging/graphviz/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 146913 2012-01-19 05:23:33Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=graphviz -pkgver=2.28.0 -pkgrel=7 -pkgdesc='Graph visualization software' -url='http://www.graphviz.org/' -license=('custom:EPL') -arch=('i686' 'x86_64') -depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') -makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') -optdepends=('mono: sharp bindings' - 'guile: guile bindings' - 'lua: lua bindings' - 'ocaml: ocaml bindings' - 'perl: perl bindings' - 'php: php bindings' - 'python2: python bindings' - 'r: r bindings' - 'ruby: ruby bindings' - 'tcl: tcl bindings' - 'qt: gvedit') -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'LICENSE') -sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' - 'e78277e502c29abb74b9587a5dc951ec392554ea') - -options=('!libtool') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i "/RUBY_INCLUDES=\"/s|\"$| `eval echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,}`\"|" configure - sed -i '/LIBPOSTFIX="64"/d' configure - export PYTHON=python2 - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # cf. http://www.graphviz.org/License.php - install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE -} diff --git a/staging/graphviz/install b/staging/graphviz/install deleted file mode 100644 index 65fba522b..000000000 --- a/staging/graphviz/install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} diff --git a/staging/grilo-plugins/PKGBUILD b/staging/grilo-plugins/PKGBUILD deleted file mode 100644 index 53fb29f9b..000000000 --- a/staging/grilo-plugins/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 146585 2012-01-13 21:27:23Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=grilo-plugins -pkgver=0.1.18 -pkgrel=2 -pkgdesc="Plugins for Grilo" -url="http://www.gnome.org" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('grilo') -makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt' - 'rest' 'libtracker-sparql') -optdepends=('gupnp-av: uPnP plugin' - 'libgdata: Youtube plugin' - 'libquvi: Youtube plugin' - 'sqlite3: Podcasts plugin' - 'gmime: Podcasts plugin' - 'sqlite3: Bookmarks plugin' - 'sqlite3: Metadata store plugin' - 'libgcrypt: Vimeo plugin' - 'rest: Blip.tv plugin' - 'libtracker-sparql: Tracker plugin') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --enable-shoutcast - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gstreamer0.10-good/PKGBUILD b/staging/gstreamer0.10-good/PKGBUILD deleted file mode 100644 index 66e079f98..000000000 --- a/staging/gstreamer0.10-good/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 147113 2012-01-22 10:40:14Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-good -pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.30 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') -url="http://gstreamer.freedesktop.org/" -options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2) -sha256sums=('b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6') - -build() { - cd "${srcdir}/gst-plugins-good-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --disable-schemas-install \ - --disable-hal \ - --disable-esd \ - --with-package-name="GStreamer Good Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - - make - sed -e 's/gst sys ext/gst/' -i Makefile -} - -package_gstreamer0.10-good() { - depends=('gstreamer0.10-base>=0.10.34' 'bzip2') - pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/etc/gconf" -} - -package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') - pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - install=gstreamer0.10-good-plugins.install - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make -C sys DESTDIR="${pkgdir}" install - make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" -} diff --git a/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install deleted file mode 100644 index e343beea5..000000000 --- a/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gstreamer0.10-good-plugins - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - pre_remove - fi -} - -post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/staging/gthumb/PKGBUILD b/staging/gthumb/PKGBUILD deleted file mode 100644 index fee27cc78..000000000 --- a/staging/gthumb/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 147076 2012-01-21 15:34:53Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gthumb -pkgver=2.14.1 -pkgrel=2 -pkgdesc="Image browser and viewer for the GNOME Desktop" -arch=(i686 x86_64) -license=('GPL') -url="http://gthumb.sourceforge.net/" -depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') -optdepends=('gstreamer0.10-base: video support') -options=('!libtool' '!emptydirs') -install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/staging/gthumb/gthumb.install b/staging/gthumb/gthumb.install deleted file mode 100644 index 6046ebb6f..000000000 --- a/staging/gthumb/gthumb.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=gthumb - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/staging/gtk-engines/PKGBUILD b/staging/gtk-engines/PKGBUILD deleted file mode 100644 index 0883d0ab4..000000000 --- a/staging/gtk-engines/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 147188 2012-01-24 03:20:02Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gtk-engines -pkgver=2.20.2 -pkgrel=2 -pkgdesc="Theme engines for GTK+ 2" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('gtk2>=2.22.0') -makedepends=('pkg-config' 'intltool') -options=('!libtool') -url="http://live.gnome.org/GnomeArt" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2) -conflicts=('lighthouse-gtk2' 'clearlooks-gtk2') -replaces=('lighthouse-gtk2') -sha256sums=('15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-animation - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gtkglext/PKGBUILD b/staging/gtkglext/PKGBUILD deleted file mode 100644 index 60357e286..000000000 --- a/staging/gtkglext/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 146971 2012-01-19 19:43:46Z giovanni $ -# Maintainer: -# Contributor: Ben <ben@benmazer.net> - -pkgname=gtkglext -pkgver=1.2.0 -pkgrel=7 -pkgdesc="opengl extensions for gtk2" -arch=('i686' 'x86_64') -url="http://gtkglext.sourceforge.net/" -license=('LGPL') -depends=('gtk2' 'mesa' 'libxmu') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" - 'gtk2.20.patch') -md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4' - 'e5a87ec3f2d0e616c6f32f90c3f7237f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/gtk2.20.patch" - sed '/AC_PATH_XTRA/d' -i configure.in - - autoreconf --force --install - ./configure --prefix=/usr \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gtkglext/gtk2.20.patch b/staging/gtkglext/gtk2.20.patch deleted file mode 100644 index 54b34c11e..000000000 --- a/staging/gtkglext/gtk2.20.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c ---- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200 -+++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-20 19:29:42.941917275 +0300 -@@ -127,7 +127,7 @@ - * Synchronize OpenGL and window resizing request streams. - */ - -- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) -+ if (gtk_widget_get_realized (widget) && private->is_realized) - { - gldrawable = gdk_window_get_gl_drawable (widget->window); - gdk_gl_drawable_wait_gdk (gldrawable); -@@ -154,7 +154,7 @@ - * Remove OpenGL-capability from widget->window. - */ - -- if (GTK_WIDGET_REALIZED (widget)) -+ if (gtk_widget_get_realized (widget)) - gdk_window_unset_gl_capability (widget->window); - - private->is_realized = FALSE; -@@ -174,7 +174,7 @@ - */ - - toplevel = gtk_widget_get_toplevel (widget); -- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) -+ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) - { - GTK_GL_NOTE (MISC, - g_message (" - Install colormap to the top-level window.")); -@@ -194,7 +194,7 @@ - * Set a background of "None" on window to avoid AIX X server crash. - */ - -- if (GTK_WIDGET_REALIZED (widget)) -+ if (gtk_widget_get_realized (widget)) - { - GTK_GL_NOTE (MISC, - g_message (" - window->bg_pixmap = %p", -@@ -250,8 +250,8 @@ - GTK_GL_NOTE_FUNC (); - - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); -- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); -- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); -+ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); -+ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); - g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); - - /* -@@ -432,7 +432,7 @@ - GTK_GL_NOTE_FUNC (); - - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); - - gldrawable = gdk_window_get_gl_drawable (widget->window); - if (gldrawable == NULL) -@@ -474,7 +474,7 @@ - GLWidgetPrivate *private; - - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); - - private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); - if (private == NULL) -@@ -501,7 +501,7 @@ - gtk_widget_get_gl_window (GtkWidget *widget) - { - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); - - return gdk_window_get_gl_window (widget->window); - } diff --git a/staging/gtkhtml/PKGBUILD b/staging/gtkhtml/PKGBUILD deleted file mode 100644 index 45bc4353c..000000000 --- a/staging/gtkhtml/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 147192 2012-01-24 04:25:29Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gtkhtml -pkgver=3.32.2 -pkgrel=3 -pkgdesc="A lightweight HTML renderer/editor widget for GTK2" -arch=(i686 x86_64) -license=('GPL') -depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup') -makedepends=('intltool') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gtkhtml \ - --localstatedir=/var --disable-static \ - --disable-deprecated-warning-flags - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/bin/gtkhtml-editor-test" -} diff --git a/staging/gtkmm/PKGBUILD b/staging/gtkmm/PKGBUILD deleted file mode 100644 index 40eae3010..000000000 --- a/staging/gtkmm/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 147190 2012-01-24 04:22:44Z eric $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gtkmm -pkgname=('gtkmm' 'gtkmm-docs') -pkgver=2.24.2 -pkgrel=2 -arch=('i686' 'x86_64') -makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') -license=('LGPL') -options=('!libtool' '!emptydirs') -url="http://gtkmm.sourceforge.net/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr - make -} - -package_gtkmm() { - pkgdesc="C++ bindings for gtk2" - depends=('gtk2' 'pangomm' 'atkmm') - cd "${srcdir}/${pkgbase}-${pkgver}" - - sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile - - make DESTDIR="${pkgdir}" install -} - -package_gtkmm-docs() { - pkgdesc="Developer documentation for gtkmm v2" - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C docs DESTDIR="${pkgdir}" install -} diff --git a/staging/gtksourceview2/PKGBUILD b/staging/gtksourceview2/PKGBUILD deleted file mode 100644 index 6f0777cb6..000000000 --- a/staging/gtksourceview2/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 147186 2012-01-24 03:16:31Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gtksourceview2 -pkgver=2.10.5 -pkgrel=2 -pkgdesc="A text widget adding syntax highlighting and more to GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk2>=2.22.0' 'libxml2>=2.7.7') -makedepends=('intltool' 'pkg-config') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2) -sha256sums=('c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e') - -build() { - cd "${srcdir}/gtksourceview-${pkgver}" - sed -i 's#python#python2#' gtksourceview/language-specs/convert.py - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/gtksourceview-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD deleted file mode 100644 index f481c13d3..000000000 --- a/staging/hugin/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 146975 2012-01-19 20:40:48Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=hugin -pkgver=2011.4.0 -pkgrel=1 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('GPL') -depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' - 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') -makedepends=('zip' 'cmake' 'boost' 'tclap') -install=hugin.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b') - -build() { - cd "${srcdir}" - mkdir build && cd build - cmake "${srcdir}/${pkgname}-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ - -DENABLE_LAPACK=yes - make -} - -package(){ - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install deleted file mode 100644 index 362749233..000000000 --- a/staging/hugin/hugin.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} diff --git a/staging/hylafax/PKGBUILD b/staging/hylafax/PKGBUILD deleted file mode 100644 index f00c0d884..000000000 --- a/staging/hylafax/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 147950 2012-01-29 02:47:19Z eric $ -# Maintainer: Paul Mattal <paul@archlinux.org> -pkgname=hylafax -pkgver=6.0.5 -pkgrel=3 -pkgdesc="Fax Server" -arch=('i686' 'x86_64') -install='hylafax.install' -license=('custom') -depends=('libtiff' 'pam' 'ghostscript') -makedepends=('smtp-server') -url="http://www.hylafax.org/" -backup=(var/spool/hylafax/bin/{faxrcvd,notify} - usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} - var/spool/hylafax/etc/hosts.hfaxd) -source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz - hylafax - hylafax.cron.daily - config.local - configure-6.0.5.patch - hylafax-libtiff4.patch) -md5sums=('eb9ac942354ad708e20e4583cec6615f' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '0d2ce24d918226a852539aebf57d3f4a' - '51d9f639bb76e5e39cdc8e2ac07e208d' - '3d239c186f24720e945508d349b069b1') - -build() { - cd "$srcdir/${pkgname}-${pkgver}" - cp ../config.local . - # fix compiling - patch -Np0 -i ../configure-6.0.5.patch - patch -Np1 -i ../hylafax-libtiff4.patch - ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" - make -} - -package () { - cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} - mkdir -p "$pkgdir"/var/{spool/hylafax,lock} - make ROOT="$pkgdir" install - install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax - install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax - # add missing awk file for notify-4.1 script - install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \ - "$pkgdir"/var/spool/hylafax/bin/notify.awk - # fix permission on /var/lock - chmod 1777 "$pkgdir"/var/lock - - install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT -} diff --git a/staging/hylafax/config.local b/staging/hylafax/config.local deleted file mode 100644 index 0d8e2bcd8..000000000 --- a/staging/hylafax/config.local +++ /dev/null @@ -1,273 +0,0 @@ -# $Id: config.local,v 1.1 2003/06/28 00:24:49 jproctor Exp $ -# -# HylaFAX Facsimile Software -# -# Copyright (c) 1990-1996 Sam Leffler -# Copyright (c) 1991-1996 Silicon Graphics, Inc. -# HylaFAX is a trademark of Silicon Graphics, Inc. -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. -# - -# -# This file holds site-specific configuration parameters. -# -# Nothing is defined in here by default, the definitions -# commented out below serve as documentation for what you -# can set in this file or a config.local file. -# -# Note that you do not need to set anything here unless you -# want to override the auto-configuration behaviour and/or -# interactive prompting done by the configure script. -# - -# -# Package controls. -# -#DSO="auto" # configure DSO support (auto|IRIX|no) -#GETTY="auto" # type of getty support (auto|BSD|SysV) -#HTML="no" # install HTML documentation (yes|no) -#PS="auto" # PostScript support to use (auto|gs|dps|imp) -#SGI2FAX="auto" # configure SGI image support (auto|yes|no) -#DPS="no" # install SGI DPS-based RIP (yes|no) -#GS="no" # install Ghostscript RIP (yes|no) -#IMP="no" # install SGI Impressario 2.1 support (yes|no) -#REGEX="yes" # use distributed regular expression package -#UTMP="utmpx" # type of utmp+wtmp handling (auto|utmp|utmpx) -#DBLIB="no" # use distributed libdb distribution - -# -# Directory parameters. -# -DIR_BIN="/usr/bin" # directory for client apps -DIR_LIB="/usr/lib" -DIR_LIBDATA="/usr/lib/fax" # directory for client data -DIR_LIBEXEC="/usr/lib/fax" # directory for libraries&hidden apps -DIR_MAN="/usr/share/man" # directory for manual pages -DIR_SPOOL="/var/spool/hylafax" # directory for spooling area -DIR_SBIN="/usr/sbin" # directory for system apps -DIR_LOCKS="/var/lock" # directory for UUCP lock files -FONTMAP="/usr/share/ghostscript/fonts" # directorys containing Fontmap files -DIR_LOCALE="/usr/share/locale" -#PATH_AFM="/usr/lib/DPS/AFM" # directorys for AFM files - -# -# HTML-specific parameters; only used when the -# HTML package is configured for installation. -# -# Note that ``PATH''s are the virtual pathnames used -# in forming URLs; they are not directory pathnames -# in the filesystem. -# -DIR_HTML="/usr/share/hylafax/httpd" # directory for HTML documentation -#DIR_CGI="/var/httpd/cgi-bin" # directory for CGI scripts -#HTMLPATH="/hylafax" # virtual path to HTML materials -#CGIPATH="/cgi-bin" # virtual path to CGI scripts - -# -# Miscellaneous parameters. -# -#DEFVRES="196" # default vertical res for outbound fax -#FILLORDER="MS2LSB" # bit order of cpu (MSB2LSB/LSB2MSB) -#AXGID="uucp" # group ID for fax user -#FAXUID="uucp" # user ID for fax user -#PAGESIZE="North American Letter" # default page size -SYSGID="root" # group ID for system installs -SYSUID="root" # user ID for system installs -#LOCKS="ascii" # default UUCP lockfile scheme -# -#PATH_GETTY="/etc/getty" # pathname of suitable getty program -#PATH_VGETTY="/bin/vgetty" # pathname of voice getty program -#PATH_EGETTY="/bin/egetty" # pathname of external getty program -#PATH_SENDMAIL="/usr/lib/sendmail" # pathname of suitable sendmail program -#PATH_GSRIP="/usr/local/bin/gs" # pathname of Ghostscript-based RIP -#PATH_DPSRIP="/var/spool/hylafax/bin/ps2fax.exe" # pathname of DPS-based RIP -#PATH_IMPRIP="/usr/lib/print/psrip" # pathname of Impressario 2.1 RIP -#MANSCHEME="sysv-source-cat-strip" # manual page installation scheme -#SYSVINIT="auto" # install SysV-style init support (auto|yes|no) -#DIR_SYSVINIT="/etc/init.d" # location of SysV-style init script -#DIR_SYSVINITSTART="../rc2.d" # location of SysV-style start script -#DIR_SYSVINITSTOP="../rc0.d" # location of SysV-style stop script -#NAME_SYSVINITSTART="S80fax" # name of SysV-style start script -#NAME_SYSVINITSTOP="K80fax" # name of SysV-style stop script -#FAXQ_SERVER=yes # init script starts faxq -#HFAXD_SERVER=yes # init script starts hfaxd -#HFAXD_OLD_PROTOCOL=no # don't start old protocol -#HFAXD_SNPP_SERVER=no # don't start paging protocol - -# SVR4 packaging stuff -#PKG_ARCH= # ARCH variable in pkginfo file -#PKG_EMAIL=someone@somehost.somedomain # EMAIL variable in pkginfo file -#PKG_VENDOR="Your Name Here" # VENDOR variable in pkginfo file -# - -# -# Parameters used when building the software. -# -# Note that configure has several ENVOPTS built into it that are -# set according to the target. This is done to help naive folks. -# -# Beware of changing the INSTALL definition; you *must* have an -# install script that emulates the Silicon Graphics install program! -# -#AR="/bin/ar" # pathname of suitable ar program -#AROPTS="rc" # options to ar for creating archive -#CC="gcc" # name/pathname of C compiler -#CXX="gcc" # name/pathname of C++ compiler -#CXXFILE="-x c++" # options for proper C++ processing -#ENVOPTS="-Aa" # options for getting ANSI C -#GCOPTS="-g" # options to pass C compiler -#GCXXOPTS="-g" # options to pass C++ compiler -#GENDIST="/sbin/gendist" # pathname of SGI inst generator program -#INSTALL='${SHELL} ${PORT}/install.sh' # SGI install program/emulator -#LIBMALLOC="auto" # yes|no|auto configure -lmalloc use -#LIBPORT='${PORT}/libport.a' # library with emulation code -#LIBSUN="auto" # yes|no|auto configure -lsun use -#LLDOPTS="" # extra link line options -#MACHDEPLIBS="" # extra libraries for linking -#PORTFUNCS="" # non-standard functions to emulate -#PROTOTYPES="-prototypes" # C compiler options for checking function prototypes -#RANLIB=":" # pathname of suitable ranlib program -#SHDLIBC="-lc_s" # shared C library, if not standard -#SIGHANDLERTYPES='(void(*)(int,...))' # types to check for signal handler -#STRIP="/bin/strip" # strip program used by install.sh - -# -# The source for the TIFF library is not required -# to build this software, but the library is required -# to link against. If libtiff is installed in a -# non-standard location then setup LIBTIFF accordingly. -# -#LIBTIFF="-L/usr/local/lib -ltiff" # linkage convention for libtiff -#TIFFINC="/usr/local/include" # place to find tiffio.h -#TIFFBIN="/usr/local/bin" # where TIFF tools live - -# -# The source for the ZLIB library is not required -# to build this software, but the library is required -# to link against. If ZLIB is installed in a -# non-standard location then setup LIBZ accordingly. -# -#LIBZ="-L/usr/local/lib -lz" # linkage convention for libz -#ZLIBINC="-I/usr/local/include" # place to find zlib.h - -# -# The source for the POSIX regular expression package -# is not required to build this software, but the package -# is required to link against. If the copy of the software -# that is included in this distribution is not to be used -# then set REGEX=no and supply the following definitions. -# -#LIBREGEX=" " # linkage convention for regex package -#REGEXINC="/usr/include" # place to find regex.h - -# -# The LIBDB hashed database package is (currently) used -# only by the MLA tools that are not publicly available -# but which are built from within this source tree. In -# the future the fax software may use the libdb software -# for the remote client capabilities database (so these -# hooks are included now). -# -# The source for the LIBDB hashed database package -# is not required to build this software, but the package -# is required to link against. If the copy of the software -# that is included in this distribution is not to be used -# then set DBLIB=no and supply the following definitions. -# -#LIBDB=" " # linkage convention for libdb package -#DBLIBINC="/usr/include" # place to find db.h - -# -# Parameters to control various workarounds for system bugs. -# -# These parameters are normally set in configure based on -# the target system. If they are set here, then they will -# override anything done by configure. -# -#CONFIG_OPENFIFO="O_RDONLY" # mode to open FIFOs in server proc's -#CONFIG_FIFOBUG="yes" # enable workaround for FIFO select bug -#CONFIG_TIOCMBISBYREF="yes" # pass arg by reference to ioctl -#CONFIG_WINSZHACK="no" # include extra files for TIOCWINSZ use -#CONFIG_ABORTBUG="no" # enable workaround for abort problems -#CONFIG_NOREOPEN="yes" # reopen tty device after toggling DTR -#CONFIG_NOSTDINDUP="yes" # do not redirect stdout to stdin in ondelay -#CONFIG_BADEXECVPROTO="no" # system has incorrect execv func decl -#CONFIG_BADEXECVEPROTO="no" # system has incorrect execve func decl -#CONFIG_BADGETOPTPROTO="no" # system has incorrect getopt func decl -#CONFIG_SOCKARGLENTYPE="unsigned long" # call-by-ref arg type for socket funcs -#CONFIG_BADSELECTPROTO="no" # system has way old select func decl -#CONFIG_MAXGID="5999" # maximum permissable GID -#CONFIG_OSFCNH="auto" # control inclusion of <osfcn.h> - -# -# Dynamic Shared Object (DSO) support. -# -# Beware that adding new support for DSOs may require some -# modifications to the */Makefile.dso files. -# -#DSOSUF="so" # DSO filename suffix -#DSODELAY="-delay_load" # DSO option for delayed loading -#DSOOPTS="-shared -rdata_shared" # options for building DSOs - -# -# Makefile construction parameters. -# -# These should not normally be set; configure will -# deduce the appropriate syntax to use for includes. -# -#MAKECXXOVERRIDE="=.C" # make override stuff for SunPRO C++ -#MAKEDEPINCLUDE="include" # make include for dependency files -#MAKEDSOINCLUDE="#" # make include for DSO support -#MAKEINCLUDE=".include" # make include syntax -#MAKELQUOTE="<" # make include syntax -#MAKERQUOTE=">" # make include syntax -#SETMAKE='MAKE = ${MAKE}' # define if make does not setup $MAKE -#MKDEPCOPTS="" # C compiler opts to supply w/ -M -#MKDEPCXXOPTS="" # C++ compiler opts to supply w/ -M - -# -# General system stuff used by the distribution. -# -# Beware of setting these as configure selects several programs -# based on whether or not they are capable of processing scripts -# included in the distribution (e.g AWK and SCRIPT_SH, SED). -# -#AWK="/bin/awk" # pathname of suitable awk program -#CAT="/bin/cat" # pathname of suitable cat program -#CHGRP="/etc/chgrp" # pathname of suitable chgrp program -#CHMOD="/etc/chmod" # pathname of suitable chmod program -#CHOWN="/etc/chown" # pathname of suitable chown program -#CMP="/bin/cmp" # pathname of suitable cmp program -#COL="/bin/col" # pathname of suitable col program -#CP="/bin/cp" # pathname of suitable cp program -#ECHO="/bin/echo" # pathname of suitable echo program -#GREP="/bin/grep" # pathname of suitable grep program -#LN="/bin/ln" # pathname of suitable ln program -#LN_S="-s" # option to ${LN} to create symlink -#MAN="/usr/bin/man" # pathname of suitable man program -#MKDIR="/bin/mkdir" # pathname of suitable mkdir program -#MKFIFO="/bin/mkfifo" # pathname of suitable mkfifo program -#MV="/bin/mv" # pathname of suitable mv program -#MV_F="-f" # option to ${MV} to force operation -#RMCMD="/bin/rm" # pathname of suitable rm program -#SED="/bin/sed" # pathname of suitable sed program -#SCRIPT_SH="/bin/sh" # pathname of suitable shell -#SORT="/bin/sort" # pathname of suitable sort program diff --git a/staging/hylafax/configure-6.0.5.patch b/staging/hylafax/configure-6.0.5.patch deleted file mode 100644 index e1f1126a5..000000000 --- a/staging/hylafax/configure-6.0.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.old 2011-08-08 10:19:37.619657223 +0200 -+++ configure 2011-08-08 10:20:26.422189170 +0200 -@@ -2882,7 +2882,7 @@ - echo '#define HAS_FCHMOD 1' - Note "... configure use of fchmod" - CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \ -- unistd.h libc.h $OSFCNH sys/stat.h -+ unistd.h $OSFCNH sys/stat.h libc.h - } - CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \ - unistd.h sys/stat.h diff --git a/staging/hylafax/hylafax b/staging/hylafax/hylafax deleted file mode 100755 index 9f949c2ac..000000000 --- a/staging/hylafax/hylafax +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="hylafax" -FAXQ_BIN=/usr/sbin/faxq -FAXQ_PID=`pidof -o %PPID $FAXQ_BIN` -HFAXD_BIN=/usr/lib/fax/hfaxd -HFAXD_PID=`pidof -o %PPID $HFAXD_BIN` -HFAXD_OPTS="-i hylafax" -FAXQUIT_BIN=/usr/sbin/faxquit - -. /var/spool/hylafax/etc/setup.cache - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ -z "$FAXQ_PID" ] && $FAXQ_BIN - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `pidof -o %PPID $FAXQ_BIN` > /var/run/faxq.pid - fi - [ -z "$HFAXD_PID" ] && $HFAXD_BIN $HFAXD_OPTS - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `pidof -o %PPID $HFAXD_BIN` > /var/run/hfaxd.pid - fi - add_daemon $DAEMON_NAME - stat_done - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - $FAXQUIT_BIN >/dev/null 2>&1 - if [ $? -gt 0 ]; then - [ ! -z "$FAXQ_PID" ] && kill $FAXQ_PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm /var/run/faxq.pid &> /dev/null - fi - else - rm /var/run/faxq.pid &> /dev/null - fi - [ ! -z "$HFAXD_PID" ] && kill $HFAXD_PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm /var/run/hfaxd.pid &> /dev/null - fi - rm_daemon $DAEMON_NAME - stat_done - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/hylafax/hylafax-libtiff4.patch b/staging/hylafax/hylafax-libtiff4.patch deleted file mode 100644 index 4a49511f8..000000000 --- a/staging/hylafax/hylafax-libtiff4.patch +++ /dev/null @@ -1,229 +0,0 @@ ---- hylafax-6.0.5/configure 2010-09-15 10:42:36.000000000 -0400 -+++ hylafax-5.5.1/configure 2012-01-02 17:44:20.000000000 -0500 -@@ -2531,6 +2566,7 @@ - Note "... checking TIFF library version" - tiff_runlen_t="" - cat>t.c<<EOF -+#include <stdlib.h> - #include <stdio.h> - #include "tiffio.h" - main() -@@ -2550,8 +2586,18 @@ - Note " Found libtiff version ${lib_ver}" - if [ ${header_ver} -ge 19960307 ]; then - case ${lib_ver} in -- 3.4) tiff_runlen_t="uint16" ;; -- 3.[56789]) tiff_runlen_t="uint32" ;; -+ 3.4) tiff_runlen_t="uint16" -+ echo '#define TIFFSTRIPBYTECOUNTS uint32' -+ echo '#define TIFFVERSION TIFF_VERSION' -+ echo '#define TIFFHEADER TIFFHeader';; -+ 3.[56789]) tiff_runlen_t="uint32" -+ echo '#define TIFFSTRIPBYTECOUNTS uint32' -+ echo '#define TIFFVERSION TIFF_VERSION' -+ echo '#define TIFFHEADER TIFFHeader';; -+ 4.0) tiff_runlen_t="uint32" -+ echo '#define TIFFSTRIPBYTECOUNTS uint64' -+ echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' -+ echo '#define TIFFHEADER TIFFHeaderClassic';; - esac - fi - else -@@ -2588,7 +2634,7 @@ - Incompatible TIFF Library. - - HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through --3.9. If you do not have up to date TIFF software on your system -+4.0. If you do not have up to date TIFF software on your system - then you can retrieve it from the location where you obtained this software. - The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/ - EOF ---- hylafax-6.0.5/hfaxd/FileTransfer.c++ 2010-09-15 10:42:36.000000000 -0400 -+++ hylafax-5.5.1/hfaxd/FileTransfer.c++ 2012-01-02 17:44:19.000000000 -0500 -@@ -164,26 +142,26 @@ - * a single IFD/image from a TIFF file. - */ - typedef struct { -- TIFFDirEntry SubFileType; -- TIFFDirEntry ImageWidth; -- TIFFDirEntry ImageLength; -- TIFFDirEntry BitsPerSample; -- TIFFDirEntry Compression; -- TIFFDirEntry Photometric; -- TIFFDirEntry FillOrder; -- TIFFDirEntry StripOffsets; -- TIFFDirEntry Orientation; -- TIFFDirEntry SamplesPerPixel; -- TIFFDirEntry RowsPerStrip; -- TIFFDirEntry StripByteCounts; -- TIFFDirEntry XResolution; -- TIFFDirEntry YResolution; -- TIFFDirEntry Options; // T4 or T6 -- TIFFDirEntry ResolutionUnit; -- TIFFDirEntry PageNumber; -- TIFFDirEntry BadFaxLines; -- TIFFDirEntry CleanFaxData; -- TIFFDirEntry ConsecutiveBadFaxLines; -+ HFClassicTIFFDirEntry SubFileType; -+ HFClassicTIFFDirEntry ImageWidth; -+ HFClassicTIFFDirEntry ImageLength; -+ HFClassicTIFFDirEntry BitsPerSample; -+ HFClassicTIFFDirEntry Compression; -+ HFClassicTIFFDirEntry Photometric; -+ HFClassicTIFFDirEntry FillOrder; -+ HFClassicTIFFDirEntry StripOffsets; -+ HFClassicTIFFDirEntry Orientation; -+ HFClassicTIFFDirEntry SamplesPerPixel; -+ HFClassicTIFFDirEntry RowsPerStrip; -+ HFClassicTIFFDirEntry StripByteCounts; -+ HFClassicTIFFDirEntry XResolution; -+ HFClassicTIFFDirEntry YResolution; -+ HFClassicTIFFDirEntry Options; // T4 or T6 -+ HFClassicTIFFDirEntry ResolutionUnit; -+ HFClassicTIFFDirEntry PageNumber; -+ HFClassicTIFFDirEntry BadFaxLines; -+ HFClassicTIFFDirEntry CleanFaxData; -+ HFClassicTIFFDirEntry ConsecutiveBadFaxLines; - uint32 link; // offset to next directory - uint32 xres[2]; // X resolution indirect value - uint32 yres[2]; // Y resolution indirect value -@@ -226,10 +204,10 @@ - * amount of image data and then adding in - * the expected data for the TIFF headers. - */ -- uint32* sb; -+ TIFFSTRIPBYTECOUNTS* sb; - TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb); - file_size = sizeof (DirTemplate) + -- sizeof (TIFFHeader) + sizeof (uint16); -+ sizeof (TIFFHEADER) + sizeof (uint16); - for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++) - file_size += sb[s]; - reply(code, "%s for %s (%lu bytes).", -@@ -261,10 +239,10 @@ - if (fd >= 0) { - union { - char buf[512]; -- TIFFHeader h; -+ TIFFHEADER h; - } b; - ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b)); -- if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION && -+ if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION && - (b.h.tiff_magic == TIFF_BIGENDIAN || - b.h.tiff_magic == TIFF_LITTLEENDIAN)) { - (void) lseek(fd, 0L, SEEK_SET); // rewind -@@ -318,12 +296,12 @@ - } - - static void --getLong(TIFF* tif, TIFFDirEntry& de) -+getLong(TIFF* tif, HFClassicTIFFDirEntry& de) - { - TIFFGetField(tif, de.tdir_tag, &de.tdir_offset); - } - static void --getShort(TIFF* tif, TIFFDirEntry& de) -+getShort(TIFF* tif, HFClassicTIFFDirEntry& de) - { - uint16 v; - TIFFGetField(tif, de.tdir_tag, &v); -@@ -343,7 +321,7 @@ - { - static DirTemplate templ = { - #define TIFFdiroff(v) \ -- (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \ -+ (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \ - (intptr_t) &(((DirTemplate*) 0)->v)) - { TIFFTAG_SUBFILETYPE, TIFF_LONG, 1 }, - { TIFFTAG_IMAGEWIDTH, TIFF_LONG, 1 }, -@@ -368,7 +346,7 @@ - 0, // next directory - { 0, 1 }, { 0, 1 }, // x+y resolutions - }; --#define NTAGS ((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry)) -+#define NTAGS ((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry)) - /* - * Construct the TIFF header for this IFD using - * the preconstructed template above. We extract -@@ -377,14 +355,14 @@ - * of things about the contents of the TIFF file. - */ - struct { -- TIFFHeader h; -+ TIFFHEADER h; - uint16 dircount; - u_char dirstuff[sizeof (templ)]; - } buf; - union { int32 i; char c[4]; } u; u.i = 1; - buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN); -- buf.h.tiff_version = TIFF_VERSION; -- buf.h.tiff_diroff = sizeof (TIFFHeader); -+ buf.h.tiff_version = TIFFVERSION; -+ buf.h.tiff_diroff = sizeof (TIFFHEADER); - buf.dircount = (uint16) NTAGS; - getLong(tif, templ.SubFileType); - getLong(tif, templ.ImageWidth); -@@ -412,7 +390,7 @@ - getShort(tif, templ.CleanFaxData); - getLong(tif, templ.ConsecutiveBadFaxLines); - if (buf.h.tiff_magic == TIFF_BIGENDIAN) { -- TIFFDirEntry* dp = &templ.SubFileType; -+ HFClassicTIFFDirEntry* dp = &templ.SubFileType; - for (u_int i = 0; i < NTAGS; i++) { - if (dp->tdir_type == TIFF_SHORT) - dp->tdir_offset <<= 16; -@@ -441,7 +419,7 @@ - bool - HylaFAXServer::sendITIFFData(TIFF* tif, int fdout) - { -- uint32* sb; -+ TIFFSTRIPBYTECOUNTS* sb; - (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb); - tdata_t buf = _TIFFmalloc(sb[0]); - tsize_t bsize = sb[0]; ---- hylafax-6.0.5/hfaxd/FileTransfer.c++ 2012-01-28 15:27:47.000000000 -0500 -+++ hylafax-5.5.1/hfaxd/FileTransfer.c++ 2012-01-28 15:30:12.000000000 -0500 -@@ -69,7 +69,7 @@ - - - static bool --isTIFF(const TIFFHeader& h) -+isTIFF(const TIFFHEADER& h) - { - if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN) - return (false); -@@ -82,11 +82,23 @@ - // byte swap version stamp if opposite byte order - if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN)) - TIFFSwabShort(&version); -- return (version == TIFF_VERSION); -+ return (version == TIFFVERSION); - } - - - /* -+ * This is copied right from tiff.h in version 3.8.2. This was necessary -+ * to localize here because it was removed from tiff.h in version 4.0. -+ * In tiff.h 3.8.2 it was known as "TIFFDirEntry". -+ */ -+typedef struct { -+ uint16 tdir_tag; -+ uint16 tdir_type; /* data type */ -+ uint32 tdir_count; /* number of items; length in spec */ -+ uint32 tdir_offset; /* byte offset to field data */ -+} HFClassicTIFFDirEntry; -+ -+/* - * Record a file transfer in the log file. - */ - void -@@ -957,7 +957,7 @@ - if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) { - union { - char buf[512]; -- TIFFHeader h; -+ TIFFHEADER h; - } b; - ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b)); - if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!') diff --git a/staging/hylafax/hylafax.cron.daily b/staging/hylafax/hylafax.cron.daily deleted file mode 100644 index 2d1a77e5c..000000000 --- a/staging/hylafax/hylafax.cron.daily +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/usr/sbin/faxqclean -/usr/sbin/faxcron -rcv 30 diff --git a/staging/hylafax/hylafax.install b/staging/hylafax/hylafax.install deleted file mode 100644 index 5dacf4045..000000000 --- a/staging/hylafax/hylafax.install +++ /dev/null @@ -1,46 +0,0 @@ - -print_install() { - printf "\n" - echo "Add the following to /etc/inittab and run telinit q" - echo " f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0" - echo "faxgetty should now be running" - printf "\n" - echo "Run faxsetup to configure and be sure to set..." - echo " The device to configure is usually ttyS0" - echo " The number of pages to accept to more than 25" - echo " The country code and area code" - echo " The faxclass to 2.0" - echo " Most other defaults are OK" - printf "\n" -} - -print_remove() { - printf "\n\n" - echo "You may manually remove /var/spool/hylafax and /usr/lib/fax if you do not need anything." - echo "You may also remove any aliases added to /etc/mail/aliases." - printf "\n" -} - -post_install() { - post_upgrade - print_install -} - -post_upgrade() { - groupadd -g 14 uucp &>/dev/null - useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null - useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null - chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc} - chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp} - chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog} - chown -R uucp /var/spool/hylafax/etc/templates - usermod -d '/' uucp &>/dev/null - usermod -d '/' fax &>/dev/null -} - -pre_remove() { - userdel uucp &>/dev/null - groupdel uucp &>/dev/null - userdel fax &>/dev/null - print_remove -} diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD deleted file mode 100644 index 91331d359..000000000 --- a/staging/imagemagick/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 146973 2012-01-19 20:16:27Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=imagemagick -pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.4.7 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.imagemagick.org/" -license=('custom') -depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo') -makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - perlmagick.rpath.patch) -sha1sums=('87cde464a569d8b34ef8edae817fbe4f51f8c2d0' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') - -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf - patch -p0 -i ../perlmagick.rpath.patch - - LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --without-webp \ - --without-jbig --without-fpx --without-dps --without-fftw --without-lqr - make -} - -check() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make check -} - -package_imagemagick() { - pkgdesc="An image viewing/manipulation program" - optdepends=('ghostscript: for Ghostscript support' - 'openexr: for OpenEXR support' - 'libwmf: for WMF support' - 'librsvg: for SVG support' - 'libxml2: for XML support' - 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') - backup=('etc/ImageMagick/coder.xml' - 'etc/ImageMagick/colors.xml' - 'etc/ImageMagick/delegates.xml' - 'etc/ImageMagick/log.xml' - 'etc/ImageMagick/magic.xml' - 'etc/ImageMagick/mime.xml' - 'etc/ImageMagick/policy.xml' - 'etc/ImageMagick/sRGB.icc' - 'etc/ImageMagick/thresholds.xml' - 'etc/ImageMagick/type.xml' - 'etc/ImageMagick/type-dejavu.xml' - 'etc/ImageMagick/type-ghostscript.xml' - 'etc/ImageMagick/type-windows.xml') - options=('!makeflags' '!docs' 'libtool') - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" - -#Cleaning - find "${pkgdir}" -name '*.bs' -delete - rm -f "${pkgdir}"/usr/lib/*.la -} - -package_imagemagick-doc() { - pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - depends=() - options=('!makeflags') - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install-data-html - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" -} diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index 958c0f2ee..000000000 --- a/staging/imagemagick/perlmagick.rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 -+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 -@@ -10067,6 +10067,7 @@ - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/staging/imlib/CAN-2004-1026.patch b/staging/imlib/CAN-2004-1026.patch deleted file mode 100644 index c820270d4..000000000 --- a/staging/imlib/CAN-2004-1026.patch +++ /dev/null @@ -1,510 +0,0 @@ -diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c ---- imlib-1.9.13.orig/Imlib/load.c Wed Mar 13 19:06:29 2002 -+++ imlib-1.9.13/Imlib/load.c Thu Sep 16 17:21:01 2004 -@@ -4,6 +4,8 @@ - #include "Imlib_private.h" - #include <setjmp.h> - -+#define G_MAXINT ((int) 0x7fffffff) -+ - /* Split the ID - damages input */ - - static char * -@@ -41,13 +43,17 @@ - - /* - * Make sure we don't wrap on our memory allocations -+ * we check G_MAXINT/4 because rend.c malloc's w * h * bpp -+ * + 3 is safety margin - */ - - void * _imlib_malloc_image(unsigned int w, unsigned int h) - { -- if( w > 32767 || h > 32767) -- return NULL; -- return malloc(w * h * 3); -+ if (w <= 0 || w > 32767 || -+ h <= 0 || h > 32767 || -+ h >= (G_MAXINT/4 - 1) / w) -+ return NULL; -+ return malloc(w * h * 3 + 3); - } - - #ifdef HAVE_LIBJPEG -@@ -360,7 +366,9 @@ - npix = ww * hh; - *w = (int)ww; - *h = (int)hh; -- if(ww > 32767 || hh > 32767) -+ if (ww <= 0 || ww > 32767 || -+ hh <= 0 || hh > 32767 || -+ hh >= (G_MAXINT/sizeof(uint32)) / ww) - { - TIFFClose(tif); - return NULL; -@@ -463,7 +471,7 @@ - } - *w = gif->Image.Width; - *h = gif->Image.Height; -- if (*h > 32767 || *w > 32767) -+ if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) - { - return NULL; - } -@@ -965,7 +973,12 @@ - comment = 0; - quote = 0; - context = 0; -+ memset(lookup, 0, sizeof(lookup)); -+ - line = malloc(lsz); -+ if (!line) -+ return NULL; -+ - while (!done) - { - pc = c; -@@ -994,25 +1007,25 @@ - { - /* Header */ - sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n"); - free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n"); - free(line); - return NULL; - } -- if (*w > 32767) -+ if (*w <= 0 || *w > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); - free(line); - return NULL; - } -- if (*h > 32767) -+ if (*h <= 0 || *h > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); - free(line); -@@ -1045,11 +1058,13 @@ - { - int slen; - int hascolor, iscolor; -+ int space; - - iscolor = 0; - hascolor = 0; - tok[0] = 0; - col[0] = 0; -+ space = sizeof(col) - 1; - s[0] = 0; - len = strlen(line); - strncpy(cmap[j].str, line, cpp); -@@ -1072,10 +1087,10 @@ - { - if (k >= len) - { -- if (col[0]) -- strcat(col, " "); -- if (strlen(col) + strlen(s) < sizeof(col)) -- strcat(col, s); -+ if (col[0] && space > 0) -+ strcat(col, " "), space -= 1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - if (col[0]) - { -@@ -1105,14 +1120,17 @@ - } - } - } -- strcpy(tok, s); -+ if (slen < sizeof(tok)); -+ strcpy(tok, s); - col[0] = 0; -+ space = sizeof(col) - 1; - } - else - { -- if (col[0]) -- strcat(col, " "); -- strcat(col, s); -+ if (col[0] && space > 0) -+ strcat(col, " "), space -=1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - } - } -@@ -1341,12 +1359,12 @@ - sscanf(s, "%i %i", w, h); - a = *w; - b = *h; -- if (a > 32767) -+ if (a <= 0 || a > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); - return NULL; - } -- if (b > 32767) -+ if (b <= 0 || b > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); - return NULL; -diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c ---- imlib-1.9.13.orig/Imlib/utils.c Mon Mar 4 17:45:28 2002 -+++ imlib-1.9.13/Imlib/utils.c Thu Sep 16 17:21:15 2004 -@@ -1496,36 +1496,56 @@ - context = 0; - ptr = NULL; - end = NULL; -+ memset(lookup, 0, sizeof(lookup)); - - while (!done) - { - line = data[count++]; -+ if (!line) -+ break; -+ line = strdup(line); -+ if (!line) -+ break; -+ len = strlen(line); -+ for (i = 0; i < len; ++i) -+ { -+ c = line[i]; -+ if (c < 32) -+ line[i] = 32; -+ else if (c > 127) -+ line[i] = 127; -+ } -+ - if (context == 0) - { - /* Header */ - sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (w > 32767) -+ if (w <= 0 || w > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } -- if (h > 32767) -+ if (h <= 0 || h > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } - cmap = malloc(sizeof(struct _cmap) * ncolors); -@@ -1533,6 +1553,7 @@ - if (!cmap) - { - free(im); -+ free(line); - return NULL; - } - im->rgb_width = w; -@@ -1542,6 +1563,7 @@ - { - free(cmap); - free(im); -+ free(line); - return NULL; - } - im->alpha_data = NULL; -@@ -1817,6 +1839,7 @@ - } - if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) - done = 1; -+ free(line); - } - if (!transp) - { -diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c ---- imlib-1.9.13.orig/gdk_imlib/io-gif.c Mon Mar 4 17:26:51 2002 -+++ imlib-1.9.13/gdk_imlib/io-gif.c Thu Sep 16 16:11:31 2004 -@@ -55,7 +55,7 @@ - } - *w = gif->Image.Width; - *h = gif->Image.Height; -- if(*h > 32767 || *w > 32767) -+ if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) - { - return NULL; - } -diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c ---- imlib-1.9.13.orig/gdk_imlib/io-ppm.c Mon Mar 4 17:26:51 2002 -+++ imlib-1.9.13/gdk_imlib/io-ppm.c Thu Sep 16 16:13:13 2004 -@@ -53,12 +53,12 @@ - sscanf(s, "%i %i", w, h); - a = *w; - b = *h; -- if (a > 32767) -+ if (a <= 0 || a > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); - return NULL; - } -- if (b > 32767) -+ if (b <= 0 || b > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); - return NULL; -diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c ---- imlib-1.9.13.orig/gdk_imlib/io-tiff.c Mon Mar 4 17:26:51 2002 -+++ imlib-1.9.13/gdk_imlib/io-tiff.c Thu Sep 16 16:13:57 2004 -@@ -36,7 +36,9 @@ - npix = ww * hh; - *w = (int)ww; - *h = (int)hh; -- if(ww > 32767 || hh > 32767) -+ if (ww <= 0 || ww > 32767 || -+ hh <= 0 || hh > 32767 || -+ hh >= (G_MAXINT/sizeof(uint32)) / ww) - { - TIFFClose(tif); - return NULL; -diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c ---- imlib-1.9.13.orig/gdk_imlib/io-xpm.c Mon Mar 4 17:26:51 2002 -+++ imlib-1.9.13/gdk_imlib/io-xpm.c Thu Sep 16 17:08:24 2004 -@@ -40,8 +40,12 @@ - context = 0; - i = j = 0; - cmap = NULL; -+ memset(lookup, 0, sizeof(lookup)); - - line = malloc(lsz); -+ if (!line) -+ return NULL; -+ - while (!done) - { - pc = c; -@@ -70,25 +74,25 @@ - { - /* Header */ - sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n"); - free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n"); - free(line); - return NULL; - } -- if (*w > 32767) -+ if (*w <= 0 || *w > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); - free(line); - return NULL; - } -- if (*h > 32767) -+ if (*h <= 0 || *h > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); - free(line); -@@ -120,11 +124,13 @@ - { - int slen; - int hascolor, iscolor; -+ int space; - - hascolor = 0; - iscolor = 0; - tok[0] = 0; - col[0] = 0; -+ space = sizeof(col) - 1; - s[0] = 0; - len = strlen(line); - strncpy(cmap[j].str, line, cpp); -@@ -147,10 +153,10 @@ - { - if (k >= len) - { -- if (col[0]) -- strcat(col, " "); -- if (strlen(col) + strlen(s) < sizeof(col)) -- strcat(col, s); -+ if (col[0] && space > 0) -+ strncat(col, " ", space), space -= 1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - if (col[0]) - { -@@ -180,14 +186,17 @@ - } - } - } -- strcpy(tok, s); -+ if (slen < sizeof(tok)) -+ strcpy(tok, s); - col[0] = 0; -+ space = sizeof(col) - 1; - } - else - { -- if (col[0]) -- strcat(col, " "); -- strcat(col, s); -+ if (col[0] && space > 0) -+ strcat(col, " "), space -= 1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - } - } -diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c ---- imlib-1.9.13.orig/gdk_imlib/misc.c Mon Mar 4 17:26:51 2002 -+++ imlib-1.9.13/gdk_imlib/misc.c Thu Sep 16 16:35:32 2004 -@@ -1355,11 +1355,16 @@ - - /* - * Make sure we don't wrap on our memory allocations -+ * we check G_MAX_INT/4 because rend.c malloc's w * h * bpp -+ * + 3 is safety margin - */ - - void *_gdk_malloc_image(unsigned int w, unsigned int h) - { -- if( w > 32767 || h > 32767) -+ if (w <= 0 || w > 32767 || -+ h <= 0 || h > 32767 || -+ h >= (G_MAXINT/4 - 1) / w) - return NULL; -- return malloc(w * h * 3); -+ return malloc(w * h * 3 + 3); - } -+ -diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c ---- imlib-1.9.13.orig/gdk_imlib/utils.c Mon Mar 4 17:26:51 2002 -+++ imlib-1.9.13/gdk_imlib/utils.c Thu Sep 16 17:28:35 2004 -@@ -1236,36 +1236,56 @@ - context = 0; - ptr = NULL; - end = NULL; -+ memset(lookup, 0, sizeof(lookup)); - - while (!done) - { - line = data[count++]; -+ if (!line) -+ break; -+ line = strdup(line); -+ if (!line) -+ break; -+ len = strlen(line); -+ for (i = 0; i < len; ++i) -+ { -+ c = line[i]; -+ if (c < 32) -+ line[i] = 32; -+ else if (c > 127) -+ line[i] = 127; -+ } -+ - if (context == 0) - { - /* Header */ - sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (w > 32767) -+ if (w <= 0 || w > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } -- if (h > 32767) -+ if (h <= 0 || h > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } - cmap = malloc(sizeof(struct _cmap) * ncolors); -@@ -1273,6 +1293,7 @@ - if (!cmap) - { - free(im); -+ free(line); - return NULL; - } - im->rgb_width = w; -@@ -1282,6 +1303,7 @@ - { - free(cmap); - free(im); -+ free(line); - return NULL; - } - im->alpha_data = NULL; -@@ -1355,7 +1377,7 @@ - strcpy(col + colptr, " "); - colptr++; - } -- if (colptr + ls <= sizeof(col)) -+ if (colptr + ls < sizeof(col)) - { - strcpy(col + colptr, s); - colptr += ls; -@@ -1558,6 +1580,7 @@ - } - if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) - done = 1; -+ free(line); - } - if (!transp) - { diff --git a/staging/imlib/PKGBUILD b/staging/imlib/PKGBUILD deleted file mode 100644 index a24025502..000000000 --- a/staging/imlib/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 146849 2012-01-18 20:31:10Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=imlib -pkgver=1.9.15 -pkgrel=11 -pkgdesc="General image handling library for X11 and Gtk" -arch=('i686' 'x86_64') -url="http://freshmeat.net/projects/imlib/" -license=('GPL') -depends=('gtk' 'giflib' 'libpng' 'libtiff') -makedepends=('libxt') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 - debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch) -sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' - 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee' - 'ec1b47281c1a7fb21abe841f948ecc56ed13f310' - 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' - '33c3aaa43eb624f2a6ab0406285a8515903333e3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/debian-bug448360.patch" - patch -p1 -i "${srcdir}/CAN-2004-1026.patch" - patch -p0 -i "${srcdir}/aclocal-fixes.patch" - patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch" - sed '/AC_PATH_XTRA/d' -i configure.in - libtoolize --force - cp /usr/bin/libtool . - autoreconf --force --install - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/imlib/aclocal-fixes.patch b/staging/imlib/aclocal-fixes.patch deleted file mode 100644 index 04ef737e7..000000000 --- a/staging/imlib/aclocal-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- imlib.m4.orig 2006-03-05 12:41:14.000000000 +0000 -+++ imlib.m4 2006-03-05 12:44:15.000000000 +0000 -@@ -6,7 +6,7 @@ - dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS - dnl --AC_DEFUN(AM_PATH_IMLIB, -+AC_DEFUN([AM_PATH_IMLIB], - [dnl - dnl Get the cflags and libraries from the imlib-config script - dnl -@@ -164,7 +164,7 @@ - ]) - - # Check for gdk-imlib --AC_DEFUN(AM_PATH_GDK_IMLIB, -+AC_DEFUN([AM_PATH_GDK_IMLIB], - [dnl - dnl Get the cflags and libraries from the imlib-config script - dnl diff --git a/staging/imlib/debian-bug448360.patch b/staging/imlib/debian-bug448360.patch deleted file mode 100644 index f1c0ef111..000000000 --- a/staging/imlib/debian-bug448360.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c ---- imlib-1.9.15.orig/gdk_imlib/misc.c 2002-03-04 18:06:32.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/misc.c 2007-10-28 14:00:04.000000000 +0100 -@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams - visual = gdk_rgb_get_visual(); - id->x.visual = GDK_VISUAL_XVISUAL(visual); /* the visual type */ - id->x.depth = visual->depth; /* the depth of the screen in bpp */ -+ -+ id->x.shm = 0; -+ id->x.shmp = 0; -+ id->max_shm = 0; - #ifdef HAVE_SHM - if (XShmQueryExtension(id->x.disp)) - { -@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams - id->x.last_xim = NULL; - id->x.last_sxim = NULL; - id->max_shm = 0x7fffffff; -- if (XShmPixmapFormat(id->x.disp) == ZPixmap) -+ if ((XShmPixmapFormat(id->x.disp) == ZPixmap) && -+ (pm == True)) - id->x.shmp = 1; - } - } - } -- else - #endif -- { -- id->x.shm = 0; -- id->x.shmp = 0; -- } -+ - id->cache.on_image = 0; - id->cache.size_image = 0; - id->cache.num_image = 0; -@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams - } - if (p->flags & PARAMS_SHAREDPIXMAPS) - { -- if (id->x.shm) -- id->x.shmp = p->sharedpixmaps; -+ if (!p->sharedpixmaps) -+ id->x.shmp = 0; - } - if (p->flags & PARAMS_PALETTEOVERRIDE) - override = p->paletteoverride; -diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c ---- imlib-1.9.15.orig/Imlib/misc.c 2004-09-21 02:22:59.000000000 +0200 -+++ imlib-1.9.15/Imlib/misc.c 2007-10-28 14:00:23.000000000 +0100 -@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I - id->x.root = DefaultRootWindow(disp); /* the root window id */ - id->x.visual = DefaultVisual(disp, id->x.screen); /* the visual type */ - id->x.depth = DefaultDepth(disp, id->x.screen); /* the depth of the screen in bpp */ -+ -+ id->x.shm = 0; -+ id->x.shmp = 0; -+ id->max_shm = 0; - #ifdef HAVE_SHM - if (XShmQueryExtension(id->x.disp)) - { -@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I - id->x.last_xim = NULL; - id->x.last_sxim = NULL; - id->max_shm = 0x7fffffff; -- if (XShmPixmapFormat(id->x.disp) == ZPixmap) -+ if ((XShmPixmapFormat(id->x.disp) == ZPixmap && -+ (pm == True))) - id->x.shmp = 1; - } - } - } -- else - #endif -- { -- id->x.shm = 0; -- id->x.shmp = 0; -- } -+ - id->cache.on_image = 0; - id->cache.size_image = 0; - id->cache.num_image = 0; -@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I - } - if (p->flags & PARAMS_SHAREDPIXMAPS) - { -- if (id->x.shm) -- id->x.shmp = p->sharedpixmaps; -+ if (!p->sharedpixmaps) -+ id->x.shmp = 0; - } - if (p->flags & PARAMS_PALETTEOVERRIDE) - override = p->paletteoverride; diff --git a/staging/imlib/imlib-1.9.15-libpng15.patch b/staging/imlib/imlib-1.9.15-libpng15.patch deleted file mode 100644 index 7837cd488..000000000 --- a/staging/imlib/imlib-1.9.15-libpng15.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- gdk_imlib/io-png.c -+++ gdk_imlib/io-png.c -@@ -40,13 +40,13 @@ - return NULL; - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; - } - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; -@@ -275,13 +275,13 @@ - return NULL; - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; - } - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; -@@ -301,6 +301,9 @@ - /* Setup Translators */ - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_expand(png_ptr); -+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) -+ png_set_expand(png_ptr); -+ - png_set_strip_16(png_ptr); - png_set_packing(png_ptr); - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) -@@ -440,13 +443,13 @@ - return NULL; - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; - } - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; -@@ -635,7 +638,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - fclose(f); - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); ---- Imlib/load.c -+++ Imlib/load.c -@@ -197,12 +197,12 @@ - png_destroy_read_struct(&png_ptr, NULL, NULL); - return NULL; - } -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; - } -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; -@@ -260,7 +260,8 @@ - png_read_image(png_ptr, lines); - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - ptr = data; -- if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (color_type == PNG_COLOR_TYPE_GRAY -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - { - for (y = 0; y < *h; y++) - { -@@ -285,6 +286,7 @@ - } - } - } -+#if 0 - else if (color_type == PNG_COLOR_TYPE_GRAY) - { - for (y = 0; y < *h; y++) -@@ -300,6 +302,7 @@ - } - } - } -+#endif - else - { - for (y = 0; y < *h; y++) ---- Imlib/save.c -+++ Imlib/save.c -@@ -342,7 +342,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - fclose(f); - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); ---- Imlib/utils.c -+++ Imlib/utils.c -@@ -1981,14 +1981,13 @@ - png_destroy_read_struct(&png_ptr, NULL, NULL); - return NULL; - } -- -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; - } - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; diff --git a/staging/imlib2/PKGBUILD b/staging/imlib2/PKGBUILD deleted file mode 100644 index 33e0b8bca..000000000 --- a/staging/imlib2/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 147170 2012-01-23 21:18:18Z eric $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Arjan Timmerman <arjan.archlinux.org> -# Contributor: Tom Newsom <Jeepster.gmx.co.uk> - -pkgname=imlib2 -pkgver=1.4.5 -pkgrel=2 -pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" -url="http://sourceforge.net/projects/enlightenment/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') -options=('!libtool') -source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") -sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # disable optimizations, they cause problems (e.g. FS#12268) - [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" - [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64" - - # Configure and Build - ./configure --prefix=/usr \ - --sysconfdir=/etc/imlib2 \ - --x-libraries=/usr/lib $EXTRAOPTS - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - # Install License - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD deleted file mode 100644 index b2adc74f2..000000000 --- a/staging/inkscape/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 147200 2012-01-24 06:18:56Z bisson $ -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=inkscape -pkgver=0.48.2 -pkgrel=6 -pkgdesc='Vector graphics editor using the SVG file format' -url='http://inkscape.sourceforge.net/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -makedepends=('boost' 'pkg-config' 'intltool') -depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2' - 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') -optdepends=('pstoedit: latex formulas' - 'texlive-core: latex formulas' - 'python2-numpy: some extensions' - 'python-lxml: some extensions and filters' - 'pyxml: some extensions' - 'uniconvertor: reading/writing to some proprietary formats') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'libpng15.patch') -sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3' - 'd6512f3cb38ca8e2436dc485aa652490d17b3a52') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py - sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py - sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp - sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py - sed -i 's|"python"|"python2"|g' src/main.cpp - - patch -p1 -i ../libpng15.patch - - ./configure --prefix=/usr \ - --with-python \ - --with-perl \ - --without-gnome-vfs \ - --with-xft \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/inkscape/install b/staging/inkscape/install deleted file mode 100644 index 6e803bf1d..000000000 --- a/staging/inkscape/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - - -post_remove() { - post_install -} diff --git a/staging/inkscape/libpng15.patch b/staging/inkscape/libpng15.patch deleted file mode 100644 index e24913ed6..000000000 --- a/staging/inkscape/libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp -+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp -@@ -1443,7 +1443,7 @@ - return NULL; - } - // Set error handler -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return NULL; - } ---- inkscape-0.48.1/src/helper/png-write.cpp -+++ inkscape-0.48.1-mod//src/helper/png-write.cpp -@@ -165,7 +165,7 @@ - /* Set error handling. REQUIRED if you aren't supplying your own - * error hadnling functions in the png_create_write_struct() call. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* If we get here, we had a problem reading the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); ---- inkscape-0.48.1/src/sp-image.cpp -+++ inkscape-0.48.1-mod//src/sp-image.cpp -@@ -386,9 +386,13 @@ - - #if defined(PNG_iCCP_SUPPORTED) - { -- char* name = 0; -+ png_charp name = 0; - int compression_type = 0; -- char* profile = 0; -+#if (PNG_LIBPNG_VER < 10500) -+ png_charp profile = 0; -+#else -+ png_bytep profile = 0; -+#endif - png_uint_32 proflen = 0; - if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { - // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/staging/java7-openjdk/PKGBUILD b/staging/java7-openjdk/PKGBUILD deleted file mode 100644 index b5ab884cb..000000000 --- a/staging/java7-openjdk/PKGBUILD +++ /dev/null @@ -1,346 +0,0 @@ -# $Id: PKGBUILD 147010 2012-01-20 18:19:59Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Guillaume ALAUX <guillaume@archlinux.org> - -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') - # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 -pkgbase=java7-openjdk -_java_ver=7 -_openjdk_build=b147 -_openjdk_date=27_jun_2011 -_icedtea_ver=2.0 -_date=20110922 - -# check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=4d9e4fb8af09 -_HOTSPOT_CHANGESET=b28ae681bae0 -_JAXP_CHANGESET=948e734135ea -_JAXWS_CHANGESET=a2ebfdc9db7e -_JDK_CHANGESET=2054526dd141 -_LANGTOOLS_CHANGESET=9b85f1265346 -_OPENJDK_CHANGESET=0a76e5390e68 - -_bootstrap=0 # 0/1 for quick build or full bootstrap - -pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} -pkgrel=6 -arch=('i686' 'x86_64') -url="http://icedtea.classpath.org" -license=('custom') -options=('!emptydirs') -makedepends=('jdk7-openjdk' 'libxp' 'libxslt' - 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' - 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`? -[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') - -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0 -source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz - ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz - ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz - ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz - ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz - ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz - ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz - ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz - fontconfig-paths.diff - fix_corba_cmds_path.diff - openjdk7_fix_jdk_cmds_path.diff - openjdk7_nonreparenting-wm.diff - jdk7-openjdk.profile - jdk7-openjdk.profile.csh - jre7-openjdk.profile - jre7-openjdk.profile.csh - glibc2_15.diff) -md5sums=('752721a037a625001fad7a5fc2013f60' - '4c34ddf70124ea90c79201c1afede3e3' - '8f8d222d0a6d363d06b40576da5f1ea2' - '4abf34372e34cccd74ad337e487ed790' - 'f2f40590a83889b8aa1d4631b705092d' - 'd3beed0118bbd93d4651af762eb748c7' - 'c8617700b4bd6cd5de1257bc36509bed' - 'f10b711b0c784df8707808d9d0f52abd' - 'ee1afda124d5927345014ab382ef581e' - 'f7e7a212e50abb56a6ef1a2b1bd27405' - 'c195c4865b84d9e2e0fd71ac6d88eadb' - '203640d6e79e41b0065e016818c17ccd' - 'b7b8996448c7b4fa7dd2d744488ed3bd' - 'cdabafad0ec413d9a983888bf445a443' - '612b0fec7e0943c37a6de77c43622007' - '62443459da0cb28181feb260dc0e5ce7' - 'a4293acadff03bdccbc9b412ad288549') - -#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip - -noextract=("${_OPENJDK_CHANGESET}.tar.gz" - "${_CORBA_CHANGESET}.tar.gz" - "${_JAXP_CHANGESET}.tar.gz" - "${_JAXWS_CHANGESET}.tar.gz" - "${_JDK_CHANGESET}.tar.gz" - "${_LANGTOOLS_CHANGESET}.tar.gz" - "${_HOTSPOT_CHANGESET}.tar.gz") - - _jvmdir=/usr/lib/jvm/java-7-openjdk - - [ "$CARCH" = "x86_64" ] && _JARCH=amd64 - [ "$CARCH" = "i686" ] && _JARCH=i386 - -build() { - cd "${srcdir}/icedtea-${_icedtea_ver}" - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - # default is to build with first found java-environment found in our repos - is jdk7-openjdk - [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh - - unset MAKEFLAGS # parallel build is currently broken - export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" - export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" - - . /etc/profile.d/apache-ant.sh - - cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/glibc2_15.diff" - - if [ "$_bootstrap" = "1" ]; then - BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" - else - BOOTSTRAPOPT="--disable-bootstrap" - fi - - ./configure \ - $BOOTSTRAPOPT \ - --with-parallel-jobs="${MAKEFLAGS/-j}" \ - --disable-tests \ - --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \ - --with-jdk-home=${JAVA_HOME} \ - --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ - --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ - --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ - --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \ - --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \ - --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ - --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ - --enable-pulse-java \ - --enable-nss \ - --with-rhino - #--help - -# --enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed - - make -} - -check() { - cd "${srcdir}/icedtea-${_icedtea_ver}" - make -k check -} - -package_jre7-openjdk-headless() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs" - depends=('libjpeg-turbo' 'lcms2' 'nss' - 'ca-certificates-java' 'rhino') - optdepends=('libcups: needed for Java Mauve support - libmawt.so' - 'fontconfig: needed for Java Mauve support - libmawt.so') - provides=('java-runtime=7') - conflicts=('java-runtime' 'openjdk6') - # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos - backup=(etc/profile.d/jre.sh - etc/profile.d/jre.csh - etc/java-7-openjdk/calendars.properties - etc/java-7-openjdk/content-types.properties - etc/java-7-openjdk/cursors/cursors.properties - etc/java-7-openjdk/flavormap.properties - etc/java-7-openjdk/fontconfig.bfc - etc/java-7-openjdk/fontconfig.properties - etc/java-7-openjdk/jvm.cfg - etc/java-7-openjdk/logging.properties - etc/java-7-openjdk/management/jmxremote.access - etc/java-7-openjdk/management/jmxremote.password - etc/java-7-openjdk/management/management.properties - etc/java-7-openjdk/management/snmp.acl - etc/java-7-openjdk/net.properties - etc/java-7-openjdk/psfont.properties.ja - etc/java-7-openjdk/psfontj2d.properties - etc/java-7-openjdk/security/java.policy - etc/java-7-openjdk/security/java.security - etc/java-7-openjdk/security/nss.cfg - etc/java-7-openjdk/sound.properties - etc/java-7-openjdk/tz.properties) - install=jre7-openjdk-headless.install - - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" - - mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties - mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc - rm -f lib/fontconfig.*.bfc - rm -f lib/fontconfig.*.properties.src - rm -f lib/fontconfig.properties.src - - install -d -m755 ${pkgdir}/${_jvmdir}/jre/ - cp -a bin lib ${pkgdir}/${_jvmdir}/jre - - # Install man pages - pushd ../../j2re-image/man - install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/ - install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1 - install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1 - popd - - # more files that belong to the desktop package - mkdir ${srcdir}/tmp-desktop-jre - for file in \ - "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \ - "/usr/share/man/ja/man1/policytool.1" \ - "/usr/share/man/man1/policytool.1"; do - dirname=`dirname $file` - install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true - # mv file from fakeinstall to pkgdir - mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file - done - rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt - - # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin - install -m755 -d ${pkgdir}/usr/bin/ - for file in *; do - ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin - done - popd - - # Link JKS keystore from ca-certificates-java - rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" - - # Set some variables - install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh - install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh - - # Install license - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ - install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ - ${pkgdir}/usr/share/licenses/${pkgbase} - - # Put some more files under backup control - install -m755 -d ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ - # install dummy links to make them found by JAVA - cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/ - for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do - ln -vsf /etc/java-7-openjdk/`basename $file` . - done - # some more - install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security} - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/ - ln -vsf /etc/java-7-openjdk/cursors/cursors.properties . - popd - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management - ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} . - popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security - ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} . - popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/ - ln -vsf /etc/java-7-openjdk/jvm.cfg . - popd -} - -package_jre7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs" - depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme') - optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' - 'alsa-lib: for basic sound support' - 'giflib: for gif format support' - 'libpulse: for advanced sound support' - 'gtk2: for the Gtk+ look and feel - desktop usage') - install=jre7-openjdk.install - conflicts=('openjdk6') - - mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} - # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin - install -m755 -d ${pkgdir}/usr/bin/ - for file in *; do - ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin - done - popd - - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" - - # Install icons and menu entries - for s in 16 24 32 48 ; do - install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/ - install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ - ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png - done - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications -} - -package_jdk7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK" - depends=('jre7-openjdk') - provides=('java-environment=7') - conflicts=('java-environment') - # replaces=('openjdk6') - backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh) - - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" - - # Main files - install -m755 -d ${pkgdir}/${_jvmdir}/ - - cp -a demo include lib sample ${pkgdir}/${_jvmdir} - - # 'bin' files - pushd bin - install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ - ${pkgdir}/usr/bin/ \ - ${pkgdir}/usr/share/man/{,ja/}man1/ - - # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page - for b in $(ls | grep -v java-rmi.cgi); do - if [ -e ../jre/bin/${b} ]; then - # Provide a link of the jre binary in the jdk/bin/ directory - ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} - else - # Copy binary to jdk/bin/ - install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} - # Copy man page - install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 - install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 - # Link from /bin/ - ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b} - fi - done - popd - - # Handling 'java-rmi.cgi' separately - install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi - - # Set some variables - install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh - install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh -} - -package_openjdk7-src() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" - - install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ - ${pkgdir}/${_jvmdir}/src.zip -} diff --git a/staging/java7-openjdk/fix_corba_cmds_path.diff b/staging/java7-openjdk/fix_corba_cmds_path.diff deleted file mode 100644 index 842657880..000000000 --- a/staging/java7-openjdk/fix_corba_cmds_path.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -86,10 +86,10 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio --CUT = $(UTILS_USR_BIN_PATH)cut -+CUT = $(UTILS_COMMAND_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df - DIFF = $(UTILS_USR_BIN_PATH)diff -@@ -136,7 +136,7 @@ - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test - TOUCH = $(UTILS_COMMAND_PATH)touch --TR = $(UTILS_USR_BIN_PATH)tr -+TR = $(UTILS_COMMAND_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq -@@ -186,7 +186,7 @@ - # others have it in /usr/bin. - SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/staging/java7-openjdk/fontconfig-paths.diff b/staging/java7-openjdk/fontconfig-paths.diff deleted file mode 100644 index fa08db629..000000000 --- a/staging/java7-openjdk/fontconfig-paths.diff +++ /dev/null @@ -1,134 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 -+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 -@@ -275,73 +275,61 @@ - - # Font File Names - --filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf --filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf --filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf --filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf -- --filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf --filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf --filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf --filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf -- --filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf --filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf --filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf --filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf -- --filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf -- --filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf --filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf --filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf --filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf --filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf --filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf --filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf --filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf --filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf --filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf --filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf --filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf --filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf -- --filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf --filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf --filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf --filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf --#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf --filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf --filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf --filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf --filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf --filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf -- --filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf --filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf --filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf --filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf --filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf --filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf --filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf --filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf --filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf --filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf --filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf --filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf -- --# AWT X11 font paths --awtfontpath.latin-1=/usr/share/fonts/X11/Type1 --awtfontpath.umingcn=/usr/share/fonts/truetype/arphic --awtfontpath.uminghk=/usr/share/fonts/truetype/arphic --awtfontpath.umingtw=/usr/share/fonts/truetype/arphic --awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic --awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy --awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi --awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami --awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic --awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk --awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts -+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf -+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf -+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf -+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf -+ -+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf -+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf -+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf -+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf -+ -+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf -+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf -+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf -+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf -+ -+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf -+ -+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf -+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf -+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf -+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf -+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf -+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf -+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf -+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf -+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf -+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf -+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf -+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf -+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf -+ -+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf -+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf -+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf -+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf -+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf -+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf -+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf -+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf -+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf -+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf -+ -+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf -+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf -+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf -+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf -+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf -+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf -+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf -+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf -+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf -+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf -+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf -+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf -+ diff --git a/staging/java7-openjdk/glibc2_15.diff b/staging/java7-openjdk/glibc2_15.diff deleted file mode 100644 index c2fd6124b..000000000 --- a/staging/java7-openjdk/glibc2_15.diff +++ /dev/null @@ -1,232 +0,0 @@ - -# HG changeset patch -# User never -# Date 1319555835 25200 -# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28 -# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926 -7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc -Reviewed-by: never -Contributed-by: Omair Majid <omajid@redhat.com> - ---- openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -33,8 +33,6 @@ - #include "opto/subnode.hpp" - - // Portions of code courtesy of Clifford Click -- --#define MAXFLOAT ((float)3.40282346638528860e+38) - - // Classic Add functionality. This covers all the usual 'add' behaviors for - // an algebraic ring. Add-integer, add-float, add-double, and binary-or are ---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -107,7 +107,7 @@ extern "C" { - if (env != xenv) { \ - NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ - } \ -- __ENTRY(result_type, header, thr) -+ VM_ENTRY_BASE(result_type, header, thr) - - - #define UNCHECKED() (unchecked_jni_NativeInterface) ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 08:17:15 2011 -0700 -@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text - <xsl:value-of select="$space"/> - <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> - <xsl:value-of select="$space"/> -- <xsl:text>__ENTRY(jvmtiError, </xsl:text> -+ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> - <xsl:apply-templates select="." mode="functionid"/> - <xsl:text> , current_thread)</xsl:text> - <xsl:value-of select="$space"/> ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread - // from native so as to resolve the jthread. - - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) -+ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - oop thread_oop = JNIHandles::resolve_external_guard(thread); ---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM - JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); - // transition code: native to VM - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) -+ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); ---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700 -@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj - } - }; - --// InterfaceSupport provides functionality used by the __LEAF and __ENTRY --// macros. These macros are used to guard entry points into the VM and --// perform checks upon leave of the VM. -+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and -+// VM_ENTRY_BASE macros. These macros are used to guard entry points into -+// the VM and perform checks upon leave of the VM. - - - class InterfaceSupport: AllStatic { -@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H - - // LEAF routines do not lock, GC or throw exceptions - --#define __LEAF(result_type, header) \ -+#define VM_LEAF_BASE(result_type, header) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - /* begin of body */ -@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H - - // ENTRY routines may lock, GC and throw exceptions - --#define __ENTRY(result_type, header, thread) \ -+#define VM_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - HandleMarkCleaner __hm(thread); \ - Thread* THREAD = thread; \ -@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H - - // QUICK_ENTRY routines behave like ENTRY but without a handle mark - --#define __QUICK_ENTRY(result_type, header, thread) \ -+#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - Thread* THREAD = thread; \ -@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H - #define IRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define IRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(No_Safepoint_Verifier __nspv(true);) - - - #define IRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Another special case for nmethod_entry_point so the nmethod that the -@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H - result_type header { \ - nmethodLocker _nmlock(nm); \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - #define IRT_END } - -@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H - #define JRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define JRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(JRT_Leaf_Verifier __jlv;) - - - #define JRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Same as JRT Entry but allows for return value after the safepoint -@@ -543,11 +543,11 @@ extern "C" { - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - // Ensure that the VMNativeEntryWrapper constructor, which can cause --// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY). -+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE). - #define JNI_QUICK_ENTRY(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ -@@ -555,7 +555,7 @@ extern "C" { - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JNI_LEAF(result_type, header) \ -@@ -563,7 +563,7 @@ extern "C" { - result_type JNICALL header { \ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - // Close the routine and the extern "C" -@@ -579,7 +579,7 @@ extern "C" { - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_ENTRY_NO_ENV(result_type, header) \ -@@ -588,7 +588,7 @@ extern "C" { - JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_QUICK_ENTRY(result_type, header) \ -@@ -597,14 +597,14 @@ extern "C" { - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JVM_LEAF(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ - VM_Exit::block_if_vm_exited(); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - #define JVM_END } } - diff --git a/staging/java7-openjdk/jdk7-openjdk.profile b/staging/java7-openjdk/jdk7-openjdk.profile deleted file mode 100644 index 91265cc86..000000000 --- a/staging/java7-openjdk/jdk7-openjdk.profile +++ /dev/null @@ -1,6 +0,0 @@ -export J2SDKDIR=/usr/lib/jvm/java-7-openjdk -export J2REDIR=$J2SDKDIR/jre -export JAVA_HOME=/usr/lib/jvm/java-7-openjdk - -# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' -# in /etc/profile.d/jre7.sh diff --git a/staging/java7-openjdk/jdk7-openjdk.profile.csh b/staging/java7-openjdk/jdk7-openjdk.profile.csh deleted file mode 100644 index cc7dc8ab1..000000000 --- a/staging/java7-openjdk/jdk7-openjdk.profile.csh +++ /dev/null @@ -1 +0,0 @@ -setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/staging/java7-openjdk/jre7-openjdk-headless.install b/staging/java7-openjdk/jre7-openjdk-headless.install deleted file mode 100644 index 45f52fe32..000000000 --- a/staging/java7-openjdk/jre7-openjdk-headless.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi -} - -post_upgrade() { - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi -} - -#post_remove() { -# -#} diff --git a/staging/java7-openjdk/jre7-openjdk.install b/staging/java7-openjdk/jre7-openjdk.install deleted file mode 100644 index d98e79ec5..000000000 --- a/staging/java7-openjdk/jre7-openjdk.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - echo "when you use a non-reparenting window manager" - echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/jre.sh" -# update-desktop-database -q -} - -post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -# update-desktop-database -q -} - - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -# update-desktop-database -q -} diff --git a/staging/java7-openjdk/jre7-openjdk.profile b/staging/java7-openjdk/jre7-openjdk.profile deleted file mode 100644 index c86ce857a..000000000 --- a/staging/java7-openjdk/jre7-openjdk.profile +++ /dev/null @@ -1,5 +0,0 @@ -export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre -export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} - -# enable this for non-reparenting window managers -#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/staging/java7-openjdk/jre7-openjdk.profile.csh b/staging/java7-openjdk/jre7-openjdk.profile.csh deleted file mode 100644 index a9aed27d1..000000000 --- a/staging/java7-openjdk/jre7-openjdk.profile.csh +++ /dev/null @@ -1,5 +0,0 @@ -setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" -setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" - -# enable this for non-reparenting window managers -#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/staging/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/staging/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff deleted file mode 100644 index c68bd4441..000000000 --- a/staging/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,10 +91,10 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio --CUT = $(UTILS_USR_BIN_PATH)cut -+CUT = $(UTILS_COMMAND_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df - DIFF = $(UTILS_USR_BIN_PATH)diff -@@ -141,7 +141,7 @@ - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test - TOUCH = $(UTILS_COMMAND_PATH)touch --TR = $(UTILS_USR_BIN_PATH)tr -+TR = $(UTILS_COMMAND_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq diff --git a/staging/java7-openjdk/openjdk7_nonreparenting-wm.diff b/staging/java7-openjdk/openjdk7_nonreparenting-wm.diff deleted file mode 100644 index ba1a588e1..000000000 --- a/staging/java7-openjdk/openjdk7_nonreparenting-wm.diff +++ /dev/null @@ -1,58 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 -@@ -102,7 +102,8 @@ - METACITY_WM = 11, - COMPIZ_WM = 12, - LG3D_WM = 13, -- MUTTER_WM = 14; -+ MUTTER_WM = 14, -+ OTHER_NONREPARENTING_WM = 15; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -576,7 +577,7 @@ - // TODO: according to wikipedia, compiz is now reparenting. This should - // probably be updated. - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -762,9 +763,17 @@ - * supports WIN or _NET wm spec. - */ - else if (l_net_protocol.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } else if (win.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } - /* - * Check for legacy WMs. -@@ -775,6 +784,8 @@ - awt_wmgr = XWM.MOTIF_WM; - } else if (isOpenLook()) { - awt_wmgr = XWM.OPENLOOK_WM; -+ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; - } else { - awt_wmgr = XWM.OTHER_WM; - } -@@ -1289,6 +1300,7 @@ - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD deleted file mode 100644 index a1b5b44c1..000000000 --- a/staging/kdebase-workspace/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 147708 2012-01-27 10:22:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdebase-workspace -_pkgname=kde-workspace -pkgver=4.8.0 -pkgrel=2 -pkgdesc="KDE Base Workspace" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde') -# note on libxdamage: -# not detected by namcap because libgl depends on it -# but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' - 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' - 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' - 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst') -makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') -optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' - 'kdebase-kinfocenter') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' - 'kdebase-kinfocenter') -install="${pkgname}.install" -backup=('usr/share/config/kdm/kdmrc' - 'etc/pam.d/kde' - 'etc/pam.d/kde-np' - 'etc/pam.d/kscreensaver') -options=('emptydirs') -source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" - 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5' - '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - 'e4198a443703f749b58a4fec88362fced1b45789' - '264e395c2c44cdda5a242c6dee649afab44cd6e5' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') - -build() { - cd "${srcdir}"/${_pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/kdm-xinitrd.patch - patch -p0 -i "${srcdir}"/fixpath.patch - patch -p0 -i "${srcdir}"/terminate-server.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF \ - -DWITH_libgps=OFF \ - -DWITH_OpenGLES=ON \ - -DKWIN_BUILD_WITH_OPENGLES=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm - install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde - install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np - install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver - install -d -m755 "${pkgdir}"/usr/share/xsessions/ - ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ - install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} - - install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm -} diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch deleted file mode 100644 index be2b8383e..000000000 --- a/staging/kdebase-workspace/fixpath.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 -+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 -@@ -34,22 +34,6 @@ - MALLOC_CHECK_=2 - export MALLOC_CHECK_ - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`$bindir/kde4-config --qt-binaries` -- if [ -n "$qbindir" ]; then -- case $PATH in -- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; -- *) PATH=$qbindir:$PATH; export PATH;; -- esac -- fi -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --fi -- - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -206,7 +190,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --libpath=`kde4-config --path lib | tr : '\n'` -+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') - - for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam deleted file mode 100644 index dfedb8edf..000000000 --- a/staging/kdebase-workspace/kde-np.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth required pam_nologin.so -auth required pam_permit.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam deleted file mode 100644 index 9ec074d06..000000000 --- a/staging/kdebase-workspace/kde.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install deleted file mode 100644 index f7d6d305b..000000000 --- a/staging/kdebase-workspace/kdebase-workspace.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - groupadd -g 135 kdm &>/dev/null - useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null - getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_remove() { - if getent passwd kdm >/dev/null 2>&1; then - userdel kdm - fi - if getent group kdm >/dev/null 2>&1; then - groupdel kdm - fi - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm deleted file mode 100644 index 799d58f4b..000000000 --- a/staging/kdebase-workspace/kdm +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/kdm) -case "$1" in - start) - stat_busy "Starting KDE Desktop Manager" - [ -z "$PID" ] && /usr/bin/kdm &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon kdm - stat_done - fi - ;; - stop) - stat_busy "Stopping KDE Desktop Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kdm - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch deleted file mode 100644 index f5fc0e571..000000000 --- a/staging/kdebase-workspace/kdm-xinitrd.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 -+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 -@@ -742,6 +742,15 @@ - "[ -f /etc/xprofile ] && . /etc/xprofile\n" - "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" - "\n" -+"# run all system xinitrc shell scripts.\n" -+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" -+" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" -+" if [ -x \"$i\" ]; then\n" -+" . \"$i\"\n" -+" fi\n" -+" done\n" -+"fi\n" -+"\n" - "if [ -d /etc/X11/Xresources ]; then\n" - " for i in /etc/X11/Xresources/*; do\n" - " [ -f $i ] && xrdb -merge $i\n" diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam deleted file mode 100644 index b4d80c21f..000000000 --- a/staging/kdebase-workspace/kscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix_auth.so diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch deleted file mode 100644 index 094591317..000000000 --- a/staging/kdebase-workspace/terminate-server.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 -+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 -@@ -1448,7 +1448,7 @@ - - Key: TerminateServer - Type: bool --Default: false -+Default: true - User: core - Instance: #:*/! - Merge: xdm diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD deleted file mode 100644 index 0ee312673..000000000 --- a/staging/kdegraphics-okular/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 147710 2012-01-27 10:23:39Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-okular -pkgver=4.8.0 -pkgrel=2 -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=('cmake' 'automoc4') -optdepends=('kdegraphics-mobipocket: mobipocket support') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c') - -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/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdegraphics-okular/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/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD deleted file mode 100644 index 617716c8a..000000000 --- a/staging/kdegraphics-strigi-analyzer/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 147712 2012-01-27 10:35:31Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-strigi-analyzer -pkgver=4.8.0 -pkgrel=2 -pkgdesc="Strigi analyzers for various graphics file formats" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -replaces=('kdegraphics-libs') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9c607105f30c13e83fac3430649696a19e1c4d7b') - -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/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD deleted file mode 100644 index 36452a1cb..000000000 --- a/staging/kdelibs/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 147665 2012-01-26 07:10:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdelibs -pkgver=4.8.0 -pkgrel=2 -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/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch deleted file mode 100644 index 546784fa2..000000000 --- a/staging/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/staging/kdelibs/fix-knotify-filepath.patch b/staging/kdelibs/fix-knotify-filepath.patch deleted file mode 100644 index 2cd995e97..000000000 --- a/staging/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/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch deleted file mode 100644 index 4b513298a..000000000 --- a/staging/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/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch deleted file mode 100644 index bdcd39a6c..000000000 --- a/staging/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/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install deleted file mode 100644 index c77e68041..000000000 --- a/staging/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/staging/kdelibs3/PKGBUILD b/staging/kdelibs3/PKGBUILD deleted file mode 100644 index e59d262b1..000000000 --- a/staging/kdelibs3/PKGBUILD +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 146921 2012-01-19 08:17:01Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kdelibs3 -pkgver=3.5.10 -pkgrel=12 -pkgdesc='KDE3 Core Libraries' -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' - 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') -makedepends=('cups' 'hspell') -optdepends=('hspell: for Hebrew spell-checking support') -options=('libtool') -install=kdelibs3.install -source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2" - 'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz' - 'acinclude.patch' - 'kde3.profile' - 'kde4-compatibility.patch' - 'kconf_updaterc' - 'openssl.patch' - 'kdelibs3-missing-include.patch') -sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' - 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' - '50c9de71b102507fb78b192ecc22a5fc3e031bc3' - 'fbd6e773edf3e8bb8e1272629984025e041da2ca' - '5fbbf7a5e2032878815fa055bfb5020f478d2b25' - '35e56fe4c5f71685e64b13f448dcacc620166e06' - '50e92950498463defb9149ffcf8cbc2e8cd1063b' - 'e5f5b8c060a2db9cedb82bf18caadfa869921779') - -build() { - cd "$srcdir"/kdelibs-${pkgver} - - . /etc/profile.d/qt3.sh - . "$srcdir"/kde3.profile - - patch -p0 -i "$srcdir"/kde-3.5-1074156.patch - patch -p1 -i "$srcdir"/acinclude.patch - patch -p1 -i "$srcdir"/kde4-compatibility.patch - patch -p1 -i "${srcdir}"/openssl.patch - patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch - - sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh - make -f admin/Makefile.common cvs - - ./configure --prefix=/opt/kde \ - --with-distribution='Arch Linux' \ - --with-alsa \ - --disable-debug \ - --disable-dnssd \ - --disable-dnotify \ - --enable-inotify \ - --enable-sendfile \ - --without-lua \ - --with-hspell \ - --enable-gcc-hidden-visibility \ - --enable-final \ - --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \ - --without-arts \ - --disable-libfam - make -} - -package() { - cd "$srcdir"/kdelibs-${pkgver} - - make DESTDIR="$pkgdir" install - - # disable broken kconf_update by default - install -D -m644 "$srcdir"/kconf_updaterc \ - "$pkgdir"/opt/kde/share/config/kconf_updaterc - - # install KDE3 profile - install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh - # make KDE3 styles available to Qt3 - install -d -m755 "$pkgdir"/opt/qt/plugins - ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles - - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - - # we don't have khelpcenter anyway - rm -rf "$pkgdir"/opt/kde/share/doc - - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf -} diff --git a/staging/kdelibs3/acinclude.patch b/staging/kdelibs3/acinclude.patch deleted file mode 100644 index 0610d6df5..000000000 --- a/staging/kdelibs3/acinclude.patch +++ /dev/null @@ -1,66 +0,0 @@ -2009-12-10 Stepan Kasal <skasal@redhat.com> - -The change of implementation of AC_REQUIRE in 2.64 caused a regression -in the arts project. -This can be fixed by shuffling some macro calls. - -I suppose that most of this patch will not be needed with a future -release of Autoconf. -But the last chunk of this patch is a real bug in this source and -should go upstream. - ---- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200 -+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100 -@@ -3081,8 +3081,18 @@ - fi - ]) - -+AC_DEFUN([AC_CHECK_COMPILERS_CC], -+[ -+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -+ CFLAGS=" $CFLAGS" -+ AC_PROG_CC -+ CXXFLAGS=" $CXXFLAGS" -+ AC_PROG_CXX -+]) -+ - AC_DEFUN([AC_CHECK_COMPILERS], - [ -+ AC_REQUIRE([AC_CHECK_COMPILERS_CC]) - AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), - [ -@@ -3141,11 +3151,6 @@ - [kde_use_profiling="no"] - ) - -- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -- CFLAGS=" $CFLAGS" -- -- AC_PROG_CC -- - AC_PROG_CPP - - if test "$GCC" = "yes"; then -@@ -3174,10 +3179,6 @@ - LDFLAGS="" - fi - -- CXXFLAGS=" $CXXFLAGS" -- -- AC_PROG_CXX -- - KDE_CHECK_FOR_BAD_COMPILER - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then -@@ -3503,8 +3504,8 @@ - AC_REQUIRE([AC_LIBTOOL_DLOPEN]) - AC_REQUIRE([KDE_CHECK_LIB64]) - --AC_OBJEXT --AC_EXEEXT -+AC_REQUIRE([AC_OBJEXT]) -+AC_REQUIRE([AC_EXEEXT]) - - AM_PROG_LIBTOOL - AC_LIBTOOL_CXX diff --git a/staging/kdelibs3/kconf_updaterc b/staging/kdelibs3/kconf_updaterc deleted file mode 100644 index 24c2623fb..000000000 --- a/staging/kdelibs3/kconf_updaterc +++ /dev/null @@ -1,2 +0,0 @@ -updateInfoAdded=false -autoUpdateDisabled=true diff --git a/staging/kdelibs3/kde3.profile b/staging/kdelibs3/kde3.profile deleted file mode 100755 index ef09631ff..000000000 --- a/staging/kdelibs3/kde3.profile +++ /dev/null @@ -1,6 +0,0 @@ -export PATH=$PATH:/opt/kde/bin -if [ ! -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share -else - export XDG_DATA_DIRS=/opt/kde/share -fi diff --git a/staging/kdelibs3/kde4-compatibility.patch b/staging/kdelibs3/kde4-compatibility.patch deleted file mode 100644 index 129c314ae..000000000 --- a/staging/kdelibs3/kde4-compatibility.patch +++ /dev/null @@ -1,1012 +0,0 @@ -diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp ---- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 -+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp 2009-08-06 06:18:06.000000000 +0200 -@@ -158,7 +158,7 @@ - int i = 0; - - // argument 0 has to be drkonqi -- argv[i++] = "drkonqi"; -+ argv[i++] = "/usr/lib/kde4/libexec/drkonqi"; - - #if defined Q_WS_X11 - // start up on the correct display -@@ -325,7 +325,7 @@ - _exit(253); - if(!geteuid() && setuid(getuid()) < 0) - _exit(253); -- execvp("drkonqi", const_cast< char** >( argv )); -+ execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv )); - _exit(errno); - } - else -diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am ---- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 17:06:29.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/Makefile.am 2009-08-06 06:21:37.000000000 +0200 -@@ -58,7 +58,7 @@ - servicetype_DATA = kdedmodule.desktop - servicetypedir = $(kde_servicetypesdir) - --xdg_menu_DATA = applications.menu -+xdg_menu_DATA = kde-applications.menu - - update_DATA = kded.upd - updatedir = $(kde_datadir)/kconf_update -diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in ---- kdelibs-3.5.10/kded/Makefile.in 2008-08-20 18:05:57.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/Makefile.in 2009-08-06 06:22:19.000000000 +0200 -@@ -535,7 +535,7 @@ - - servicetype_DATA = kdedmodule.desktop - servicetypedir = $(kde_servicetypesdir) --xdg_menu_DATA = applications.menu -+xdg_menu_DATA = kde-applications.menu - update_DATA = kded.upd - updatedir = $(kde_datadir)/kconf_update - #>- all: all-am -@@ -1173,7 +1173,7 @@ - -rm -f kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc - - #>+ 2 --KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am -+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am - - #>+ 2 - docs-am: -diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu ---- kdelibs-3.5.10/kded/applications.menu 2005-09-10 10:27:40.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 -@@ -1,469 +0,0 @@ -- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" -- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> -- --<Menu> -- <Name>Applications</Name> -- <Directory>kde-main.directory</Directory> -- <!-- Search the default locations --> -- <KDELegacyDirs/> -- <DefaultAppDirs/> -- <DefaultDirectoryDirs/> -- <DefaultLayout> -- <Merge type="menus"/> -- <Merge type="files"/> -- <Separator/> -- <Menuname>More</Menuname> -- </DefaultLayout> -- <Layout> -- <Merge type="menus"/> -- <Menuname>Applications</Menuname> -- <Merge type="files"/> -- </Layout> -- -- <Menu> -- <Name>Applications</Name> -- <Directory>kde-unknown.directory</Directory> -- <OnlyUnallocated/> -- <Include> -- <Not> -- <!-- Don't list non-KDE core applications --> -- <And> -- <Category>Core</Category> -- <Not><Category>KDE</Category></Not> -- </And> -- <!-- Don't list SUSE's YaST in here --> -- <Category>X-SuSE-YaST</Category> -- </Not> -- </Include> -- </Menu> -- <Menu> -- <Name>Development</Name> -- <Directory>kde-development.directory</Directory> -- <Menu> -- <Name>X-KDE-KDevelopIDE</Name> -- <Directory>kde-development-kdevelop.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>X-KDE-KDevelopIDE</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Translation</Name> -- <Directory>kde-development-translation.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>Translation</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Web Development</Name> -- <Directory>kde-development-webdevelopment.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>WebDevelopment</Category> -- </And> -- </Include> -- </Menu> -- <Include> -- <And> -- <Category>Development</Category> -- <Not><Category>X-KDE-KDevelopIDE</Category></Not> -- <Not><Category>Translation</Category></Not> -- <Not><Category>WebDevelopment</Category></Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Science</Name> -- <Directory>kde-science.directory</Directory> -- <Include> -- <And><!-- Include /any/ Science app which is not an Education app --> -- <Or> -- <Category>Astronomy</Category> -- <Category>Biology</Category> -- <Category>Chemistry</Category> -- <Category>Geology</Category> -- <Category>MedicalSoftware</Category> -- <Category>Physics</Category> -- <Category>Math</Category> -- <Category>Science</Category> -- </Or> -- <Not><Category>Education</Category></Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Edutainment</Name> -- <Directory>kde-edutainment.directory</Directory> -- <Menu> -- <Name>Languages</Name> -- <Directory>kde-edu-languages.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Or> -- <Category>Languages</Category> -- <Category>X-KDE-Edu-Language</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Mathematics</Name> -- <Directory>kde-edu-mathematics.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Category>Math</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Miscellaneous</Name> -- <Directory>kde-edu-miscellaneous.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Not> -- <Category>Languages</Category> -- <Category>X-KDE-Edu-Language</Category> -- <Category>Math</Category> -- <Category>Science</Category> -- <Category>Teaching</Category> -- <Category>X-KDE-Edu-Teaching</Category> -- </Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Science</Name> -- <Directory>kde-edu-science.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Category>Science</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Tools</Name> -- <Directory>kde-edu-tools.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Or> -- <Category>Teaching</Category> -- <Category>X-KDE-Edu-Teaching</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Games</Name> -- <Directory>kde-games.directory</Directory> -- <Menu> -- <Name>Arcade</Name> -- <Directory>kde-games-arcade.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>ArcadeGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Board</Name> -- <Directory>kde-games-board.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>BoardGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Card</Name> -- <Directory>kde-games-card.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>CardGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Kidsgames</Name> -- <Directory>kde-games-kids.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Or> -- <Category>X-KDE-KidsGame</Category> -- <Category>KidsGame</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>TacticStrategy</Name> -- <Directory>kde-games-strategy.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>StrategyGame</Category> -- </And> -- </Include> -- </Menu> -- <Include> -- <And> -- <Category>Game</Category> -- <Not> -- <Category>ArcadeGame</Category> -- <Category>BoardGame</Category> -- <Category>CardGame</Category> -- <Category>X-KDE-KidsGame</Category> -- <Category>KidsGame</Category> -- <Category>StrategyGame</Category> -- </Not> -- </And> -- </Include> -- <Menu> -- <Name>Toys</Name> -- <Directory>kde-toys.directory</Directory> -- <Include> -- <Category>Amusement</Category> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Graphics</Name> -- <Directory>kde-graphics.directory</Directory> -- <Include> -- <And> -- <Category>Graphics</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Graphics</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Internet</Name> -- <Directory>kde-internet.directory</Directory> -- <Include> -- <And> -- <Category>Network</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>Terminal</Name> -- <Directory>kde-internet-terminal.directory</Directory> -- </Menu> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Network</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Multimedia</Name> -- <Directory>kde-multimedia.directory</Directory> -- <Include> -- <And> -- <Category>AudioVideo</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>AudioVideo</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Office</Name> -- <Directory>kde-office.directory</Directory> -- <Layout> -- <Merge type="menus"/> -- <Filename>kde-koshell.desktop</Filename> -- <Filename>kde-Kontact.desktop</Filename> -- <Separator/> -- <Filename>kde-kword.desktop</Filename> -- <Filename>kde-kspread.desktop</Filename> -- <Filename>kde-kpresenter.desktop</Filename> -- <Merge type="files"/> -- <Separator/> -- <Menuname>More</Menuname> -- </Layout> -- <Include> -- <And> -- <Category>Office</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Office</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Settingsmenu</Name> -- <Directory>kde-settingsmenu.directory</Directory> -- <Include> -- <Category>Settings</Category> -- </Include> -- </Menu> -- <Menu> -- <Name>System</Name> -- <Directory>kde-system.directory</Directory> -- <Include> -- <And> -- <Category>System</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>System</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>ScreenSavers</Name> -- <Directory>kde-system-screensavers.directory</Directory> -- </Menu> -- <Menu> -- <Name>Terminal</Name> -- <Directory>kde-system-terminal.directory</Directory> -- </Menu> -- </Menu> -- <Menu> -- <Name>Utilities</Name> -- <Directory>kde-utilities.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Not><Category>Accessibility</Category></Not> -- <Not><Category>X-KDE-Utilities-Desktop</Category></Not> -- <Not><Category>X-KDE-Utilities-File</Category></Not> -- <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> -- <Not><Category>X-KDE-Utilities-PIM</Category></Not> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>Accessibility</Name> -- <Directory>kde-utilities-accessibility.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>Accessibility</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Desktop</Name> -- <Directory>kde-utilities-desktop.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-Desktop</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Editors</Name> -- <Directory>kde-editors.directory</Directory> -- <Include> -- <Category>TextEditor</Category> -- </Include> -- </Menu> -- <Menu> -- <Name>File</Name> -- <Directory>kde-utilities-file.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-File</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Peripherals</Name> -- <Directory>kde-utilities-peripherals.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-Peripherals</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>PIM</Name> -- <Directory>kde-utilities-pim.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-PIM</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>XUtilities</Name> -- <Directory>kde-utilities-xutils.directory</Directory> -- </Menu> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Include> -- <And> -- <Category>KDE</Category> -- <Category>Core</Category> -- </And> -- </Include> -- <DefaultMergeDirs/> -- <MergeFile>applications-kmenuedit.menu</MergeFile> --</Menu> -diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp ---- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 09:52:43.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp 2009-08-06 06:23:48.000000000 +0200 -@@ -379,7 +379,7 @@ - connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), - this, SLOT(slotCreateEntry(const QString &, KService **))); - -- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); -+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); - - KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); - entry->setLayoutInfo(kdeMenu->layoutList); -diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu ---- kdelibs-3.5.10/kded/kde-applications.menu 1970-01-01 01:00:00.000000000 +0100 -+++ kdelibs-3.5.10.new/kded/kde-applications.menu 2005-09-10 10:27:40.000000000 +0200 -@@ -0,0 +1,469 @@ -+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" -+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> -+ -+<Menu> -+ <Name>Applications</Name> -+ <Directory>kde-main.directory</Directory> -+ <!-- Search the default locations --> -+ <KDELegacyDirs/> -+ <DefaultAppDirs/> -+ <DefaultDirectoryDirs/> -+ <DefaultLayout> -+ <Merge type="menus"/> -+ <Merge type="files"/> -+ <Separator/> -+ <Menuname>More</Menuname> -+ </DefaultLayout> -+ <Layout> -+ <Merge type="menus"/> -+ <Menuname>Applications</Menuname> -+ <Merge type="files"/> -+ </Layout> -+ -+ <Menu> -+ <Name>Applications</Name> -+ <Directory>kde-unknown.directory</Directory> -+ <OnlyUnallocated/> -+ <Include> -+ <Not> -+ <!-- Don't list non-KDE core applications --> -+ <And> -+ <Category>Core</Category> -+ <Not><Category>KDE</Category></Not> -+ </And> -+ <!-- Don't list SUSE's YaST in here --> -+ <Category>X-SuSE-YaST</Category> -+ </Not> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Development</Name> -+ <Directory>kde-development.directory</Directory> -+ <Menu> -+ <Name>X-KDE-KDevelopIDE</Name> -+ <Directory>kde-development-kdevelop.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>X-KDE-KDevelopIDE</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Translation</Name> -+ <Directory>kde-development-translation.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>Translation</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Web Development</Name> -+ <Directory>kde-development-webdevelopment.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>WebDevelopment</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Not><Category>X-KDE-KDevelopIDE</Category></Not> -+ <Not><Category>Translation</Category></Not> -+ <Not><Category>WebDevelopment</Category></Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Science</Name> -+ <Directory>kde-science.directory</Directory> -+ <Include> -+ <And><!-- Include /any/ Science app which is not an Education app --> -+ <Or> -+ <Category>Astronomy</Category> -+ <Category>Biology</Category> -+ <Category>Chemistry</Category> -+ <Category>Geology</Category> -+ <Category>MedicalSoftware</Category> -+ <Category>Physics</Category> -+ <Category>Math</Category> -+ <Category>Science</Category> -+ </Or> -+ <Not><Category>Education</Category></Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Edutainment</Name> -+ <Directory>kde-edutainment.directory</Directory> -+ <Menu> -+ <Name>Languages</Name> -+ <Directory>kde-edu-languages.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Or> -+ <Category>Languages</Category> -+ <Category>X-KDE-Edu-Language</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Mathematics</Name> -+ <Directory>kde-edu-mathematics.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Category>Math</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Miscellaneous</Name> -+ <Directory>kde-edu-miscellaneous.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Not> -+ <Category>Languages</Category> -+ <Category>X-KDE-Edu-Language</Category> -+ <Category>Math</Category> -+ <Category>Science</Category> -+ <Category>Teaching</Category> -+ <Category>X-KDE-Edu-Teaching</Category> -+ </Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Science</Name> -+ <Directory>kde-edu-science.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Category>Science</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Tools</Name> -+ <Directory>kde-edu-tools.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Or> -+ <Category>Teaching</Category> -+ <Category>X-KDE-Edu-Teaching</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Games</Name> -+ <Directory>kde-games.directory</Directory> -+ <Menu> -+ <Name>Arcade</Name> -+ <Directory>kde-games-arcade.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>ArcadeGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Board</Name> -+ <Directory>kde-games-board.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>BoardGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Card</Name> -+ <Directory>kde-games-card.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>CardGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Kidsgames</Name> -+ <Directory>kde-games-kids.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Or> -+ <Category>X-KDE-KidsGame</Category> -+ <Category>KidsGame</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>TacticStrategy</Name> -+ <Directory>kde-games-strategy.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>StrategyGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Not> -+ <Category>ArcadeGame</Category> -+ <Category>BoardGame</Category> -+ <Category>CardGame</Category> -+ <Category>X-KDE-KidsGame</Category> -+ <Category>KidsGame</Category> -+ <Category>StrategyGame</Category> -+ </Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Toys</Name> -+ <Directory>kde-toys.directory</Directory> -+ <Include> -+ <Category>Amusement</Category> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Graphics</Name> -+ <Directory>kde-graphics.directory</Directory> -+ <Include> -+ <And> -+ <Category>Graphics</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Graphics</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Internet</Name> -+ <Directory>kde-internet.directory</Directory> -+ <Include> -+ <And> -+ <Category>Network</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Terminal</Name> -+ <Directory>kde-internet-terminal.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Network</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Multimedia</Name> -+ <Directory>kde-multimedia.directory</Directory> -+ <Include> -+ <And> -+ <Category>AudioVideo</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>AudioVideo</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Office</Name> -+ <Directory>kde-office.directory</Directory> -+ <Layout> -+ <Merge type="menus"/> -+ <Filename>kde-koshell.desktop</Filename> -+ <Filename>kde-Kontact.desktop</Filename> -+ <Separator/> -+ <Filename>kde-kword.desktop</Filename> -+ <Filename>kde-kspread.desktop</Filename> -+ <Filename>kde-kpresenter.desktop</Filename> -+ <Merge type="files"/> -+ <Separator/> -+ <Menuname>More</Menuname> -+ </Layout> -+ <Include> -+ <And> -+ <Category>Office</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Office</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Settingsmenu</Name> -+ <Directory>kde-settingsmenu.directory</Directory> -+ <Include> -+ <Category>Settings</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>System</Name> -+ <Directory>kde-system.directory</Directory> -+ <Include> -+ <And> -+ <Category>System</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>System</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>ScreenSavers</Name> -+ <Directory>kde-system-screensavers.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>Terminal</Name> -+ <Directory>kde-system-terminal.directory</Directory> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Utilities</Name> -+ <Directory>kde-utilities.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Not><Category>Accessibility</Category></Not> -+ <Not><Category>X-KDE-Utilities-Desktop</Category></Not> -+ <Not><Category>X-KDE-Utilities-File</Category></Not> -+ <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> -+ <Not><Category>X-KDE-Utilities-PIM</Category></Not> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Accessibility</Name> -+ <Directory>kde-utilities-accessibility.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>Accessibility</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Desktop</Name> -+ <Directory>kde-utilities-desktop.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-Desktop</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Editors</Name> -+ <Directory>kde-editors.directory</Directory> -+ <Include> -+ <Category>TextEditor</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>File</Name> -+ <Directory>kde-utilities-file.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-File</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Peripherals</Name> -+ <Directory>kde-utilities-peripherals.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-Peripherals</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>PIM</Name> -+ <Directory>kde-utilities-pim.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-PIM</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>XUtilities</Name> -+ <Directory>kde-utilities-xutils.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Include> -+ <And> -+ <Category>KDE</Category> -+ <Category>Core</Category> -+ </And> -+ </Include> -+ <DefaultMergeDirs/> -+ <MergeFile>applications-kmenuedit.menu</MergeFile> -+</Menu> diff --git a/staging/kdelibs3/kdelibs3-missing-include.patch b/staging/kdelibs3/kdelibs3-missing-include.patch deleted file mode 100644 index 5b84ef746..000000000 --- a/staging/kdelibs3/kdelibs3-missing-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdeprint/cups/cupsdconf2/cups-util.c.old 2012-01-19 01:30:26.000000000 -0500 -+++ kdeprint/cups/cupsdconf2/cups-util.c 2012-01-19 01:31:33.000000000 -0500 -@@ -2,6 +2,7 @@ - #include <cups/http.h> - #include <cups/cups.h> - #include <stdlib.h> -+#include <stdio.h> - #include <fcntl.h> - #include <sys/stat.h> - #include <unistd.h> diff --git a/staging/kdelibs3/kdelibs3.install b/staging/kdelibs3/kdelibs3.install deleted file mode 100644 index 7291ac0a2..000000000 --- a/staging/kdelibs3/kdelibs3.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf -} diff --git a/staging/kdelibs3/openssl.patch b/staging/kdelibs3/openssl.patch deleted file mode 100644 index a948b884a..000000000 --- a/staging/kdelibs3/openssl.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc ---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons - static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, - const EVP_CIPHER *,unsigned char *,int , - pem_password_cb *, void *) = 0L; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; -+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -+#else - static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; - static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; - static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -+#endif - static int (*K_X509_print_fp) (FILE *, X509*) = 0L; - static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; - static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; -@@ -430,9 +435,14 @@ KConfig *cfg; - K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); - K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); - K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); -+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); -+#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); -+#endif - K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); - K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); - K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); -@@ -594,7 +604,7 @@ KConfig *cfg; - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); - #endif - - -@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI - else return -1; - } - -- -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { -+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) -+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); -+ else return -1; -+} -+#else - ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - else return 0L; -@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - else return -1; - } -- -+#endif - - int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { - if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); -diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h ---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200 -@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate; - #include <openssl/stack.h> - #include <openssl/bn.h> - #undef crypt -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK _STACK -+#endif - #endif - - #include <kstaticdeleter.h> -@@ -446,12 +449,12 @@ public: - */ - int PEM_write_bio_X509(BIO *bp, X509 *x); - -- -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -- -+#endif - - /* - * ASN1_i2d_fp - used for netscape output -@@ -531,6 +534,9 @@ public: - */ - void sk_free(STACK *s); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); } -+#endif - - /* - * Number of elements in the stack -@@ -543,6 +549,9 @@ public: - */ - char *sk_value(STACK *s, int n); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); } -+#endif - - /* - * Create a new stack -@@ -555,6 +564,9 @@ public: - */ - int sk_push(STACK *s, char *d); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); } -+#endif - - /* - * Duplicate the stack -diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc ---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate - - - STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) { -- STACK_OF(X509) *x509 = sk_new(NULL); -+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL)); - KSSLCertificate *cert = certs.first(); - while(cert) { - sk_X509_push(x509, cert->getCert()); -diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc ---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100 -+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -1003,17 +1003,31 @@ return qba; - QByteArray KSSLCertificate::toNetscape() { - QByteArray qba; - #ifdef KSSL_HAVE_SSL --ASN1_HEADER ah; --ASN1_OCTET_STRING os; --KTempFile ktf; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ NETSCAPE_X509 nx; -+ ASN1_OCTET_STRING hdr; -+#else -+ ASN1_HEADER ah; -+ ASN1_OCTET_STRING os; -+#endif -+ KTempFile ktf; - -- os.data = (unsigned char *)NETSCAPE_CERT_HDR; -- os.length = strlen(NETSCAPE_CERT_HDR); -- ah.header = &os; -- ah.data = (char *)getCert(); -- ah.meth = d->kossl->X509_asn1_meth(); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ hdr.length = strlen(NETSCAPE_CERT_HDR); -+ nx.header = &hdr; -+ nx.cert = getCert(); -+ -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -+#else -+ os.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ os.length = strlen(NETSCAPE_CERT_HDR); -+ ah.header = &os; -+ ah.data = (char *)getCert(); -+ ah.meth = d->kossl->X509_asn1_meth(); - -- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+#endif - - ktf.close(); - diff --git a/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD deleted file mode 100644 index 3206bc566..000000000 --- a/staging/koffice/PKGBUILD +++ /dev/null @@ -1,306 +0,0 @@ -# $Id: PKGBUILD 147690 2012-01-27 04:08:22Z eric $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > - -pkgbase=koffice -pkgname=( - 'koffice-filters' - 'koffice-interfaces' - 'koffice-libs' - 'koffice-plugins' - 'koffice-pics' - 'koffice-servicetypes' - 'koffice-templates' - 'koffice-tools' - 'koffice-karbon' - 'koffice-karbon-doc' -# 'koffice-kchart' -# 'koffice-kchart-doc' - 'koffice-kexi' - 'koffice-kexi-doc' - 'koffice-kformula' - 'koffice-kformula-doc' - 'koffice-kounavail' - 'koffice-kplato' -# 'koffice-kplato-doc' - 'koffice-kpresenter' - 'koffice-kpresenter-doc' - 'koffice-krita' -# 'koffice-krita-doc' # no krita-doc anymore upstream - 'koffice-kspread' - 'koffice-kspread-doc' - 'koffice-kword' -# 'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources) - 'koffice-handbook' - 'koffice-thesaurus-doc' -# 'koffice-kdgantt' # still an empty package -) -pkgver=2.3.3 -pkgrel=12 -arch=('i686' 'x86_64') -url='http://koffice.kde.org' -license=('GPL' 'LGPL' 'FDL') -makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' - 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf') -groups=('koffice') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch') -sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' - '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739' - 'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa') -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - patch -p1 -i "${srcdir}"/gcc46.patch - patch -p1 -i "${srcdir}"/qt48fix.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -##### 1st package common files, depends, optdepends of the koffice applications ##### - -package_koffice-filters(){ - pkgdesc="Filters for the KDE office suite" - depends=('shared-mime-info' 'libgsf') - optdepends=('libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' - 'libkdcraw: support for raw images' 'poppler: support for pdf' - 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters' - 'koffice-kplato: Kplato filters') - install=filters.install - cd "${srcdir}/build/filters" - make DESTDIR="${pkgdir}" install -} - -package_koffice-interfaces(){ - pkgdesc="Interfaces for the KDE office suite" - depends=('koffice-libs') - cd "${srcdir}/build/interfaces" - make DESTDIR="${pkgdir}" install -} - -package_koffice-libs(){ - pkgdesc="Libs for the KDE office suite" - depends=('kdepimlibs' 'lcms' 'koffice-servicetypes') - cd "${srcdir}/build/libs" - make DESTDIR="${pkgdir}" install -} - -package_koffice-plugins(){ - pkgdesc="Plugins for the KDE office suite" - depends=('koffice-libs') - replaces=('koffice-kchart') - conflicts=('koffice-kchart') - cd "${srcdir}/build/plugins" - make DESTDIR="${pkgdir}" install -} - -package_koffice-pics(){ - pkgdesc="Icons for the KDE office suite" - depends=('desktop-file-utils' 'xdg-utils') - install=koffice.install - cd "${srcdir}/build/pics" - make DESTDIR="${pkgdir}" install -} - -package_koffice-servicetypes(){ - pkgdesc="Servicetypes for the KDE office suite" - cd "${srcdir}/build/servicetypes" - make DESTDIR="${pkgdir}" install -} - -package_koffice-templates(){ - pkgdesc="Templates for the KDE office suite" - cd "${srcdir}/build/templates" - make DESTDIR="${pkgdir}" install -} - -package_koffice-tools(){ - pkgdesc="Tools for the KDE office suite" - depends=('koffice-libs' 'oxygen-icons') - cd "${srcdir}/build/tools" - make DESTDIR="${pkgdir}" install -} - -#### package common files done ##### - -#### package apps and their docs ##### - -package_koffice-karbon(){ - pkgdesc="Vector drawing application for KDE" - depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-karbon-doc(){ - pkgdesc="Documentation for karbon" - cd "${srcdir}/build/doc/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi(){ - pkgdesc="Integrated data management application for the KDE office suite" - depends=('koffice-kspread' 'oxygen-icons') - install=koffice.install - cd "${srcdir}/build/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi-doc(){ - pkgdesc="Documentation for kexi" - cd "${srcdir}/build/doc/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula(){ - pkgdesc="Formula editor for the KDE office suite" - depends=('koffice-libs') - install=koffice.install - cd "${srcdir}/build/kformula" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula-doc() { - pkgdesc="Documentation for koffice-kformula" - cd "${srcdir}/build/doc/kformula" - make DESTDIR="${pkgdir}" install -} - - -package_koffice-kounavail(){ - pkgdesc="Kounavail for the KDE office suite" - depends=('koffice-libs') - cd "${srcdir}/build/kounavail" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kplato(){ - pkgdesc="Project management application for KDE" - depends=('koffice-kword' 'oxygen-icons') - install=koffice.install - cd "${srcdir}/build/kplato" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-kplato-doc(){ -# pkgdesc="Documentation for kplato" -# cd ${srcdir}/build/doc/kplato -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-kpresenter(){ - pkgdesc="Presentation tool for KDE" - depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kpresenter-doc(){ - pkgdesc="Documentation for kpresenter" - cd "${srcdir}/build/doc/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-krita(){ - pkgdesc="Graphics editor for KDE" - depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \ - 'koffice-plugins' 'poppler-qt' 'opengtl') - optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images') - install=krita.install - cd "${srcdir}/build/krita" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-krita-doc(){ -# pkgdesc="Documentation for krita" -# cd ${srcdir}/build/doc/krita -# make DESTDIR="${pkgdir}" install -#} - - -package_koffice-kspread(){ - pkgdesc="Spreadsheet application for KDE" - depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kspread-doc(){ - pkgdesc="Documentation for kspread" - cd "${srcdir}/build/doc/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kword(){ - pkgdesc="Wordprocessor for KDE" - depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \ - 'koffice-kounavail' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kword" - make DESTDIR="${pkgdir}" install - - # some sed lines to have python2 in extension scripts - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py" -} - -#package_koffice-kword-doc(){ -# pkgdesc="Documentation for kword" -# cd ${srcdir}/build/doc/kword -# make DESTDIR="${pkgdir}" install -#} - -##### package apps done ##### - -#package_koffice-kchart(){ -# pkgdesc="Charting tool for KDE" -# depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates') -# optdepends=('koffice-filters: import/export filters') -# install=koffice.install -# cd "${srcdir}/build/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kchart-doc(){ -# pkgdesc="Documentation for kchart" -# cd "${srcdir}/build/doc/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kdgantt(){ -# pkgdesc="Gantt for KDE" -# cd "${srcdir}/build/kdgantt" -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-handbook() { - pkgdesc="Documentation for koffice" - cd "${srcdir}/build/doc/koffice" - make DESTDIR="${pkgdir}" install -} - -package_koffice-thesaurus-doc(){ - pkgdesc="Documentation for koffice-thesaurus" - cd "${srcdir}/build/doc/thesaurus" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/koffice/filters.install b/staging/koffice/filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/koffice/filters.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/koffice/gcc46.patch b/staging/koffice/gcc46.patch deleted file mode 100644 index dcf8a4f85..000000000 --- a/staging/koffice/gcc46.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc ---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 2011-02-17 06:13:40.000000000 -0600 -+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc 2011-02-19 21:15:56.597142885 -0600 -@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp - return IT_FLOAT16; - case Imf::FLOAT: - return IT_FLOAT32; -+ default: -+ // shouldn't reach here -+ return IT_UNSUPPORTED; - } - } - -@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace( - case IT_UNKNOWN: - case IT_UNSUPPORTED: - return 0; -+ default: -+ // shouldn't reach here -+ return 0; - } - } - diff --git a/staging/koffice/kde4-koffice-libwpg02.patch b/staging/koffice/kde4-koffice-libwpg02.patch deleted file mode 100644 index e2a55a216..000000000 --- a/staging/koffice/kde4-koffice-libwpg02.patch +++ /dev/null @@ -1,1323 +0,0 @@ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt ---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100 -@@ -1,16 +1,11 @@ - -- - include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/) - --set(wpgimport_PART_SRCS --WPGImport.cpp --OdgExporter.cxx --FileOutputHandler.cxx --GraphicsElement.cxx) -+set(wpgimport_PART_SRCS WPGImport.cpp) - - kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS}) - --target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) -+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES}) - - install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,95 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "FileOutputHandler.hxx" -- --FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) : -- mbIsTagOpened(false), -- mContentStream(contentStream) --{ --} -- --void FileOutputHandler::startDocument() --{ --} -- --void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << "<" << psName; -- -- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++) -- { -- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\""; -- } -- mbIsTagOpened = true; -- msOpenedTagName = psName; --} -- --void FileOutputHandler::endElement(const char *psName) --{ -- if (mbIsTagOpened) -- { -- if( msOpenedTagName == psName ) -- { -- mContentStream << "/>"; -- mbIsTagOpened = false; -- } -- else // should not happen, but handle it -- { -- mContentStream << ">"; -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } -- } -- else -- { -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } --} -- --void FileOutputHandler::characters(const std::string &sCharacters) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << sCharacters.c_str(); --} -- --void FileOutputHandler::endDocument() --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,49 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef FILEOUTPUTHANDLER_H --#define FILEOUTPUTHANDLER_H -- --#include <iostream> --#include <sstream> --#include <string> --#include "GraphicsHandler.hxx" -- --class FileOutputHandler : public GraphicsHandler --{ -- public: -- explicit FileOutputHandler(std::ostringstream &contentStream); -- virtual void startDocument(); -- virtual void endDocument(); -- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList); -- virtual void endElement(const char *psName); -- virtual void characters(const std::string &sCharacters); -- -- private: -- bool mbIsTagOpened; -- std::string msOpenedTagName; -- std::ostringstream &mContentStream; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,66 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <string.h> -- --#define ASCII_SPACE 0x0020 -- --void TagGraphicsElement::print() const --{ --} -- --void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->startElement(getTagName().c_str(), maAttrList); --} -- --void OpenTagGraphicsElement::print() const --{ -- TagGraphicsElement::print(); --} -- --void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue) --{ -- std::pair<std::string, std::string> tmpAttribute; -- tmpAttribute.first = szAttributeName; -- tmpAttribute.second = sAttributeValue; -- maAttrList.push_back(tmpAttribute); --} -- --void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- -- pHandler->endElement(getTagName().c_str()); --} -- --void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->characters(msData); --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,84 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpd.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef _GRAPHICSELEMENT_H --#define _GRAPHICSELEMENT_H --#include <string> --#include <map> --#include <vector> -- --#include "GraphicsHandler.hxx" -- --class GraphicsElement --{ --public: -- virtual ~GraphicsElement() {} -- virtual void write(GraphicsHandler *pHandler) const = 0; -- virtual void print() const {} --}; -- --class TagGraphicsElement : public GraphicsElement --{ --public: -- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {} -- const std::string &getTagName() const { return msTagName; } -- virtual void print() const; --private: -- const std::string msTagName; --}; -- --class OpenTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- ~OpenTagGraphicsElement() {} -- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue); -- virtual void write(GraphicsHandler *pHandler) const; -- virtual void print () const; --private: -- std::vector<std::pair<std::string, std::string> > maAttrList; --}; -- --class CloseTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- virtual void write(GraphicsHandler *pHandler) const; --}; -- --class CharDataGraphicsElement : public GraphicsElement --{ --public: -- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {} -- virtual void write(GraphicsHandler *pHandler) const; --private: -- std::string msData; --}; -- -- --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,43 +0,0 @@ --/* -- * Copyright (C) 2004 William Lachance (wlach@interlog.com) -- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) -- * -- * 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 Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * Contributor(s): Martin Gallwey (gallwey@sun.com) -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ --#ifndef _GRAPHICSHANDLER_H --#define _GRAPHICSHANDLER_H --#include <string> --#include <map> --#include <vector> -- --class GraphicsHandler --{ --public: -- virtual ~GraphicsHandler() {} -- virtual void startDocument() = 0; -- virtual void endDocument() = 0; -- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0; -- virtual void endElement(const char *psName) = 0; -- virtual void characters(const std::string &sCharacters) = 0; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,662 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "OdgExporter.hxx" --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <locale.h> -- --static std::string doubleToString(const double value) --{ -- std::ostringstream tempStream; -- tempStream << value; -- std::string decimalPoint(localeconv()->decimal_point); -- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) -- return tempStream.str(); -- std::string stringValue(tempStream.str()); -- if (!stringValue.empty()) -- { -- std::string::size_type pos; -- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) -- stringValue.replace(pos,decimalPoint.size(),"."); -- } -- return stringValue; --} -- -- --OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML): -- mpHandler(pHandler), -- m_fillRule(AlternatingFill), -- m_gradientIndex(1), -- m_dashIndex(1), -- m_styleIndex(1), -- m_width(0.0f), -- m_height(0.0f), -- m_isFlatXML(isFlatXML) --{ --} -- --OdgExporter::~OdgExporter() --{ -- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- delete (*iterStroke); -- -- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- delete (*iterGradient); -- -- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- delete (*iterAutomaticStyles); -- -- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- delete (*bodyIter); --} -- --void OdgExporter::startGraphics(double width, double height) --{ -- m_gradientIndex = 1; -- m_dashIndex = 1; -- m_styleIndex = 1; -- m_width = width; -- m_height = height; -- -- -- mpHandler->startDocument(); -- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document"); -- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); -- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); -- tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); -- if (m_isFlatXML) -- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing"); -- tmpOfficeDocumentContent.write(mpHandler); -- -- OpenTagGraphicsElement("office:settings").write(mpHandler); -- -- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set"); -- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); -- configItemSetOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement configItemOpenElement1("config:config-item"); -- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop"); -- configItemOpenElement1.addAttribute("config:type", "int"); -- configItemOpenElement1.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement2("config:config-item"); -- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft"); -- configItemOpenElement2.addAttribute("config:type", "int"); -- configItemOpenElement2.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement3("config:config-item"); -- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth"); -- configItemOpenElement3.addAttribute("config:type", "int"); -- configItemOpenElement3.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * width); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement4("config:config-item"); -- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight"); -- configItemOpenElement4.addAttribute("config:type", "int"); -- configItemOpenElement4.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * height); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- mpHandler->endElement("config:config-item-set"); -- -- mpHandler->endElement("office:settings"); -- --} -- --void OdgExporter::endGraphics() --{ -- OpenTagGraphicsElement("office:styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- (*iterStroke)->write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- (*iterGradient)->write(mpHandler); -- -- mpHandler->endElement("office:styles"); -- -- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- (*iterAutomaticStyles)->write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout"); -- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); -- tmpStylePageLayoutOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); -- m_value.str(""); -- m_value << doubleToString(m_width) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(m_height) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str()); -- m_value.str(""); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); -- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:page-layout-properties"); -- -- mpHandler->endElement("style:page-layout"); -- -- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style"); -- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); -- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); -- tmpStyleStyleOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); -- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); -- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); -- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:drawing-page-properties"); -- -- mpHandler->endElement("style:style"); -- -- mpHandler->endElement("office:automatic-styles"); -- -- OpenTagGraphicsElement("office:master-styles").write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page"); -- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); -- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); -- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpStyleMasterPageOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:master-page"); -- -- mpHandler->endElement("office:master-styles"); -- -- OpenTagGraphicsElement("office:body").write(mpHandler); -- -- OpenTagGraphicsElement("office:drawing").write(mpHandler); -- -- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page"); -- tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); -- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); -- tmpDrawPageOpenElement.write(mpHandler); -- -- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- { -- (*bodyIter)->write(mpHandler); -- } -- -- mpHandler->endElement("draw:page"); -- mpHandler->endElement("office:drawing"); -- mpHandler->endElement("office:body"); -- mpHandler->endElement("office:document"); -- -- mpHandler->endDocument(); --} -- --void OdgExporter::setPen(const libwpg::WPGPen& pen) --{ -- m_pen = pen; --} -- --void OdgExporter::setBrush(const libwpg::WPGBrush& brush) --{ -- m_brush = brush; --} -- --void OdgExporter::setFillRule(FillRule rule) --{ -- m_fillRule = rule; --} -- --void OdgExporter::startLayer(unsigned int) --{ --} -- --void OdgExporter::endLayer(unsigned int) --{ --} -- --void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawRectElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x2-rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y2-rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rx) << "in"; -- // FIXME: what to do when rx != ry ? -- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect"))); --} -- --void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.x - rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.y - ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse"))); --} -- --void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) --{ -- if(vertices.count() < 2) -- return; -- -- if(vertices.count() == 2) -- { -- const libwpg::WPGPoint& p1 = vertices[0]; -- const libwpg::WPGPoint& p2 = vertices[1]; -- -- writeStyle(); -- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawLineElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawLineElement->addAttribute("draw:text-style-name", "P1"); -- pDrawLineElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p1.x) << "in"; -- pDrawLineElement->addAttribute("svg:x1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p1.y) << "in"; -- pDrawLineElement->addAttribute("svg:y1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.x) << "in"; -- pDrawLineElement->addAttribute("svg:x2", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.y) << "in"; -- pDrawLineElement->addAttribute("svg:y2", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line"))); -- } -- else -- { -- // draw as path -- libwpg::WPGPath path; -- path.moveTo(vertices[0]); -- for(unsigned long ii = 1; ii < vertices.count(); ii++) -- path.lineTo(vertices[ii]); -- path.closed = true; -- drawPath(path); -- } --} -- --void OdgExporter::drawPath(const libwpg::WPGPath& path) --{ -- if(path.count() == 0) -- return; -- -- // try to find the bounding box -- // this is simple convex hull technique, the bounding box might not be -- // accurate but that should be enough for this purpose -- libwpg::WPGPoint p = path.element(0).point; -- libwpg::WPGPoint q = path.element(0).point; -- for(unsigned k = 0; k < path.count(); k++) -- { -- libwpg::WPGPathElement element = path.element(k); -- p.x = (p.x > element.point.x) ? element.point.x : p.x; -- p.y = (p.y > element.point.y) ? element.point.y : p.y; -- q.x = (q.x < element.point.x) ? element.point.x : q.x; -- q.y = (q.y < element.point.y) ? element.point.y : q.y; -- if(element.type == libwpg::WPGPathElement::CurveToElement) -- { -- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; -- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; -- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; -- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; -- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; -- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; -- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; -- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; -- } -- } -- double vw = q.x - p.x; -- double vh = q.y - p.y; -- -- writeStyle(); -- -- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawPathElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawPathElement->addAttribute("draw:text-style-name", "P1"); -- pDrawPathElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p.x) << "in"; -- pDrawPathElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p.y) << "in"; -- pDrawPathElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vw) << "in"; -- pDrawPathElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vh) << "in"; -- pDrawPathElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540); -- pDrawPathElement->addAttribute("svg:viewBox", m_value.str()); -- m_value.str(""); -- -- for(unsigned i = 0; i < path.count(); i++) -- { -- libwpg::WPGPathElement element = path.element(i); -- libwpg::WPGPoint point = element.point; -- switch(element.type) -- { -- // 2540 is 2.54*1000, 2.54 in = 1 in -- case libwpg::WPGPathElement::MoveToElement: -- m_value << "M" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::LineToElement: -- m_value << "L" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::CurveToElement: -- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " "; -- m_value << (int)((element.extra1.y-p.y)*2540) << " "; -- m_value << (int)((element.extra2.x-p.x)*2540) << " "; -- m_value << (int)((element.extra2.y-p.y)*2540) << " "; -- m_value << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- default: -- break; -- } -- } -- if(path.closed) -- m_value << " Z"; -- pDrawPathElement->addAttribute("svg:d", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path"))); --} -- -- --void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) --{ -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary; -- bitmap.generateBase64DIB(base64Binary); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- --void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) --{ -- if (binaryData.mimeType.length() <= 0) -- return; -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary = binaryData.getBase64Data(); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- -- --static std::string colorToHex(const libwpg::WPGColor& color) --{ -- char hexdigits[] = "0123456789abcdef"; -- char buffer[] = "123456"; -- buffer[0] = hexdigits[(color.red >> 4) & 15]; -- buffer[1] = hexdigits[color.red & 15]; -- buffer[2] = hexdigits[(color.green >> 4) & 15]; -- buffer[3] = hexdigits[color.green & 15]; -- buffer[4] = hexdigits[(color.blue >> 4) & 15]; -- buffer[5] = hexdigits[color.blue & 15]; -- return std::string(buffer); --} -- --void OdgExporter::writeStyle() --{ -- m_value.str(""); -- m_name.str(""); -- -- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) -- { -- // ODG only supports dashes with the same length of spaces inbetween -- // here we take the first space and assume everything else the same -- // note that dash length is written in percentage -- double distance = m_pen.dashArray.at(1); -- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash"); -- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect"); -- m_value << "Dash_" << m_dashIndex++; -- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(distance*100) << "%"; -- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str()); -- m_value.str(""); -- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) -- { -- m_name << "draw:dots" << i+1; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1"); -- m_name.str(""); -- m_name << "draw:dots" << i+1 << "-length"; -- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%"; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str()); -- m_name.str(""); -- m_value.str(""); -- } -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement)); -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash"))); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient"); -- tmpDrawGradientElement->addAttribute("draw:style", "linear"); -- m_value << "Gradient_" << m_gradientIndex++; -- tmpDrawGradientElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- -- // ODG angle unit is 0.1 degree -- double angle = -m_brush.gradient.angle(); -- while(angle < 0) -- angle += 360; -- while(angle > 360) -- angle -= 360; -- -- m_value << (unsigned)(angle*10); -- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); -- m_value.str(""); -- -- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); -- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); -- m_value << "#" << colorToHex(startColor); -- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(stopColor); -- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str()); -- m_value.str(""); -- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:border", "0%"); -- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement)); -- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient"))); -- } -- -- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style"); -- m_value << "gr" << m_styleIndex; -- tmpStyleStyleElement->addAttribute("style:name", m_value.str()); -- m_value.str(""); -- tmpStyleStyleElement->addAttribute("style:family", "graphic"); -- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard"); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement)); -- -- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties"); -- -- if(m_pen.width > 0.0) -- { -- m_value << doubleToString(m_pen.width) << "in"; -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(m_pen.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str()); -- m_value.str(""); -- -- if(!m_pen.solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash"); -- m_value << "Dash_" << m_dashIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str()); -- m_value.str(""); -- } -- } -- else -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::NoBrush) -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::Solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid"); -- m_value << "#" << colorToHex(m_brush.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str()); -- m_value.str(""); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient"); -- m_value << "Gradient_" << m_gradientIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str()); -- m_value.str(""); -- } -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement)); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties"))); -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style"))); -- m_styleIndex++; --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,116 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef __ODGEXPORTER_H__ --#define __ODGEXPORTER_H__ -- --#include <iostream> --#include <sstream> --#include <string> -- --#include <libwpg/libwpg.h> --#include "GraphicsElement.hxx" -- --class OdgExporter : public libwpg::WPGPaintInterface { --public: -- explicit OdgExporter(GraphicsHandler *pHandler, -- const bool isFlatXML = false); -- ~OdgExporter(); -- --#if LIBWPG_VERSION_MINOR<2 -- void startGraphics(double imageWidth, double imageHeight); -- void endGraphics(); -- void startLayer(unsigned int id); -- void endLayer(unsigned int id); -- -- void setPen(const libwpg::WPGPen& pen); -- void setBrush(const libwpg::WPGBrush& brush); -- void setFillRule(FillRule rule); -- -- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); -- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); -- void drawPolygon(const libwpg::WPGPointArray& vertices); -- void drawPath(const libwpg::WPGPath& path); -- void drawBitmap(const libwpg::WPGBitmap& bitmap); -- void drawImageObject(const libwpg::WPGBinaryData& binaryData); -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- libwpg::WPGPen m_pen; -- libwpg::WPGBrush m_brush; -- FillRule m_fillRule; -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#else -- virtual void startGraphics(const ::WPXPropertyList &propList); -- virtual void endGraphics(); -- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); -- virtual void startLayer(const ::WPXPropertyList &propList); -- virtual void endLayer(); -- virtual void drawRectangle(const ::WPXPropertyList& propList); -- virtual void drawEllipse(const ::WPXPropertyList& propList); -- virtual void drawPolygon(const ::WPXPropertyListVector &vertices); -- virtual void drawPath(const ::WPXPropertyListVector &path); -- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); -- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList); -- virtual void endEmbeddedGraphics(); -- virtual void drawPolyline(const ::WPXPropertyListVector &vertices); -- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); -- virtual void endTextObject(); -- virtual void startTextLine(const ::WPXPropertyList &propList); -- virtual void endTextLine(); -- virtual void startTextSpan(const ::WPXPropertyList &propList); -- virtual void endTextSpan(); -- virtual void insertText(const ::WPXString &str); -- -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#endif --}; -- --#endif // __ODGEXPORTER_H__ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp ---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100 -@@ -20,28 +20,26 @@ - #include <WPGImport.h> - #include <WPGImport.moc> - --#include <QBuffer> --#include <QByteArray> --#include <QString> -- --#include <kdebug.h> - #include <KoFilterChain.h> - #include <KoGlobal.h> - #include <KoUnit.h> -+#include <KoXmlWriter.h> -+ - #include <kpluginfactory.h> -+#include <KDebug> - --#include <KoXmlWriter.h> -+ -+#include <QtCore/QString> -+#include <QtCore/QFile> - - #include <libwpg/libwpg.h> - #if LIBWPG_VERSION_MINOR<2 - #include <libwpg/WPGStreamImplementation.h> - #else - #include <libwpd-stream/libwpd-stream.h> -+#include <libwpd/libwpd.h> - #endif - --#include "FileOutputHandler.hxx" --#include "OdgExporter.hxx" -- - #include <iostream> - - K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();) -@@ -56,35 +54,13 @@ - { - } - --static QByteArray createManifest() --{ -- KoXmlWriter* manifestWriter; -- QByteArray manifestData; -- QBuffer manifestBuffer(&manifestData); -- -- manifestBuffer.open(QIODevice::WriteOnly); -- manifestWriter = new KoXmlWriter(&manifestBuffer); -- -- manifestWriter->startDocument("manifest:manifest"); -- manifestWriter->startElement("manifest:manifest"); -- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0"); -- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics"); -- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); -- manifestWriter->addManifestEntry("content.xml", "text/xml"); -- manifestWriter->endElement(); -- manifestWriter->endDocument(); -- delete manifestWriter; -- -- return manifestData; --} -- - - KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to) - { - if (from != "application/x-wpg") - return KoFilter::NotImplemented; - -- if (to != "application/vnd.oasis.opendocument.graphics") -+ if (to != "image/svg+xml") - return KoFilter::NotImplemented; - - #if LIBWPG_VERSION_MINOR<2 -@@ -96,6 +72,7 @@ - input = olestream; - } - } -+ libwpg::WPGString output; - #else - WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); - if (input->isOLEStream()) { -@@ -105,59 +82,31 @@ - input = olestream; - } - } -+ ::WPXString output; - #endif - - if (!libwpg::WPGraphics::isSupported(input)) { -- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; -+ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; - delete input; - return KoFilter::NotImplemented; - } - -- // do the conversion -- std::ostringstream tmpStringStream; -- FileOutputHandler tmpHandler(tmpStringStream); -- OdgExporter exporter(&tmpHandler); -- libwpg::WPGraphics::parse(input, &exporter); -- delete input; -- -- -- // create output store -- KoStore* storeout; -- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write, -- "application/vnd.oasis.opendocument.graphics", KoStore::Zip); -- -- if (!storeout) { -- kWarning() << "Couldn't open the requested file."; -- return KoFilter::FileNotFound; -- } -- --#if 0 -- if (!storeout->open("styles.xml")) { -- kWarning() << "Couldn't open the file 'styles.xml'."; -- return KoFilter::CreationError; -+ if (!libwpg::WPGraphics::generateSVG(input, output)) { -+ kWarning() << "ERROR: SVG Generation failed!"; -+ delete input; -+ return KoFilter::ParsingError; - } -- //storeout->write( createStyles() ); -- storeout->close(); --#endif - -- if (!storeout->open("content.xml")) { -- kWarning() << "Couldn't open the file 'content.xml'."; -- return KoFilter::CreationError; -- } -- storeout->write(tmpStringStream.str().c_str()); -- storeout->close(); -+ delete input; - -- // store document manifest -- storeout->enterDirectory("META-INF"); -- if (!storeout->open("manifest.xml")) { -- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'."; -- return KoFilter::CreationError; -+ QFile outputFile(m_chain->outputFile()); -+ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) { -+ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); -+ return KoFilter::InternalError; - } -- storeout->write(createManifest()); -- storeout->close(); - -- // we are done! -- delete storeout; -+ outputFile.write(output.cstr()); -+ outputFile.close(); - - return KoFilter::OK; - } - diff --git a/staging/koffice/koffice.install b/staging/koffice/koffice.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/koffice/koffice.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/staging/koffice/krita.install b/staging/koffice/krita.install deleted file mode 100644 index 5d458de55..000000000 --- a/staging/koffice/krita.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/staging/koffice/qt48fix.patch b/staging/koffice/qt48fix.patch deleted file mode 100644 index de72926d5..000000000 --- a/staging/koffice/qt48fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-02-17 13:10:38.000000000 +0100 -+++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-09-08 15:03:31.932039128 +0200 -@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh - << "visible="<<ba.isVisible() - << "brush="<<ba.brush() - << "pixmapmode="<<ba.pixmapMode() -- << "pixmap="<<ba.pixmap() - << ")"; - return dbg; - } diff --git a/staging/lablgtk2/PKGBUILD b/staging/lablgtk2/PKGBUILD deleted file mode 100644 index 64af43ec5..000000000 --- a/staging/lablgtk2/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 147254 2012-01-25 04:37:32Z eric $ -#Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=lablgtk2 -pkgver=2.14.2 -pkgrel=5 -pkgdesc=" An Objective Caml interface to gtk2" -arch=(i686 x86_64) -license=('LGPL') -url="http://lablgtk.forge.ocamlcore.org/" -depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2') -makedepends=('ocaml') -optdepends=('ocaml: for using the tools') -DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u') -source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) -options=(!makeflags) -md5sums=('bad77680a72dab8b915cae99d1ec9b1f') - -build() { - cd "${srcdir}/lablgtk-${pkgver}" - ./configure --prefix=/usr - make world - make opt -} - -package() { - cd "${srcdir}/lablgtk-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" -} diff --git a/staging/lbreakout2/PKGBUILD b/staging/lbreakout2/PKGBUILD deleted file mode 100644 index 814fc5520..000000000 --- a/staging/lbreakout2/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 146936 2012-01-19 12:08:17Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=lbreakout2 -pkgver=2.6.3 -pkgrel=3 -pkgdesc="A breakout game with nice effects, graphics, and sounds" -arch=('i686' 'x86_64') -url="http://lgames.sourceforge.net" -license=('GPL') -depends=('sdl_mixer' 'libpng') -backup=('var/games/lbreakout2/lbreakout2.hscr') -source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz" - 'lbreakout2.desktop' - 'lbreakout2.png') -md5sums=('43900187bc935475cd6489569cd2230a' - '14cd34a72a8f4e3b8f385f9023625241' - '94e2fa393eb2a7d4494641dec580573b') - -build() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - - ./configure --prefix=/usr \ - --localstatedir=/var/games/lbreakout2 - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - - make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install - - chmod -R 755 ${pkgdir}/usr - chown root:games ${pkgdir}/var/games - chmod 775 ${pkgdir}/var/games - chown root:games ${pkgdir}/var/games/lbreakout2 - chmod 755 ${pkgdir}/var/games/lbreakout2 - chown root:games ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr - chmod 775 ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr - - install -Dm644 ${srcdir}/lbreakout2.png ${pkgdir}/usr/share/pixmaps/lbreakout2.png - install -Dm644 ${srcdir}/lbreakout2.desktop ${pkgdir}/usr/share/applications/lbreakout2.desktop -} diff --git a/staging/lbreakout2/lbreakout2.desktop b/staging/lbreakout2/lbreakout2.desktop deleted file mode 100644 index c8ef945da..000000000 --- a/staging/lbreakout2/lbreakout2.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=Linux Breakout 2 -Comment=Breakout and Arkanoid style arcade game -Icon=/usr/share/pixmaps/lbreakout2.png -TryExec=lbreakout2 -Exec=lbreakout2 -Terminal=false -Categories=Application;Game; diff --git a/staging/lbreakout2/lbreakout2.png b/staging/lbreakout2/lbreakout2.png Binary files differdeleted file mode 100644 index f9541e184..000000000 --- a/staging/lbreakout2/lbreakout2.png +++ /dev/null diff --git a/staging/lcms/PKGBUILD b/staging/lcms/PKGBUILD deleted file mode 100644 index bb67c9e75..000000000 --- a/staging/lcms/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 146955 2012-01-19 17:30:11Z eric $ -# Maintainer: Tobias Kieslich <neri@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> - -pkgname=lcms -pkgver=1.19 -pkgrel=2 -pkgdesc="Lightweight color management development library/engine" -arch=('i686' 'x86_64') -license=('custom') -depends=('libtiff') -url="http://www.littlecms.com" -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8af94611baf20d9646c7c2c285859818') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm 644 COPYING \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/lcms2/PKGBUILD b/staging/lcms2/PKGBUILD deleted file mode 100644 index e3d08a500..000000000 --- a/staging/lcms2/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 146836 2012-01-18 20:10:04Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> - -pkgname=lcms2 -pkgver=2.3 -pkgrel=2 -pkgdesc="Small-footprint color management engine, version 2" -arch=('i686' 'x86_64') -license=('MIT') -depends=('libtiff') -url="http://www.littlecms.com" -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) -sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/libbonoboui/PKGBUILD b/staging/libbonoboui/PKGBUILD deleted file mode 100644 index e6c53e0ec..000000000 --- a/staging/libbonoboui/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 147198 2012-01-24 05:15:13Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libbonoboui -pkgver=2.24.5 -pkgrel=2 -pkgdesc="User Interface library for Bonobo" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('libgnomecanvas' 'libgnome') -makedepends=('intltool' 'pkg-config') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop" -} diff --git a/staging/libdmapsharing/PKGBUILD b/staging/libdmapsharing/PKGBUILD deleted file mode 100644 index 743d5a07c..000000000 --- a/staging/libdmapsharing/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 147655 2012-01-26 01:47:40Z eric $ -#Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=libdmapsharing -pkgver=2.9.12 -pkgrel=2 -pkgdesc="A library that implements the DMAP family of protocols" -arch=('i686' 'x86_64') -url="http://www.flyn.org/projects/libdmapsharing/index.html" -license=('LGPL2.1') -depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2') -options=('!libtool') -source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz) -md5sums=('ec34948df21e9ba0656c917b10fed1c3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --with-mdns=avahi - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libetpan/PKGBUILD b/staging/libetpan/PKGBUILD deleted file mode 100644 index e0df0b365..000000000 --- a/staging/libetpan/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 145930 2012-01-04 09:16:48Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=libetpan -pkgver=1.0 -pkgrel=4 -pkgdesc="A portable middleware for email access" -arch=('i686' 'x86_64') -url="http://www.etpan.org/" -license=("custom:etpan") -depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('5addc766141a0b1d29ee1ca4ba1b6808') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYRIGHT ${pkgdir}/usr/share/licenses/$pkgname/license.txt -} diff --git a/staging/libgdiplus/PKGBUILD b/staging/libgdiplus/PKGBUILD deleted file mode 100644 index 26c513066..000000000 --- a/staging/libgdiplus/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 146859 2012-01-18 21:23:30Z daniel $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgname=libgdiplus -pkgver=2.10 -pkgrel=2 -pkgdesc="An Open Source Implementation of the GDI+ API" -arch=(i686 x86_64) -license=('MPL' 'LGPL') -url="http://www.mono-project.com" -depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch) -md5sums=('451966e8f637e3a1f02d1d30f900255d' - 'a2d143676bbaceeb88b4c34069e93986') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 <../libpng15.patch - ./configure --prefix=/usr --with-cairo=system || return 1 - - make || return 1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/staging/libgdiplus/gdiplus-png14.patch b/staging/libgdiplus/gdiplus-png14.patch deleted file mode 100644 index d13260812..000000000 --- a/staging/libgdiplus/gdiplus-png14.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/pngcodec.c.orig 2010-01-16 23:47:17.000000000 +0100 -+++ src/pngcodec.c 2010-01-16 23:49:49.000000000 +0100 -@@ -352,7 +352,7 @@ - info_ptr->palette[i].blue, - info_ptr->palette[i].green, - info_ptr->palette[i].red, -- info_ptr->trans[i]); /* alpha */ -+ info_ptr->trans_alpha[i]); /* alpha */ - } - } - -@@ -418,7 +418,7 @@ - } - - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { diff --git a/staging/libgdiplus/libpng15.patch b/staging/libgdiplus/libpng15.patch deleted file mode 100644 index 31a1c0162..000000000 --- a/staging/libgdiplus/libpng15.patch +++ /dev/null @@ -1,164 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $ - -Fix build with png-1.5. - ---- src/pngcodec.c.orig 2010-11-03 16:52:54.000000000 +0000 -+++ src/pngcodec.c -@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn - bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr); - bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr); - #elif defined(PNG_pHYs_SUPPORTED) -- if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) { -- bitmap_data->image_flags |= ImageFlagsHasRealDPI; -- bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254; -- bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254; -+ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) { -+ png_uint_32 res_x, res_y; -+ int unit_type; -+ png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type); -+ if (unit_type == PNG_RESOLUTION_METER) { -+ bitmap_data->image_flags |= ImageFlagsHasRealDPI; -+ bitmap_data->dpi_horz = res_x * 0.0254; -+ bitmap_data->dpi_vert = res_y * 0.0254; -+ } - } - #endif - /* default to screen resolution (if nothing was provided or available) */ -@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn - #if defined(PNG_iCCP_SUPPORTED) - { - png_charp name; -- png_charp profile; -+ png_bytep profile; - png_uint_32 proflen; - int compression_type; - -@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream - ImageFlags colourspace_flag; - int i; - int j; -+ png_colorp png_palette; -+ int png_num_palette; -+ png_bytep trans_alpha; -+ int num_trans; -+ png_color_16p trans_color; - - width = png_get_image_width (png_ptr, info_ptr); - height = png_get_image_height (png_ptr, info_ptr); -@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream - } - - /* Copy palette. */ -+ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); -+ - num_colours = 1 << bit_depth; - - if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) { -@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream - colourspace_flag = ImageFlagsColorSpaceRGB; - - palette_entries = num_colours; -- if (palette_entries > info_ptr->num_palette) { -- palette_entries = info_ptr->num_palette; -+ if (palette_entries > png_num_palette) { -+ palette_entries = png_num_palette; - } - - palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB)); -@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream - - for (i=0; i < palette_entries; i++) { - set_pixel_bgra (&palette->Entries[i], 0, -- info_ptr->palette[i].blue, -- info_ptr->palette[i].green, -- info_ptr->palette[i].red, -+ png_palette[i].blue, -+ png_palette[i].green, -+ png_palette[i].red, - 0xFF); /* alpha */ - } - } - -+ png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); - /* Make sure transparency is respected. */ -- if (info_ptr->num_trans > 0) { -+ if (num_trans > 0) { - palette->Flags |= PaletteFlagsHasAlpha; - colourspace_flag |= ImageFlagsHasAlpha; - -- if (info_ptr->num_trans > info_ptr->num_palette) { -- info_ptr->num_trans = info_ptr->num_palette; -+ if (num_trans > png_num_palette) { -+ num_trans = png_num_palette; - } - -- for (i=0; i < info_ptr->num_trans; i++) { -+ for (i=0; i < num_trans; i++) { - set_pixel_bgra(&palette->Entries[i], 0, -- info_ptr->palette[i].blue, -- info_ptr->palette[i].green, -- info_ptr->palette[i].red, -+ png_palette[i].blue, -+ png_palette[i].green, -+ png_palette[i].red, - #if PNG_LIBPNG_VER > 10399 -- info_ptr->trans_alpha [i]); /* alpha */ -+ trans_alpha [i]); /* alpha */ - #else - info_ptr->trans[i]); /* alpha */ - #endif -@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream - BYTE bit_depth; - int stride; - int interlace; -+ png_colorp png_palette; -+ int png_num_palette; - png_bytep *row_pointers; - BYTE *rawptr; - int i, j; -@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream - png_byte palette = 0; - png_byte pix = *rowp++; - -+ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); - palette = (pix >> 6) & 0x03; - set_pixel_bgra (rawptr, 0, -- info_ptr->palette[palette].blue, -- info_ptr->palette[palette].green, -- info_ptr->palette[palette].red, -+ png_palette[palette].blue, -+ png_palette[palette].green, -+ png_palette[palette].red, - 0xFF); /* alpha */ - - palette = (pix >> 4) & 0x03; - set_pixel_bgra (rawptr, 4, -- info_ptr->palette[palette].blue, -- info_ptr->palette[palette].green, -- info_ptr->palette[palette].red, -+ png_palette[palette].blue, -+ png_palette[palette].green, -+ png_palette[palette].red, - 0xFF); /* alpha */ - - palette = (pix >> 2) & 0x03; - set_pixel_bgra (rawptr, 8, -- info_ptr->palette[palette].blue, -- info_ptr->palette[palette].green, -- info_ptr->palette[palette].red, -+ png_palette[palette].blue, -+ png_palette[palette].green, -+ png_palette[palette].red, - 0xFF); /* alpha */ - - palette = pix & 0x03; - set_pixel_bgra (rawptr, 12, -- info_ptr->palette[palette].blue, -- info_ptr->palette[palette].green, -- info_ptr->palette[palette].red, -+ png_palette[palette].blue, -+ png_palette[palette].green, -+ png_palette[palette].red, - 0xFF); /* alpha */ - rawptr += 16; - } diff --git a/staging/libgnome-media-profiles/PKGBUILD b/staging/libgnome-media-profiles/PKGBUILD deleted file mode 100644 index 7844a833a..000000000 --- a/staging/libgnome-media-profiles/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 147671 2012-01-26 09:41:28Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=libgnome-media-profiles -pkgver=3.0.0 -pkgrel=3 -pkgdesc="Library for management of audio recording profiles" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL2') -depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins') -makedepends=('intltool' 'gnome-doc-utils') -options=('!emptydirs' '!libtool') -install=libgnome-media-profiles.install -source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --disable-static -disable-scrollkeeper \ - --disable-schemas-install - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-audio-profiles "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/libgnome-media-profiles/libgnome-media-profiles.install b/staging/libgnome-media-profiles/libgnome-media-profiles.install deleted file mode 100644 index 22b4c8f12..000000000 --- a/staging/libgnome-media-profiles/libgnome-media-profiles.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=libgnome-media-profiles - -post_install(){ - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/staging/libgnomecanvas/PKGBUILD b/staging/libgnomecanvas/PKGBUILD deleted file mode 100644 index 42ba98b4d..000000000 --- a/staging/libgnomecanvas/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147184 2012-01-24 03:06:37Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgnomecanvas -pkgver=2.30.3 -pkgrel=2 -pkgdesc="The GNOME Canvas library" -arch=(i686 x86_64) -license=('LGPL') -depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21') -makedepends=('pkg-config' 'intltool') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static \ - --enable-glade - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libgnomeui/PKGBUILD b/staging/libgnomeui/PKGBUILD deleted file mode 100644 index 1fd98234d..000000000 --- a/staging/libgnomeui/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 147218 2012-01-24 19:35:41Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgnomeui -pkgver=2.24.4 -pkgrel=2 -pkgdesc="User Interface library for GNOME" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.31.92' 'libsm') -makedepends=('intltool' 'pkg-config') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/libgnomeui - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD deleted file mode 100644 index 511feb174..000000000 --- a/staging/libgpod/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 147659 2012-01-26 02:50:58Z eric $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libgpod -pkgver=0.8.2 -pkgrel=3 -pkgdesc="A shared library to access the contents of an iPod" -arch=(i686 x86_64) -license=('LGPL') -depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') -makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') -optdepends=('gtk-sharp-2: Mono bindings') -url="http://www.gtkpod.org/libgpod/" -source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool' '!emptydirs') -md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-udev --with-python=/usr/bin/python2 - make PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR="${pkgdir}" install -} - diff --git a/staging/libgtkhtml/PKGBUILD b/staging/libgtkhtml/PKGBUILD deleted file mode 100644 index 15a82f102..000000000 --- a/staging/libgtkhtml/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147216 2012-01-24 19:34:31Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgtkhtml -pkgver=2.11.1 -pkgrel=4 -pkgdesc="An HTML library for GTK" -arch=(i686 x86_64) -license=('LGPL') -depends=('gtk2>=2.22.1' 'libxml2>=2.7.8') -makedepends=('perlxml') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a1d1a197dcff8c4571659deef5495e24') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libpano13/PKGBUILD b/staging/libpano13/PKGBUILD deleted file mode 100644 index c4d1054e6..000000000 --- a/staging/libpano13/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 146959 2012-01-19 17:50:13Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=libpano13 -pkgver=2.9.18 -pkgrel=2 -pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools" -arch=('i686' 'x86_64') -url="http://panotools.sourceforge.net/" -license=('GPL2') -depends=('libpng' 'libtiff') -makedepends=('openjdk6') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz) -md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME} - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libpng/PKGBUILD b/staging/libpng/PKGBUILD deleted file mode 100644 index 433f422dd..000000000 --- a/staging/libpng/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 146824 2012-01-18 19:24:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Travis Willard <travis@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=libpng -pkgver=1.5.7 -_apngver=1.5.7 -pkgrel=1 -pkgdesc="A collection of routines used to create PNG format graphics files" -arch=('i686' 'x86_64') -url="http://www.libpng.org/pub/png/libpng.html" -license=('custom') -depends=('zlib' 'sh') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d' - '6c6a674048cec94db1bc35decf0d142c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Add animated PNG (apng) support - # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - cd contrib/pngminus - make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png - install -m755 png2pnm pnm2png "$pkgdir/usr/bin/" - install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD deleted file mode 100644 index d9a941c88..000000000 --- a/staging/libreoffice/PKGBUILD +++ /dev/null @@ -1,917 +0,0 @@ -# $Id: PKGBUILD 147059 2012-01-21 10:23:48Z 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.5 -pkgrel=2 -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) -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') - -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 - - # 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/staging/libreoffice/PKGBUILD.next_stable b/staging/libreoffice/PKGBUILD.next_stable deleted file mode 100644 index a8cb4c5ad..000000000 --- a/staging/libreoffice/PKGBUILD.next_stable +++ /dev/null @@ -1,631 +0,0 @@ -# $Id: PKGBUILD 142692 2011-11-12 20:22:14Z ibiru $ -# 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-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder') -_LOver=3.4.99.3 -pkgver=3.5.0beta3 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' - #'saxon' - currently broken - # the runtime dependencies - "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' 'librsvg' - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' - '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" -_additional_source_url="http://dev-www.libreoffice.org/src" -source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.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}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - #${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810) -noextract=(053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 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 - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.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 -# cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 -) -md5sums=('3f223ec797a100e557f7138c8ab4a91b' - 'bb08c856e5c9a7a8bcf22fefdb7cf13f' - '83bd4be3370840de3e535b2c974e8af5' - 'f02578f5218f217a9f20e9c30e119c6a' - '053a35c244bf132f806e198ac4d960aa' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' - '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd') - -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 "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - cd ${srcdir}/libreoffice-core-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - ln -s ../libreoffice-help-$_LOver/helpcontent2 . - ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_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 - -# autoconf -f - - # non-SMP test build -# export MAKEFLAGS="-j1" - #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun - ./autogen.sh --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" \ - --disable-fetch-external \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ - --with-lang="" \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-gtk3 \ - --enable-lockdown\ - --enable-mergelibs \ - --enable-opengl \ - --enable-odk\ - --disable-ext-lightproof \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-librsvg=system \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-sampleicc \ - --without-system-libexttextcat \ - --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-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --disable-mozilla \ - --without-system-mozilla \ - --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ - --without-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mythes\ - --with-system-headers\ - --with-system-hsqldb \ - --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 - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ -#--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 - 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' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'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' - '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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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 - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install 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/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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' 'gtk2' 'gtk3') #'dbus-glib' - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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/sdk," \ - -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ - -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/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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}/libreoffice-core-$_LOver/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/libreoffice-core-$_LOver/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-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}/libreoffice-core-$_LOver/solver/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}/libreoffice-core-$_LOver/solver/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}/libreoffice-core-$_LOver/solver/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}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} diff --git a/staging/libreoffice/PKGBUILD.next_stable34 b/staging/libreoffice/PKGBUILD.next_stable34 deleted file mode 100644 index 5b9dec2ab..000000000 --- a/staging/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/staging/libreoffice/buildfix_boost.diff b/staging/libreoffice/buildfix_boost.diff deleted file mode 100644 index d8608d0d4..000000000 --- a/staging/libreoffice/buildfix_boost.diff +++ /dev/null @@ -1,40 +0,0 @@ -From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 05 Apr 2011 14:07:02 +0000 -Subject: silence some more of that annoying gcc#47679 - ---- -diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch -index 1c804aa..9b33a5f 100644 ---- a/boost/boost.gcc47679.patch -+++ b/boost/boost.gcc47679.patch -@@ -36,3 +36,26 @@ - template <int MaxDigits> - inline bool allow_more_digits(std::size_t i) - { -+--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -+@@ -31,6 +31,8 @@ -+ -+ #include "boost/optional/optional_fwd.hpp" -+ -++#include <string.h> -++ -+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) -+ // VC6.0 has the following bug: -+ // When a templated assignment operator exist, an implicit conversion -+@@ -114,6 +116,11 @@ -+ -+ public: -+ -++ aligned_storage() -++ { -++ memset(&dummy_, 0, sizeof(dummy_)); -++ } -++ -+ void const* address() const { return &dummy_.data[0]; } -+ void * address() { return &dummy_.data[0]; } -+ } ; --- -cgit v0.8.3-6-g21f6 - diff --git a/staging/libreoffice/buildfix_ct2n.diff b/staging/libreoffice/buildfix_ct2n.diff deleted file mode 100644 index 979587f79..000000000 --- a/staging/libreoffice/buildfix_ct2n.diff +++ /dev/null @@ -1,17 +0,0 @@ -From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 12 Apr 2011 19:35:51 +0000 -Subject: duplicate NULLs - ---- -diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst -index 91f44b7..714d926 100644 ---- a/ct2n/prj/build.lst -+++ b/ct2n/prj/build.lst -@@ -1,3 +1,3 @@ --ct2n ct2n : solenv NULL NULL -+ct2n ct2n : solenv NULL - ct2n ct2n usr1 - all ct2n_mkout NULL - ct2n ct2n nmake - all ct2n_ct2n NULL --- -cgit v0.8.3-6-g21f6 diff --git a/staging/libreoffice/gcc462_buildfix.diff b/staging/libreoffice/gcc462_buildfix.diff deleted file mode 100644 index c19e520dc..000000000 --- a/staging/libreoffice/gcc462_buildfix.diff +++ /dev/null @@ -1,138 +0,0 @@ ---- ./framework/source/accelerators/acceleratorcache.cxx.orig 2011-12-15 15:08:41.329168423 -0200 -+++ ./framework/source/accelerators/acceleratorcache.cxx 2011-12-15 15:17:59.473190664 -0200 -@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache() - AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) - : ThreadHelpBase(&Application::GetSolarMutex()) - { -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - } - -@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac - // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); - -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - - aWriteLock.unlock(); ---- ./framework/source/loadenv/loadenv.cxx.orig 2011-12-15 15:08:15.771487938 -0200 -+++ ./framework/source/loadenv/loadenv.cxx 2011-12-15 15:19:06.038358483 -0200 -@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const :: - // take over all new parameters. - m_xTargetFrame.clear(); - m_xBaseFrame = xBaseFrame ; -- m_lMediaDescriptor = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ m_lMediaDescriptor = tmp; - m_sTarget = sTarget ; - m_nSearchFlags = nSearchFlags ; - m_eFeature = eFeature ; ---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig 2011-12-15 15:08:49.033072112 -0200 -+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx 2011-12-15 15:11:07.209344668 -0200 -@@ -175,6 +175,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig 2011-12-19 11:10:56.000000000 +0000 -+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx 2011-12-19 11:12:06.000000000 +0000 -@@ -185,6 +185,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig 2011-12-19 11:14:17.000000000 +0000 -+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx 2011-12-19 11:15:16.000000000 +0000 -@@ -171,6 +171,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; - ---- ./padmin/source/prtsetup.cxx.orig 2011-12-15 15:09:05.133870823 -0200 -+++ ./padmin/source/prtsetup.cxx 2011-12-15 15:13:55.626239170 -0200 -@@ -813,7 +813,7 @@ extern "C" { - - if( aDialog.Execute() ) - { -- rJobData = aDialog.getSetup(); -+ rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() ); - nRet = 1; - } - ---- ./sfx2/source/doc/guisaveas.cxx.orig 2011-12-15 15:08:58.332955848 -0200 -+++ ./sfx2/source/doc/guisaveas.cxx 2011-12-15 15:12:39.953185212 -0200 -@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co - if ( aFilterName.getLength() ) - m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; - -- aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); -+ aFiltPropsHM << aFilterProps; - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); - } - ---- ./framework/inc/classes/filtercachedata.hxx.orig 2011-12-17 13:14:22.102898902 +0000 -+++ ./framework/inc/classes/filtercachedata.hxx 2011-12-17 13:17:51.524424012 +0000 -@@ -230,7 +230,7 @@ - { - bPreferred = rCopy.bPreferred ; - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - sMediaType = rCopy.sMediaType ; - sClipboardFormat = rCopy.sClipboardFormat; - nDocumentIconID = rCopy.nDocumentIconID ; -@@ -298,7 +298,7 @@ - nOrder = rCopy.nOrder ; - sName = rCopy.sName ; - sType = rCopy.sType ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - sDocumentService = rCopy.sDocumentService ; - sFilterService = rCopy.sFilterService ; - sUIComponent = rCopy.sUIComponent ; -@@ -405,7 +405,7 @@ - inline Loader& impl_copy( const Loader& rCopy ) - { - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - lTypes = rCopy.lTypes ; - return (*this); - } diff --git a/staging/libreoffice/libreoffice.install b/staging/libreoffice/libreoffice.install deleted file mode 100644 index cb0d393dd..000000000 --- a/staging/libreoffice/libreoffice.install +++ /dev/null @@ -1,50 +0,0 @@ -post_install() { - -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see https://wiki.archlinux.org/index.php/LibreOffice" -echo "-------------------------------------------------------------------" -echo "LibreOffice has been split into several packages:" -echo "- libreoffice-common" -echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" -echo "- libreoffice-{gnome,kde4} - desktop integration plugins" -echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" -echo " the LibreOffice APIs and for creating" -echo " extensions (UNO components)." -echo "-------------------------------------------------------------------" -echo " * you need to install at least one libreoffice-langpack" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what additional extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg - for spell checking" -echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" -} - -post_upgrade() { -# post_install $1 -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then - # important upgrade notice - echo "LibreOffice has been split into several packages:" - echo "- libreoffice-common" - echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" - echo "- libreoffice-{gnome,kde4} - desktop integration plugins" - echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" - echo " the LibreOffice APIs and for creating" - echo " extensions (UNO components)." - echo "Now you need to install at least one libreoffice-langpack!" - fi -} - -post_remove() { -update-desktop-database -q -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff b/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff deleted file mode 100644 index fd61cb4ca..000000000 --- a/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200 -+++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200 -@@ -92,10 +92,10 @@ - #endif - - #define BIN_FILE_BODY \ -- UnixRights = 555 -+ UnixRights = 755 - - #define TXT_FILE_BODY \ -- UnixRights = 444 -+ UnixRights = 644 - - #define USER_FILE_BODY \ - UnixRights = 644 diff --git a/staging/libreoffice/vbahelper.visibility.patch b/staging/libreoffice/vbahelper.visibility.patch deleted file mode 100644 index 5739100d0..000000000 --- a/staging/libreoffice/vbahelper.visibility.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 -+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 -@@ -238,7 +238,7 @@ - - // including a HelperInterface implementation - template< typename Ifc1 > --class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > -+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > - { - typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; - protected: ---- sc/Library_vbaobj.mk -+++ sc/Library_vbaobj.mk -@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbaquerytable \ - sc/source/ui/vba/vbarange \ - sc/source/ui/vba/vbasheetobject \ -- sc/source/ui/vba/vbasheetobjects \ - sc/source/ui/vba/vbastyle \ - sc/source/ui/vba/vbastyles \ - sc/source/ui/vba/vbatextboxshape \ -@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbawsfunction \ - )) - -+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ -+ sc/source/ui/vba/vbasheetobjects \ -+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -+)) -+ - ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) - $(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ diff --git a/staging/librsvg/PKGBUILD b/staging/librsvg/PKGBUILD deleted file mode 100644 index 90ffdcd13..000000000 --- a/staging/librsvg/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 146839 2012-01-18 20:16:37Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=librsvg -pkgver=2.34.2 -pkgrel=2 -pkgdesc="A SVG viewing library" -arch=(i686 x86_64) -license=('LGPL') -depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gtk2') -optdepends=('gtk2: for rsvg-view support') -options=('!libtool' '!emptydirs') -url="http://librsvg.sourceforge.net/" -install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) -sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ - --with-croco --disable-static \ - --with-svgz - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/librsvg/librsvg.install b/staging/librsvg/librsvg.install deleted file mode 100644 index 4d48b071f..000000000 --- a/staging/librsvg/librsvg.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/libtiff/PKGBUILD b/staging/libtiff/PKGBUILD deleted file mode 100644 index 16d6dded5..000000000 --- a/staging/libtiff/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 146823 2012-01-18 19:24:43Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=libtiff -pkgver=4.0.0 -pkgrel=1 -pkgdesc="Library for manipulation of TIFF images" -arch=('i686' 'x86_64') -url="http://www.remotesensing.org/libtiff/" -license=('custom') -depends=('libjpeg' 'zlib' 'xz') -makedepends=('freeglut') -optdepends=('freeglut: for using tiffgt') -options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522') - -build() { - cd "${srcdir}/tiff-${pkgver}" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/tiff-${pkgver}" - make check -} - -package() { - cd "${srcdir}/tiff-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/libunique3/PKGBUILD b/staging/libunique3/PKGBUILD deleted file mode 100644 index f641e0925..000000000 --- a/staging/libunique3/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 146851 2012-01-18 20:41:52Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -pkgname=libunique3 -pkgver=3.0.2 -pkgrel=2 -pkgdesc="Library for writing single instance applications for GTK3" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('gtk3') -makedepends=('gtk-doc' 'gobject-introspection') -options=('!libtool') -url="http://live.gnome.org/LibUnique" -source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz) -sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038') - -build() { - cd "$srcdir/libunique-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-dbus - make -} - -package() { - cd "$srcdir/libunique-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/libvisual-plugins/02_64-bit_JESS_fix.patch b/staging/libvisual-plugins/02_64-bit_JESS_fix.patch deleted file mode 100644 index 1d7f99e56..000000000 --- a/staging/libvisual-plugins/02_64-bit_JESS_fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c ---- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c 2006-02-06 05:47:26.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c 2007-07-04 18:12:58.000000000 +1000 -@@ -282,7 +282,7 @@ - - void render_deformation(JessPrivate *priv, int defmode) - { -- uint32_t bmax; -+ intptr_t bmax; - uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i; - uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux; - -@@ -294,7 +294,7 @@ - tab2 = priv->table2; - tab3 = priv->table3; - tab4 = priv->table4; -- bmax = priv->resx * priv->resy + (uint32_t) priv->pixel; -+ bmax = priv->resx * priv->resy + (intptr_t) priv->pixel; - - switch(defmode) - { -@@ -352,7 +352,7 @@ - } - for (i = 0; i < priv->resy * priv->resx; i++) - { -- aux = (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer); -+ aux = (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer); - *(pix++) = *(aux++) ; - *(pix++) = *(aux++); - *(pix++) = *(aux); -@@ -373,7 +373,8 @@ - /* j'ai mis pixel par defaut... */ - - uint8_t *pix = priv->pixel; -- uint32_t bmax,pitch_4; -+ intptr_t bmax; -+ uint32_t pitch_4; - - pix = priv->pixel; - if (priv->pixel == NULL) -@@ -387,7 +388,7 @@ - if (priv->video == 8) - { - if (visual_cpu_get_mmx ()) { -- bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel; -+ bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel; - #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) - __asm __volatile - ("\n\t pxor %%mm6, %%mm6" -@@ -423,7 +424,7 @@ - else - { - pitch_4 = priv->pitch+4; -- bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel; -+ bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel; - - if (visual_cpu_get_mmx ()) { - #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) diff --git a/staging/libvisual-plugins/03_build_against_gl_fixes.patch b/staging/libvisual-plugins/03_build_against_gl_fixes.patch deleted file mode 100644 index b21558232..000000000 --- a/staging/libvisual-plugins/03_build_against_gl_fixes.patch +++ /dev/null @@ -1,372 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am 2006-02-23 20:03:24.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_bumpscope.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_bumpscope_la_LDFLAGS = -module -avoid-version -+actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_bumpscope_la_SOURCES = actor_bumpscope.c \ - actor_bumpscope.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am 2006-02-23 20:03:24.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_corona.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CXXFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_corona_la_LDFLAGS = -module -avoid-version -+actor_corona_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_corona_la_SOURCES = actor_corona.cpp \ - autopal.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am 2006-02-24 00:34:48.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la - --LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version -+actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS) - - actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am 2006-02-23 20:03:27.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,14 +2,13 @@ - - actor_plugin_LTLIBRARIES = actor_gstreamer.la - --LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS) - - INCLUDES = $(all_includes) \ - -I$(top_srcdir) - - actor_gstreamer_la_LDFLAGS = -module -avoid-version -+actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) - - actor_gstreamer_la_SOURCES = actor_gstreamer.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am 2006-02-23 20:03:27.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_infinite.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_infinite_la_LDFLAGS = -module -avoid-version -+actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_infinite_la_SOURCES = compute.c compute.h \ - display.c display.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am 2006-02-23 20:03:28.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_jakdaw.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_jakdaw_la_LDFLAGS = -module -avoid-version -+actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_jakdaw_la_SOURCES = actor_jakdaw.c \ - actor_jakdaw.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am 2006-02-23 20:03:24.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_JESS.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_JESS_la_LDFLAGS = -module -avoid-version -+actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\ - distorsion.c distorsion.h\ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am 2006-02-23 20:03:28.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,14 +2,13 @@ - - actor_plugin_LTLIBRARIES = actor_lv_analyzer.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) \ - -I$(top_srcdir) - - actor_lv_analyzer_la_LDFLAGS = -module -avoid-version -+actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am 2006-02-24 22:24:49.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -4,5 +4,5 @@ - - actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) - actor_lv_gltest_la_LDFLAGS = -module -avoid-version --actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU -+actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU - actor_lv_gltest_la_SOURCES = actor_lv_gltest.c -diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am 2006-02-23 20:03:29.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_lv_scope.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_lv_scope_la_LDFLAGS = -module -avoid-version -+actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_lv_scope_la_SOURCES = actor_lv_scope.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am 2006-02-24 22:24:49.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -10,5 +10,5 @@ - - actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\" - actor_madspin_la_LDFLAGS = -module -avoid-version --actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -+actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL - actor_madspin_la_SOURCES = madspin.c -diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am 2006-02-24 22:24:50.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -4,5 +4,5 @@ - - actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) - actor_nastyfft_la_LDFLAGS = -module -avoid-version --actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU -+actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU - actor_nastyfft_la_SOURCES = actor_nastyfft.c -diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am 2006-02-23 20:03:31.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_oinksie.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_oinksie_la_LDFLAGS = -module -avoid-version -+actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_oinksie_la_SOURCES = actor_oinksie.c\ - oinksie.c oinksie.h\ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am 2006-03-09 00:06:58.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -4,7 +4,7 @@ - - actor_flower_la_LDFLAGS = -module -avoid-version - actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) --actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU -+actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU - - actor_flower_la_SOURCES = \ - actor_flower.c \ -diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am 2006-02-23 20:03:35.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,12 +2,11 @@ - - input_plugin_LTLIBRARIES = input_alsa.la - --LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) - - input_alsa_la_LDFLAGS = -module -avoid-version -+input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS) - - input_alsa_la_SOURCES = input_alsa.c -diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am 2006-02-23 20:03:36.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - input_plugin_LTLIBRARIES = input_debug.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) - - input_debug_la_LDFLAGS = -module -avoid-version -+input_debug_la_LIBADD = $(LIBVISUAL_LIBS) - input_debug_la_SOURCES = input_debug.c -diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am 2006-02-23 20:03:37.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - input_plugin_LTLIBRARIES = input_esd.la - --LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - input_esd_la_LDFLAGS = -module -avoid-version -+input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS) - input_esd_la_SOURCES = input_esd.c -diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am 2006-02-23 20:03:37.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - input_plugin_LTLIBRARIES = input_jack.la - --LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - input_jack_la_LDFLAGS = -module -avoid-version -+input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) - - input_jack_la_SOURCES = input_jack.c - -diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am 2006-02-23 20:03:38.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,12 +2,11 @@ - - input_plugin_LTLIBRARIES = input_mplayer.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - input_mplayer_la_LDFLAGS = -module -avoid-version -+input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS) - input_mplayer_la_SOURCES = input_mplayer.c - -diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am 2006-02-23 20:03:38.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_alphablend.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_alphablend_la_LDFLAGS = -module -avoid-version -+morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS) - morph_alphablend_la_SOURCES = morph_alphablend.c -diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am 2006-02-23 20:03:39.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_flash.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_flash_la_LDFLAGS = -module -avoid-version -+morph_flash_la_LIBADD = $(LIBVISUAL_LIBS) - morph_flash_la_SOURCES = morph_flash.c -diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am 2006-02-23 20:03:39.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_slide.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_slide_la_LDFLAGS = -module -avoid-version -+morph_slide_la_LIBADD = $(LIBVISUAL_LIBS) - morph_slide_la_SOURCES = morph_slide.c -diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am 2006-02-23 20:03:39.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_tentacle.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_tentacle_la_LDFLAGS = -module -avoid-version -+morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS) - morph_tentacle_la_SOURCES = morph_tentacle.c diff --git a/staging/libvisual-plugins/04_lv_analyzer_build_fix.patch b/staging/libvisual-plugins/04_lv_analyzer_build_fix.patch deleted file mode 100644 index 1fc5f7fc7..000000000 --- a/staging/libvisual-plugins/04_lv_analyzer_build_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac ---- libvisual-plugins-0.4.0/configure.ac 2006-03-17 03:50:41.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/configure.ac 2007-07-04 18:22:38.000000000 +1000 -@@ -361,7 +361,7 @@ - [ENABLE_ANALYZER=$enableval], - [ENABLE_ANALYZER=yes]) - --if test "$ENABLE_ANALYZER" = xyes; then -+if test "$ENABLE_ANALYZER" = "yes"; then - build_actor_plugins="$build_actor_plugins lv_analyzer" - fi - diff --git a/staging/libvisual-plugins/050_all_automagic.patch b/staging/libvisual-plugins/050_all_automagic.patch deleted file mode 100644 index 9c25fac72..000000000 --- a/staging/libvisual-plugins/050_all_automagic.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- configure.ac.old 2007-02-24 23:09:08.000000000 +0100 -+++ configure.ac 2007-02-24 23:13:15.000000000 +0100 -@@ -89,7 +89,18 @@ - - dnl Libraries - -+dnl List of plugins to build -+build_input_plugins="" -+build_actor_plugins="" -+build_morph_plugins="" -+ - dnl EsounD -+AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd], -+ [Do not build esound input plugin @<:@default=enabled@:>@]), -+ [ENABLE_INPUT_ESD=$enableval], -+ [ENABLE_INPUT_ESD=yes]) -+ -+if test "$ENABLE_INPUT_ESD" = "yes"; then - PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version], - [HAVE_ESD="yes"], [HAVE_ESD="no"]) - -@@ -98,8 +109,15 @@ - else - AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built]) - fi -+fi - - dnl JACK -+AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack], -+ [Do not build jack input plugin @<:@default=enabled@:>@]), -+ [ENABLE_INPUT_JACK=$enableval], -+ [ENABLE_INPUT_JACK=yes]) -+ -+if test "$ENABLE_INPUT_JACK" = "yes"; then - PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"]) - if test "$HAVE_JACK" = "yes"; then - build_input_plugins="$build_input_plugins jack" -@@ -107,11 +125,7 @@ - AC_MSG_WARN([*** libjack is too old. You can download a newer version at - http://jackit.sf.net/. The jackit input plugin won't be built]) - fi -- --dnl List of plugins to build --build_input_plugins="" --build_actor_plugins="" --build_morph_plugins="" -+fi - - dnl GdkPixbuf - AC_ARG_ENABLE([gdkpixbuf-plugin], diff --git a/staging/libvisual-plugins/05_fix_po.patch b/staging/libvisual-plugins/05_fix_po.patch deleted file mode 100644 index a5413ef1b..000000000 --- a/staging/libvisual-plugins/05_fix_po.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in ---- libvisual-plugins-0.4.0/po/Makefile.in.in 2006-03-21 05:48:28.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/po/Makefile.in.in 2007-07-09 21:50:13.000000000 +1000 -@@ -28,7 +28,7 @@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKINSTALLDIRS = mkinstalldirs - mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - - GMSGFMT = @GMSGFMT@ -diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs ---- libvisual-plugins-0.4.0/po/mkinstalldirs 1970-01-01 10:00:00.000000000 +1000 -+++ libvisual-plugins-0.4.0.new/po/mkinstalldirs 2006-03-21 05:48:42.000000000 +1100 -@@ -0,0 +1,111 @@ -+#! /bin/sh -+# mkinstalldirs --- make directory hierarchy -+# Author: Noah Friedman <friedman@prep.ai.mit.edu> -+# Created: 1993-05-16 -+# Public domain -+ -+errstatus=0 -+dirmode="" -+ -+usage="\ -+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." -+ -+# process command line arguments -+while test $# -gt 0 ; do -+ case $1 in -+ -h | --help | --h*) # -h for help -+ echo "$usage" 1>&2 -+ exit 0 -+ ;; -+ -m) # -m PERM arg -+ shift -+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } -+ dirmode=$1 -+ shift -+ ;; -+ --) # stop option processing -+ shift -+ break -+ ;; -+ -*) # unknown option -+ echo "$usage" 1>&2 -+ exit 1 -+ ;; -+ *) # first non-opt arg -+ break -+ ;; -+ esac -+done -+ -+for file -+do -+ if test -d "$file"; then -+ shift -+ else -+ break -+ fi -+done -+ -+case $# in -+ 0) exit 0 ;; -+esac -+ -+case $dirmode in -+ '') -+ if mkdir -p -- . 2>/dev/null; then -+ echo "mkdir -p -- $*" -+ exec mkdir -p -- "$@" -+ fi -+ ;; -+ *) -+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then -+ echo "mkdir -m $dirmode -p -- $*" -+ exec mkdir -m "$dirmode" -p -- "$@" -+ fi -+ ;; -+esac -+ -+for file -+do -+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` -+ shift -+ -+ pathcomp= -+ for d -+ do -+ pathcomp="$pathcomp$d" -+ case $pathcomp in -+ -*) pathcomp=./$pathcomp ;; -+ esac -+ -+ if test ! -d "$pathcomp"; then -+ echo "mkdir $pathcomp" -+ -+ mkdir "$pathcomp" || lasterr=$? -+ -+ if test ! -d "$pathcomp"; then -+ errstatus=$lasterr -+ else -+ if test ! -z "$dirmode"; then -+ echo "chmod $dirmode $pathcomp" -+ lasterr="" -+ chmod "$dirmode" "$pathcomp" || lasterr=$? -+ -+ if test ! -z "$lasterr"; then -+ errstatus=$lasterr -+ fi -+ fi -+ fi -+ fi -+ -+ pathcomp="$pathcomp/" -+ done -+done -+ -+exit $errstatus -+ -+# Local Variables: -+# mode: shell-script -+# sh-indentation: 2 -+# End: -+# mkinstalldirs ends here diff --git a/staging/libvisual-plugins/PKGBUILD b/staging/libvisual-plugins/PKGBUILD deleted file mode 100644 index e5051502d..000000000 --- a/staging/libvisual-plugins/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 147964 2012-01-29 05:21:10Z eric $ -# Maintainer: damir <damir@archlinux.org> - -pkgname=libvisual-plugins -pkgver=0.4.0 -pkgrel=5 -pkgdesc="plugins for libvisual" -arch=("i686" "x86_64") -license=('GPL') -url="http://www.localhost.nl/~synap/libvisual/" -depends=('libvisual' 'gtk2' 'mesa' 'alsa-lib' 'jack') -makedepends=('pkgconfig' 'namcap') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz - 02_64-bit_JESS_fix.patch - 03_build_against_gl_fixes.patch - 04_lv_analyzer_build_fix.patch - 05_fix_po.patch - 050_all_automagic.patch) -md5sums=('4330e9287f9d6fae02f482f428a1e77b' - 'f9cfb607bfcbfef60830fae4e7dc6963' - '116701408747dbb87dc134434478ebe2' - '01678a8f1584c76a44e59d81003a1109' - '6189b7427c4e11c8b8d6c6266d6a1629' - 'b50ae94c424a5f0af235deffa8451eb6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch" - patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch" - patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch" - patch -Np0 -i "${srcdir}/050_all_automagic.patch" - - autoreconf -fi - # Apply later as autoreconf overwrites po/Makefile.in.in - patch -Np1 -i "${srcdir}/05_fix_po.patch" - - ./configure --prefix=/usr \ - --disable-gstreamer-plugin \ - --disable-gforce \ - --disable-esd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libwebkit/PKGBUILD b/staging/libwebkit/PKGBUILD deleted file mode 100644 index 389f67bb5..000000000 --- a/staging/libwebkit/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 147026 2012-01-20 21:25:43Z eric $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=libwebkit -pkgname=(libwebkit libwebkit3) -pkgver=1.6.1 -pkgrel=2 -pkgdesc="An opensource web content engine" -arch=('i686' 'x86_64') -url="http://webkitgtk.org/" -license=('custom') -depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') -makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') -options=('!libtool' '!emptydirs') -install=libwebkit.install -source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz) -md5sums=('c11743694b1b71dad287b2e7a9e73b05') - -build() { - cd "${srcdir}/webkit-${pkgver}" - mkdir build-gtk{2,3} - - ( cd build-gtk2 && _build --with-gtk=2.0 ) - ( cd build-gtk3 && _build --with-gtk=3.0 ) -} - -_build() { - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ - --enable-introspection \ - --with-font-backend=freetype --enable-gtk-doc \ - --with-unicode-backend=icu \ - --enable-spellcheck "$@" - make all stamp-po -} - -package_libwebkit() { - pkgdesc+=" (for GTK2)" - depends+=(gtk2) - - cd "$srcdir/webkit-$pkgver/build-gtk2" - make DESTDIR="${pkgdir}" install - install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE" -} - -package_libwebkit3() { - pkgdesc+=" (for GTK3)" - depends+=(gtk3) - - cd "${srcdir}/webkit-${pkgver}/build-gtk3" - make DESTDIR="${pkgdir}" install - install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE" -} diff --git a/staging/libwebkit/libwebkit.install b/staging/libwebkit/libwebkit.install deleted file mode 100644 index 24072f316..000000000 --- a/staging/libwebkit/libwebkit.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/libwmf/PKGBUILD b/staging/libwmf/PKGBUILD deleted file mode 100644 index 0222a1832..000000000 --- a/staging/libwmf/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 146861 2012-01-18 21:36:12Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=libwmf -pkgver=0.2.8.4 -pkgrel=9 -pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" -arch=('i686' 'x86_64') -url="http://wvware.sourceforge.net/libwmf.html" -license=('LGPL') -depends=('libpng' 'libx11' 'libjpeg' 'gsfonts') -makedepends=('gtk2' 'libxt') -optdepends=('gdk-pixbuf2: for pixbuf loader') -options=('!libtool' '!docs' '!emptydirs') -install=libwmf.install -source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz - libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) -sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' - '42aa4c2a82e4e14044c875a7f439baea732a355a' - 'ea6d28880840e86c96f9079bfd591da54dcffa5c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" - patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" - ./configure --prefix=/usr \ - --with-gsfontdir=/usr/share/fonts/Type1 \ - --with-fontdir=/usr/share/fonts/Type1 \ - --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - #Remove fonts, these are in gsfonts - rm -rf "${pkgdir}/usr/share/fonts" - #Remove static GTK loader, can't use it anyways - rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a -} diff --git a/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch b/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch deleted file mode 100644 index 3528c74eb..000000000 --- a/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h ---- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000 +0200 -+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200 -@@ -66,7 +66,7 @@ - return; - } - -- if (setjmp (png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)"); - png_destroy_write_struct (&png_ptr,&info_ptr); - wmf_free (API,buffer); diff --git a/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch b/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch deleted file mode 100644 index 328c5411f..000000000 --- a/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list 2009-04-24 04:06:44.000000000 -0400 -+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 2009-04-24 04:08:30.000000000 -0400 -@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe - { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); - if (more == 0) return; - im->clip->max += 8; -+ im->clip->list = more; - } - im->clip->list[im->clip->count] = (*rect); - im->clip->count++; diff --git a/staging/libwmf/libwmf.install b/staging/libwmf/libwmf.install deleted file mode 100644 index 9c99a901b..000000000 --- a/staging/libwmf/libwmf.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then - gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/libxfcegui4/PKGBUILD b/staging/libxfcegui4/PKGBUILD deleted file mode 100644 index d00dda2c5..000000000 --- a/staging/libxfcegui4/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 146865 2012-01-18 23:54:43Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Tobias Kieslich <tobias funnychar archlinux.org> - -pkgname=libxfcegui4 -pkgver=4.8.1 -pkgrel=4 -pkgdesc="Various Gtk widgets for Xfce" -arch=('i686' 'x86_64') -url="http://www.xfce.org/" -license=('GPL2') -depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' - 'hicolor-icon-theme') -makedepends=('intltool') -options=('!libtool') -install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) -sha256sums=('309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/libxfcegui4/libxfcegui4.install b/staging/libxfcegui4/libxfcegui4.install deleted file mode 100644 index abf924aa2..000000000 --- a/staging/libxfcegui4/libxfcegui4.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - - -# vim:set ts=2 sw=2 et: diff --git a/staging/links/PKGBUILD b/staging/links/PKGBUILD deleted file mode 100644 index 185990ac7..000000000 --- a/staging/links/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 146834 2012-01-18 20:01:18Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=links -pkgver=2.5 -pkgrel=1 -pkgdesc="A text WWW browser, similar to Lynx" -arch=('i686' 'x86_64') -url="http://links.twibright.com/" -license=('GPL') -depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm') -makedepends=('libtiff' 'libpng' 'libxt') -optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') -provides=('links-g') -conflicts=('links-g') -replaces=('links-g') -source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) -sha1sums=('fe4bc37be8aebd9196c35ffef724435cea94349c' - 'f600e27c2a71184444f7dd07a10230aa44463a02') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - (cd intl; ./gen-intl; ./synclang) - ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ - --enable-graphics --with-x --with-fb - make - mv links xlinks - - ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ - --disable-graphics --without-x --without-fb - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 xlinks "${pkgdir}/usr/bin/xlinks" - ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz" - - install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop" - install -d "${pkgdir}/usr/share/pixmaps" - install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/" - - install -d "${pkgdir}/usr/share/doc/links/calibration" - install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/" -} diff --git a/staging/links/links.desktop b/staging/links/links.desktop deleted file mode 100644 index 9d6338a5b..000000000 --- a/staging/links/links.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Links -Exec=xlinks -g -Icon=links_32x32.xpm -Type=Application -Terminal=false -Categories=Network;WebBrowser; diff --git a/staging/mail-notification/PKGBUILD b/staging/mail-notification/PKGBUILD deleted file mode 100644 index 2867010e9..000000000 --- a/staging/mail-notification/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 146578 2012-01-13 20:32:35Z ibiru $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> - -pkgname=mail-notification -pkgver=5.4 -pkgrel=10 -pkgdesc="Tray icon application that informs you if you have new mail" -arch=('i686' 'x86_64') -url="http://www.nongnu.org/mailnotify/" -license=('GPL3' 'FDL') -depends=('gmime' 'libnotify' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') -makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2') -options=('!libtool' '!emptydirs') -install=mail-notification.install -source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2 - dont-update-cache.patch - remove-ubuntu-special-case.patch - mail-notification-5.4-evolution.patch - mail-notification-5.4-sasl_encode64.patch - mail-notification-5.4-evolution-gtkhtml.patch - mail-notification-5.4-camel_headers.patch - mail-notification-5.4-icons.patch - mail-notification-5.4-weak.patch - mail-notification-5.4-popup-attach.patch - mail-notification-5.4-kde-trayicon.patch - mail-notification-5.4-evolution-3-0-support.patch - mail-notification-5.4-gtk3-support.patch - mail-notification-5.4-add-fallback-icon.patch - mail-notification-5.4-gmime.patch - mail-notification-5.4-libx11.patch) -md5sums=('c8dc33a61251acb5474e56eab6b18f43' - '6007bc30e789dab0a8282038e0335eb9' - '9cadd61bbd9c324b2916ec980231e0f2' - 'aa6f80820899f904c25988772f70ade9' - '125513ed059f62469377eb0ab794dbed' - 'c595a3962ab13a65be24a941e28faa9c' - 'f79939f593b2e8659e302df72c2b54b1' - '244b7ef2aec7656e8df390be87c10e2b' - '31bde95dfd39449959d8b3316f91429c' - 'cdead6a88d1779f69a5f40dc75d5cb84' - 'c7991b831834724eddc1c6802c3e06a6' - 'b370b1085ebb2814bd5d345a6d2b45ea' - '1ba948759110787dd57097cff157b75a' - '09df61b4dc29c676ac81ff9054e840ac' - '0944695e9b9b30f39028f85c83c6a7e2' - 'c3f643ef16aab3b4fe9ff5b333bff41a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np0 -i "${srcdir}/dont-update-cache.patch" - patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-sasl_encode64.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution-gtkhtml.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-camel_headers.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-icons.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-weak.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-popup-attach.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-kde-trayicon.patch" - patch -Np0 -i "${srcdir}/mail-notification-5.4-evolution-3-0-support.patch" - patch -Np0 -i "${srcdir}/mail-notification-5.4-gtk3-support.patch" - patch -Np0 -i "${srcdir}/mail-notification-5.4-add-fallback-icon.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-gmime.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-libx11.patch" - - gtk-builder-convert ui/mailbox-properties-dialog.glade ui/mailbox-properties-dialog.ui - gtk-builder-convert ui/properties-dialog.glade ui/properties-dialog.ui - - ./jb configure prefix=/usr sysconfdir=/etc \ - localstatedir=/var destdir="${pkgdir}" \ - gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=no \ - cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \ - library-mode=0755 - ./jb build - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./jb install - - rm -f "${pkgdir}/usr/share/mail-notification/"*.glade - install -m644 ui/mailbox-properties-dialog.ui "${pkgdir}/usr/share/mail-notification/" - install -m644 ui/properties-dialog.ui "${pkgdir}/usr/share/mail-notification/" - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain mail-notification ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/staging/mail-notification/dont-update-cache.patch b/staging/mail-notification/dont-update-cache.patch deleted file mode 100644 index 81216835e..000000000 --- a/staging/mail-notification/dont-update-cache.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- jbsrc/jb.c.~1~ 2008-03-20 16:53:02.000000000 +0100 -+++ jbsrc/jb.c 2008-03-26 20:51:45.641363619 +0100 -@@ -327,7 +327,6 @@ - jb_package_add_resources (void) - { - JBGroup *group; -- JBRule *rule; - JBObject *object; - - if (jb_variable_get_bool("compile-warnings")) -@@ -362,11 +361,6 @@ - if (jb_variable_get_bool("hotmail")) - jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir"); - -- rule = jb_rule_new(); -- jb_rule_set_install_message(rule, "updating the GTK+ icon cache"); -- jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor"); -- jb_group_add_resource(group, JB_GROUP_RESOURCE(rule)); -- - jb_group_add(group); - - /*** data ******************************************************************/ diff --git a/staging/mail-notification/mail-notification-5.4-add-fallback-icon.patch b/staging/mail-notification/mail-notification-5.4-add-fallback-icon.patch deleted file mode 100644 index 41c28e870..000000000 --- a/staging/mail-notification/mail-notification-5.4-add-fallback-icon.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/mn-stock.c.orig 2011-02-17 17:42:39.886767087 +0100 -+++ src/mn-stock.c 2011-02-17 17:49:37.415541177 +0100 -@@ -86,6 +86,13 @@ - gtk_icon_source_set_icon_name(icon_source, icons[i].icon_name); - gtk_icon_set_add_source(icon_set, icon_source); - gtk_icon_source_free(icon_source); -+ -+ /* Add a fallback icon */ -+ icon_source = gtk_icon_source_new(); -+ gtk_icon_source_set_icon_name(icon_source, "mail-notification"); -+ gtk_icon_source_set_state_wildcarded(icon_source, TRUE); -+ gtk_icon_set_add_source(icon_set, icon_source); -+ gtk_icon_source_free(icon_source); - } - else if (icons[i].source_stock_id) - { diff --git a/staging/mail-notification/mail-notification-5.4-camel_headers.patch b/staging/mail-notification/mail-notification-5.4-camel_headers.patch deleted file mode 100644 index 861e3d215..000000000 --- a/staging/mail-notification/mail-notification-5.4-camel_headers.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-message.c mail-notification-5.4-OK/build/src/mn-evolution-message.c ---- mail-notification-5.4/build/src/mn-evolution-message.c 2008-05-22 19:47:51.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-message.c 2010-05-04 18:13:31.000000000 +0400 -@@ -25,7 +25,7 @@ - #line 24 "src/mn-evolution-message.gob" - - #include <glib/gi18n.h> --#include <camel/camel-folder-summary.h> -+#include <camel/camel.h> - #include "mn-evolution-mailbox.h" - #include "mn-message-private.h" - #include "mn-evolution-client.h" -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c ---- mail-notification-5.4/build/src/mn-evolution-server.c 2010-05-04 18:12:56.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c 2010-05-04 18:13:39.000000000 +0400 -@@ -28,7 +28,7 @@ - #include <libintl.h> - #include <gobject/gvaluecollector.h> - #include <libedataserver/eds-version.h> --#include <camel/camel-folder.h> -+#include <camel/camel.h> - #if EDS_CHECK_VERSION(2,29,0) - #include <shell/e-shell.h> - #include <mail/e-mail-browser.h> -diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c ---- mail-notification-5.4/src/mn-evolution-plugin.c 2010-05-04 18:12:56.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c 2010-05-04 18:13:20.000000000 +0400 -@@ -24,7 +24,7 @@ - #include <dbus/dbus.h> - #include <dbus/dbus-glib-lowlevel.h> - #include <dbus/dbus-glib-bindings.h> --#include <camel/camel-folder.h> -+#include <camel/camel.h> - #include <mail/em-event.h> - #include <mail/mail-tools.h> - #include "mn-evolution.h" diff --git a/staging/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/staging/mail-notification/mail-notification-5.4-evolution-3-0-support.patch deleted file mode 100644 index 51938b5fa..000000000 --- a/staging/mail-notification/mail-notification-5.4-evolution-3-0-support.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- jbsrc/lib/src/extras/jb-evolution-plugin.c.evolution30 2011-02-02 00:09:33.945696868 +0100 -+++ jbsrc/lib/src/extras/jb-evolution-plugin.c 2011-02-02 00:28:09.096275028 +0100 -@@ -41,7 +41,7 @@ - if (! minversion) - minversion = "2.12"; - -- packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion); -+ packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion); - result = jb_check_packages("Evolution", "evolution-plugin", packages); - g_free(packages); - -@@ -53,7 +53,7 @@ - char *plugindir; - - jb_message_checking("for the Evolution plugin directory"); -- plugindir = jb_get_package_variable("evolution-plugin", "plugindir"); -+ plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir"); - jb_message_result_string(plugindir ? plugindir : "not found"); - - if (! plugindir) ---- src/mn-evolution-plugin.c.orig 2011-02-09 00:07:37.422002566 +0100 -+++ src/mn-evolution-plugin.c 2011-02-09 00:12:43.652678682 +0100 -@@ -25,6 +25,7 @@ - #include <dbus/dbus-glib-lowlevel.h> - #include <dbus/dbus-glib-bindings.h> - #include <camel/camel.h> -+#include <libedataserver/eds-version.h> - #include <mail/em-event.h> - #include <mail/mail-tools.h> - #include "mn-evolution.h" -@@ -240,7 +241,11 @@ - EMEventTargetFolder *folder) - { - if (evo_server) -+#if EDS_CHECK_VERSION(3,1,0) -+ mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name)); -+#else - mn_evolution_server_folder_changed(evo_server, folder->uri); -+#endif - } - - void -@@ -249,10 +250,16 @@ - { - if (evo_server) - { -- char *url; -+#if EDS_CHECK_VERSION(2,91,0) -+ const char *url = camel_folder_get_uri(message->folder); -+#else -+ char *url = mail_tools_folder_to_url(message->folder); -+#endif - -- url = mail_tools_folder_to_url(message->folder); - mn_evolution_server_message_reading(evo_server, url); -+ -+#if !EDS_CHECK_VERSION(2,91,0) - g_free(url); -+#endif - } - } ---- build/src/mn-evolution-server.c.orig 2011-02-09 00:17:38.850944227 +0100 -+++ build/src/mn-evolution-server.c 2011-02-09 22:21:54.155346478 +0100 -@@ -496,11 +496,15 @@ - - if (! folder) - { -- folder = mail_tool_uri_to_folder(uri, 0, - #if EDS_CHECK_VERSION(2,91,0) -- NULL, -+ static EMailSession * session = NULL; -+ if (!session) -+ session = e_mail_session_new(); -+ -+ folder = e_mail_session_uri_to_folder_sync(session, uri, 0, NULL, NULL); -+#else -+ folder = mail_tool_uri_to_folder(uri, 0, NULL); - #endif -- NULL); - if (folder) - self_cache_folder(uri, folder); - else -@@ -677,7 +681,12 @@ - folder = self_lookup_folder(folder_uri, err); - if (folder) - { -+#if EDS_CHECK_VERSION(3,1,0) -+ *ret = g_strdup(camel_folder_get_display_name(folder)); -+#else - *ret = g_strdup(camel_folder_get_name(folder)); -+#endif -+ - #if EDS_CHECK_VERSION(2,31,0) - g_object_unref(folder); - #else -@@ -725,8 +734,12 @@ - shell = e_shell_get_default (); - shell_backend = e_shell_get_backend_by_name (shell, "mail"); - -- browser = e_mail_browser_new (shell_backend); -+ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend)); -+#if EDS_CHECK_VERSION(3,1,0) -+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder); -+#else - e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); -+#endif - e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); - gtk_widget_show (browser); - #else ---- build/src/mn-evolution-folder-tree-server.c.orig 2011-06-17 22:01:49.226886994 +0200 -+++ build/src/mn-evolution-folder-tree-server.c 2011-06-18 00:34:23.046889847 +0200 -@@ -444,7 +444,9 @@ - { - #line 61 "src/mn-evolution-folder-tree-server.gob" - --#if EDS_CHECK_VERSION(2,91,0) -+#if EDS_CHECK_VERSION(3,1,0) -+ selfp->tree = em_folder_tree_new(NULL, NULL); -+#elif EDS_CHECK_VERSION(2,91,0) - selfp->session = e_mail_session_new(); - selfp->tree = em_folder_tree_new(selfp->session); - #elif EDS_CHECK_VERSION(2,29,0) diff --git a/staging/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch b/staging/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch deleted file mode 100644 index 283ef36d6..000000000 --- a/staging/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c ---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c 2008-04-27 18:47:43.000000000 +0400 -+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c 2009-08-21 19:48:22.000000000 +0400 -@@ -41,7 +41,7 @@ - if (! minversion) - minversion = "2.12"; - -- packages = g_strdup_printf("evolution-plugin >= %s", minversion); -+ packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion); - result = jb_check_packages("Evolution", "evolution-plugin", packages); - g_free(packages); - diff --git a/staging/mail-notification/mail-notification-5.4-evolution.patch b/staging/mail-notification/mail-notification-5.4-evolution.patch deleted file mode 100644 index 87514c22d..000000000 --- a/staging/mail-notification/mail-notification-5.4-evolution.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c ---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c 2008-05-22 19:47:48.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c 2010-10-12 16:50:15.000000000 +0400 -@@ -25,7 +25,10 @@ - #line 24 "src/mn-evolution-folder-tree-server.gob" - - #include <dbus/dbus.h> -+#include <libedataserver/eds-version.h> -+#if !EDS_CHECK_VERSION(2,29,0) - #include <mail/mail-component.h> -+#endif - #include <mail/em-folder-tree.h> - #include "mn-evolution-plugin.h" - #include "mn-evolution.h" -@@ -441,10 +444,17 @@ - { - #line 61 "src/mn-evolution-folder-tree-server.gob" - -+#if EDS_CHECK_VERSION(2,91,0) -+ selfp->session = e_mail_session_new(); -+ selfp->tree = em_folder_tree_new(selfp->session); -+#elif EDS_CHECK_VERSION(2,29,0) -+ selfp->tree = em_folder_tree_new(); -+#else - EMFolderTreeModel *model; - - model = mail_component_peek_tree_model(mail_component_peek()); - selfp->tree = em_folder_tree_new_with_model(model); -+#endif - - selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id); - gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree); -@@ -469,6 +479,10 @@ - { - #line 80 "src/mn-evolution-folder-tree-server.gob" - -+#if EDS_CHECK_VERSION(2,91,0) -+ g_object_unref(selfp->session); -+ selfp->session = NULL; -+#endif - g_signal_handlers_disconnect_by_func(selfp->plug, self_plug_destroy_h, self); - }} - #line 475 "mn-evolution-folder-tree-server.c" -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c ---- mail-notification-5.4/build/src/mn-evolution-server.c 2008-05-22 19:47:48.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c 2010-10-12 16:50:40.000000000 +0400 -@@ -27,12 +27,22 @@ - #include <stdio.h> - #include <libintl.h> - #include <gobject/gvaluecollector.h> -+#include <libedataserver/eds-version.h> - #include <camel/camel-folder.h> -+#if EDS_CHECK_VERSION(2,29,0) -+#include <shell/e-shell.h> -+#include <mail/e-mail-browser.h> -+#else - #include <mail/em-folder-view.h> - #include <mail/em-format.h> - #include <mail/em-message-browser.h> -+#endif - #include <mail/em-utils.h> -+#if EDS_CHECK_VERSION(2,91,0) -+#include <mail/e-mail-session.h> -+#else - #include <mail/mail-session.h> -+#endif - #include <mail/mail-tools.h> - #include "mn-evolution.h" - #include "mn-evolution-folder-tree-server.h" -@@ -391,10 +397,18 @@ - info = g_new0(FolderInfo, 1); - info->uri = g_strdup(uri); - info->folder = folder; -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_ref(folder); -+#else - camel_object_ref(folder); -+#endif - - /* uncache the folder when it is deleted */ -+#if EDS_CHECK_VERSION(2,31,0) -+ g_signal_connect(folder, "deleted", G_CALLBACK(self_folder_deleted_cb), info); -+#else - camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info); -+#endif - - g_hash_table_replace(folders, info->uri, info); - }} -@@ -413,8 +427,13 @@ - { - #line 105 "src/mn-evolution-server.gob" - -+#if EDS_CHECK_VERSION(2,31,0) -+ g_signal_handlers_disconnect_by_func(info->folder, self_folder_deleted_cb, info); -+ g_object_unref(info->folder); -+#else - camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info); - camel_object_unref(info->folder); -+#endif - g_free(info->uri); - g_free(info); - }} -@@ -461,7 +480,11 @@ - if (info) - { - folder = info->folder; -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_ref(folder); -+#else - camel_object_ref(folder); -+#endif - } - } - else -@@ -469,7 +492,11 @@ - - if (! folder) - { -- folder = mail_tool_uri_to_folder(uri, 0, NULL); -+ folder = mail_tool_uri_to_folder(uri, 0, -+#if EDS_CHECK_VERSION(2,91,0) -+ NULL, -+#endif -+ NULL); - if (folder) - self_cache_folder(uri, folder); - else -@@ -595,14 +622,23 @@ - - for (i = 0; i < summary->len; i++) - { -+#if EDS_CHECK_VERSION(2,23,5) -+ char *uid = summary->pdata[i]; -+ CamelMessageInfo *info = camel_folder_get_message_info(folder, uid); -+#else - CamelMessageInfo *info = summary->pdata[i]; -+#endif - - if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0) - g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info)); - } - - camel_folder_free_summary(folder, summary); -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - } - - GDK_THREADS_LEAVE(); -@@ -638,7 +674,11 @@ - if (folder) - { - *ret = g_strdup(camel_folder_get_name(folder)); -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - } - - GDK_THREADS_LEAVE(); -@@ -673,6 +713,19 @@ - folder = self_lookup_folder(folder_uri, err); - if (folder) - { -+#if EDS_CHECK_VERSION(2,29,0) -+ EShell *shell; -+ EShellBackend *shell_backend; -+ GtkWidget *browser; -+ -+ shell = e_shell_get_default (); -+ shell_backend = e_shell_get_backend_by_name (shell, "mail"); -+ -+ browser = e_mail_browser_new (shell_backend); -+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); -+ e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); -+ gtk_widget_show (browser); -+#else - GtkWidget *browser; - - /* modelled after Evolution's handleuri_got_folder() */ -@@ -683,8 +736,13 @@ - em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri); - em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE); - gtk_widget_show(((EMMessageBrowser *) browser)->window); -+#endif - -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - } - - GDK_THREADS_LEAVE(); -@@ -721,7 +779,11 @@ - if (folder) - { - status = camel_folder_set_message_flags(folder, message_uid, flags, flags); -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - - if (! status) - g_set_error(err, -diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c ---- mail-notification-5.4/src/mn-evolution-plugin.c 2008-05-22 19:45:35.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c 2010-10-12 16:50:15.000000000 +0400 -@@ -204,7 +204,7 @@ - } - - int --e_plugin_lib_enable (EPluginLib *ep, int enable) -+e_plugin_lib_enable (EPlugin *ep, int enable) - { - static gboolean enabled = FALSE; - GError *err = NULL; ---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.orig 2010-11-13 13:55:01.571934066 +0100 -+++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h 2010-11-13 13:56:07.019487418 +0100 -@@ -4,6 +4,10 @@ - #define __MN_EVOLUTION_FOLDER_TREE_SERVER_PRIVATE_H__ - - #include "mn-evolution-folder-tree-server.h" -+#include <libedataserver/eds-version.h> -+#if EDS_CHECK_VERSION(2,91,0) -+#include <mail/e-mail-session.h> -+#endif - - #ifdef __cplusplus - extern "C" { -@@ -23,6 +23,9 @@ - #line 41 "src/mn-evolution-folder-tree-server.gob" - GtkWidget * tree; - #line 26 "mn-evolution-folder-tree-server-private.h" -+#if EDS_CHECK_VERSION(2,91,0) -+ EMailSession * session; -+#endif - }; - - #ifdef __cplusplus diff --git a/staging/mail-notification/mail-notification-5.4-gmime.patch b/staging/mail-notification/mail-notification-5.4-gmime.patch deleted file mode 100644 index 5f516a46b..000000000 --- a/staging/mail-notification/mail-notification-5.4-gmime.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.6", - "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/staging/mail-notification/mail-notification-5.4-gtk3-support.patch b/staging/mail-notification/mail-notification-5.4-gtk3-support.patch deleted file mode 100644 index 6a29f8622..000000000 --- a/staging/mail-notification/mail-notification-5.4-gtk3-support.patch +++ /dev/null @@ -1,1416 +0,0 @@ ---- build/src/mn-dialog.c.orig 2011-02-02 23:08:09.816659245 +0100 -+++ build/src/mn-dialog.c 2011-02-02 23:09:16.988113774 +0100 -@@ -106,8 +106,7 @@ - #line 27 "src/mn-dialog.gob" - - gtk_container_set_border_width(GTK_CONTAINER(self), 5); -- gtk_dialog_set_has_separator(GTK_DIALOG(self), FALSE); -- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(self)->vbox), 2); -+ gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(self))), 2); - - #line 113 "mn-dialog.c" - } ---- jbsrc/jb.c.orig 2011-02-02 23:40:33.567924712 +0100 -+++ jbsrc/jb.c 2011-02-02 23:39:39.680803618 +0100 -@@ -163,7 +163,7 @@ - { - jb_check_glibc(); - -- 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("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-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.6", ---- build/src/mn-file-chooser-button.c.orig 2011-02-02 23:38:01.503049512 +0100 -+++ build/src/mn-file-chooser-button.c 2011-02-02 23:38:16.988222034 +0100 -@@ -358,7 +358,7 @@ - g_signal_connect(selfp->dialog, "response", G_CALLBACK(self_response_h), self); - } - -- if (! GTK_WIDGET_VISIBLE(selfp->dialog)) -+ if (! gtk_widget_get_visible(selfp->dialog)) - { - GtkWindow *parent; - ---- build/src/mn-sound-player.c.orig 2011-02-02 23:55:02.436500397 +0100 -+++ build/src/mn-sound-player.c 2011-02-02 23:55:09.125141055 +0100 -@@ -27,7 +27,7 @@ - #include <sys/types.h> - #include <signal.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-conf.h" - #include "mn-locked-callback.h" - #include "mn-util.h" ---- build/src/mn-file-chooser-button.c.orig 2011-02-02 23:55:21.857457045 +0100 -+++ build/src/mn-file-chooser-button.c 2011-02-02 23:55:30.422996901 +0100 -@@ -25,7 +25,7 @@ - #line 39 "src/mn-file-chooser-button.gob" - - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-util.h" - - #line 32 "mn-file-chooser-button.c" ---- build/src/mn-message.c.orig 2011-02-02 23:55:41.160420099 +0100 -+++ build/src/mn-message.c 2011-02-02 23:55:47.755065850 +0100 -@@ -26,7 +26,7 @@ - - #include <errno.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include <libgnomevfs/gnome-vfs.h> - #include "mn-conf.h" - #include "mn-util.h" ---- build/src/mn-file-chooser-button.c.orig 2011-02-03 00:15:16.178407712 +0100 -+++ build/src/mn-file-chooser-button.c 2011-02-03 00:18:17.865681563 +0100 -@@ -463,6 +463,7 @@ - - GDK_THREADS_ENTER(); - -+#if 0 - if (results) - { - GnomeVFSGetFileInfoResult *result = results->data; -@@ -494,6 +495,7 @@ - } - } - } -+#endif - - selfp->async_handle = NULL; - g_object_unref(self); ---- build/src/mn-evolution-folder-tree-server.c.orig 2011-02-07 20:17:09.574274620 +0100 -+++ build/src/mn-evolution-folder-tree-server.c 2011-02-07 20:23:25.196053994 +0100 -@@ -25,6 +25,7 @@ - #line 24 "src/mn-evolution-folder-tree-server.gob" - - #include <dbus/dbus.h> -+#include <gtk/gtkx.h> - #include <libedataserver/eds-version.h> - #if !EDS_CHECK_VERSION(2,29,0) - #include <mail/mail-component.h> -@@ -71,7 +72,7 @@ - static void mn_evolution_folder_tree_server_finalize (MNEvolutionFolderTreeServer * self); - #line 70 "mn-evolution-folder-tree-server.c" - #line 84 "src/mn-evolution-folder-tree-server.gob" --static void mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data); -+static void mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data); - #line 73 "mn-evolution-folder-tree-server.c" - #line 104 "src/mn-evolution-folder-tree-server.gob" - static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data); -@@ -456,7 +457,7 @@ - selfp->tree = em_folder_tree_new_with_model(model); - #endif - -- selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id); -+ selfp->plug = gtk_plug_new((Window) selfp->id); - gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree); - gtk_widget_show_all(selfp->plug); - -@@ -490,7 +491,7 @@ - - #line 84 "src/mn-evolution-folder-tree-server.gob" - static void --mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data) -+mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data) - { - #line 482 "mn-evolution-folder-tree-server.c" - #define __GOB_FUNCTION__ "MN:Evolution:Folder:Tree:Server::plug_destroy_h" ---- src/eggtrayicon.h.orig 2011-02-07 20:25:26.352057350 +0100 -+++ src/eggtrayicon.h 2011-02-07 20:27:54.495032920 +0100 -@@ -23,10 +23,9 @@ - #ifndef __EGG_TRAY_ICON_H__ - #define __EGG_TRAY_ICON_H__ - --#include <gtk/gtkplug.h> --#ifdef GDK_WINDOWING_X11 -+#include <gtk/gtk.h> -+#include <gtk/gtkx.h> - #include <gdk/gdkx.h> --#endif - - G_BEGIN_DECLS - ---- build/src/mn-mail-icon.c.orig 2011-02-07 20:24:58.971663075 +0100 -+++ build/src/mn-mail-icon.c 2011-02-07 20:30:33.714401306 +0100 -@@ -833,11 +833,13 @@ - #line 239 "src/mn-mail-icon.gob" - - GtkWidget *widget = user_data; -+ GtkAllocation allocation; - -- gdk_window_get_origin(widget->window, x, y); -+ gdk_window_get_origin(gtk_widget_get_window(widget), x, y); -+ gtk_widget_get_allocation(widget, &allocation); - -- *x += widget->allocation.x; -- *y += widget->allocation.y; -+ *x += allocation.x; -+ *y += allocation.y; - - if (*y > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2) - { -@@ -847,7 +849,7 @@ - *y -= req.height; - } - else -- *y += widget->allocation.height; -+ *y += allocation.height; - - *push_in = TRUE; - }} ---- build/src/mn-mail-icon-widget.c.orig 2011-02-07 20:31:19.475816763 +0100 -+++ build/src/mn-mail-icon-widget.c 2011-02-07 21:53:48.858814715 +0100 -@@ -64,9 +64,13 @@ - #line 65 "mn-mail-icon-widget.c" - #line 110 "src/mn-mail-icon-widget.gob" - static void ___7_mn_mail_icon_widget_size_request (GtkWidget * widget, GtkRequisition * requisition); -+static void -+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); -+static void -+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); - #line 68 "mn-mail-icon-widget.c" - #line 132 "src/mn-mail-icon-widget.gob" --static gboolean ___8_mn_mail_icon_widget_expose_event (GtkWidget * widget, GdkEventExpose * event); -+static gboolean ___8_mn_mail_icon_widget_draw (GtkWidget * widget, cairo_t *cr); - #line 71 "mn-mail-icon-widget.c" - #line 244 "src/mn-mail-icon-widget.gob" - static GdkPixbuf * mn_mail_icon_widget_render_icon (MNMailIconWidget * self); -@@ -187,9 +191,10 @@ - parent_class = g_type_class_ref (GTK_TYPE_WIDGET); - - #line 110 "src/mn-mail-icon-widget.gob" -- gtk_widget_class->size_request = ___7_mn_mail_icon_widget_size_request; -+ gtk_widget_class->get_preferred_width = mn_mail_icon_widget_get_preferred_width; -+ gtk_widget_class->get_preferred_height = mn_mail_icon_widget_get_preferred_height; - #line 132 "src/mn-mail-icon-widget.gob" -- gtk_widget_class->expose_event = ___8_mn_mail_icon_widget_expose_event; -+ gtk_widget_class->draw = ___8_mn_mail_icon_widget_draw; - #line 194 "mn-mail-icon-widget.c" - g_object_class->dispose = ___dispose; - g_object_class->finalize = ___finalize; -@@ -234,7 +239,7 @@ - { - #line 93 "src/mn-mail-icon-widget.gob" - -- GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW); -+ gtk_widget_set_has_window(GTK_WIDGET(self), FALSE); - - gtk_widget_set_name(GTK_WIDGET(self), "mn-mail-icon"); - -@@ -457,9 +462,28 @@ - #undef __GOB_FUNCTION__ - #undef PARENT_HANDLER - -+static void -+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) -+{ -+ GtkRequisition requisition; -+ -+ ___7_mn_mail_icon_widget_size_request (widget, &requisition); -+ *minimal_width = *natural_width = requisition.width; -+} -+ -+static void -+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) -+{ -+ GtkRequisition requisition; -+ -+ ___7_mn_mail_icon_widget_size_request (widget, &requisition); -+ -+ *minimal_height = *natural_height = requisition.height; -+} -+ - #line 132 "src/mn-mail-icon-widget.gob" - static gboolean --___8_mn_mail_icon_widget_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event) -+___8_mn_mail_icon_widget_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr) - #line 464 "mn-mail-icon-widget.c" - #define PARENT_HANDLER(___widget,___event) \ - ((GTK_WIDGET_CLASS(parent_class)->expose_event)? \ -@@ -472,7 +496,7 @@ - - Self *self = SELF(widget); - -- if (! GTK_WIDGET_DRAWABLE(widget) || ! selfp->stock_id) -+ if (! gtk_widget_is_drawable(widget) || ! selfp->stock_id) - return FALSE; - - if (selfp->is_on) -@@ -480,23 +504,34 @@ - int x; - int y; - GdkRectangle image_area; -+ GtkAllocation allocation; -+ GtkRequisition requisition; - - /* note: widget->requisition is the pixbuf size, see size_request() */ - -- x = floor(widget->allocation.x + ((widget->allocation.width - widget->requisition.width) * ICON_XALIGN)); -- y = floor(widget->allocation.y + ((widget->allocation.height - widget->requisition.height) * ICON_YALIGN)); -+ gtk_widget_get_allocation(widget, &allocation); -+ gtk_widget_get_requisition(widget, &requisition); -+ -+ x = floor(allocation.x + ((allocation.width - requisition.width) * ICON_XALIGN)); -+ y = floor(allocation.y + ((allocation.height - requisition.height) * ICON_YALIGN)); - - image_area.x = x; - image_area.y = y; -- image_area.width = widget->requisition.width; -- image_area.height = widget->requisition.height; -+ image_area.width = requisition.width; -+ image_area.height = requisition.height; - -+#if 0 - if (gdk_rectangle_intersect(&event->area, &image_area, &image_area)) -+#endif - { - GdkPixbuf *pixbuf; - - pixbuf = self_render_icon(self); -+ gdk_cairo_set_source_pixbuf(cr, pixbuf, image_area.x, image_area.y); -+ cairo_move_to(cr, image_area.x - x, image_area.y - y); -+ cairo_paint(cr); - -+#if 0 - gdk_draw_pixbuf(widget->window, - NULL, - pixbuf, -@@ -509,6 +544,7 @@ - GDK_RGB_DITHER_NORMAL, - 0, - 0); -+#endif - - g_object_unref(pixbuf); - } -@@ -523,13 +559,16 @@ - int box_y; - int box_width; - int box_height; -+ GtkAllocation allocation; -+ -+ gtk_widget_get_allocation(widget, &allocation); - - if (! selfp->count_layout) - { - const char *size; - char *markup; - -- if (widget->allocation.height < 32) -+ if (allocation.height < 32) - size = "small"; - else - size = "medium"; -@@ -546,17 +585,16 @@ - box_width = count_rect.width + COUNT_BOX_XPAD * 2; - box_height = count_rect.height + COUNT_BOX_YPAD * 2; - -- box_x = widget->allocation.x + widget->allocation.width - box_width - COUNT_BOX_XMARGIN; -- box_y = widget->allocation.y + widget->allocation.height - box_height - COUNT_BOX_YMARGIN; -+ box_x = allocation.x + allocation.width - box_width - COUNT_BOX_XMARGIN; -+ box_y = allocation.y + allocation.height - box_height - COUNT_BOX_YMARGIN; - - count_x = box_x - count_rect.x + COUNT_BOX_XPAD; - count_y = box_y - count_rect.y + COUNT_BOX_YPAD; - -- gtk_paint_box(widget->style, -- widget->window, -- GTK_WIDGET_STATE(widget), -+ gtk_paint_box(gtk_widget_get_style(widget), -+ cr, -+ gtk_widget_get_state_flags(widget), - GTK_SHADOW_OUT, -- &event->area, - widget, - NULL, - box_x, -@@ -564,11 +602,10 @@ - box_width, - box_height); - -- gtk_paint_layout(widget->style, -- widget->window, -- GTK_WIDGET_STATE(widget), -+ gtk_paint_layout(gtk_widget_get_style(widget), -+ cr, -+ gtk_widget_get_state_flags(widget), - FALSE, -- &event->area, - widget, - NULL, - count_x, ---- build/src/mn-mailbox-properties-dialog.c.orig 2011-02-07 21:57:31.257251776 +0100 -+++ build/src/mn-mailbox-properties-dialog.c 2011-02-07 21:56:56.989854854 +0100 -@@ -456,7 +456,7 @@ - MNMailboxProperties *properties; - - mn_container_create_interface(GTK_CONTAINER(self), -- PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.glade", -+ PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.ui", - "notebook", - "mn_mailbox_properties_dialog_", - "notebook", &self->notebook, -@@ -1290,7 +1290,7 @@ - { - #line 686 "src/mn-mailbox-properties-dialog.gob" - -- if (GTK_WIDGET_IS_SENSITIVE(GTK_WINDOW(self)->default_widget)) -+ if (gtk_widget_is_sensitive(gtk_window_get_default_widget(GTK_WINDOW(self)))) - gtk_window_activate_default(GTK_WINDOW(self)); - else - { -@@ -1313,9 +1313,9 @@ - if (elem->data == entry) - break; - -- if (GTK_WIDGET_MAPPED(elem->data) -- && GTK_WIDGET_VISIBLE(elem->data) -- && GTK_WIDGET_SENSITIVE(elem->data)) -+ if (gtk_widget_get_mapped(elem->data) -+ && gtk_widget_get_visible(elem->data) -+ && gtk_widget_get_sensitive(elem->data)) - next = elem->data; - } - while (! next); ---- build/src/mn-mailbox-view.c.orig 2011-02-07 22:18:49.962462920 +0100 -+++ build/src/mn-mailbox-view.c 2011-02-07 23:01:39.990363248 +0100 -@@ -412,23 +412,23 @@ - binding_set = gtk_binding_set_by_class(class); - - /* Delete removes a row */ -- gtk_binding_entry_add_signal(binding_set, GDK_Delete, 0, "activate-remove", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_KP_Delete, 0, "activate-remove", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, 0, "activate-remove", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Delete, 0, "activate-remove", 0); - - /* HIG 2.0 cut/copy/paste shortcuts */ -- gtk_binding_entry_add_signal(binding_set, GDK_x, GDK_CONTROL_MASK, "activate-cut", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_c, GDK_CONTROL_MASK, "activate-copy", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_v, GDK_CONTROL_MASK, "activate-paste", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_x, GDK_CONTROL_MASK, "activate-cut", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_c, GDK_CONTROL_MASK, "activate-copy", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_v, GDK_CONTROL_MASK, "activate-paste", 0); - - /* cut/copy/paste shortcuts taken from gtkentry.c */ -- gtk_binding_entry_add_signal(binding_set, GDK_Delete, GDK_SHIFT_MASK, "activate-cut", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_CONTROL_MASK, "activate-copy", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_SHIFT_MASK, "activate-paste", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK, "activate-cut", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK, "activate-copy", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK, "activate-paste", 0); - - /* HIG 2.0 properties */ -- gtk_binding_entry_add_signal(binding_set, GDK_Return, GDK_MOD1_MASK, "activate-properties", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Return, GDK_MOD1_MASK, "activate-properties", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0); - - #line 434 "mn-mailbox-view.c" - } -@@ -934,14 +934,13 @@ - #line 183 "src/mn-mailbox-view.gob" - - GtkSelectionData *data; -- - data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_MAILBOXES].atom); - if (data) - { - GSList *configurations; - GSList *l; - -- memcpy(&configurations, data->data, data->length); -+ memcpy(&configurations, gtk_selection_data_get_data(data), gtk_selection_data_get_length(data)); - - MN_LIST_FOREACH(l, configurations) - { -@@ -962,14 +961,14 @@ - data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_GNOME_COPIED_FILES].atom); - if (data) - { -- if (data->format == 8 && data->length > 0) -+ if (gtk_selection_data_get_format(data) == 8 && gtk_selection_data_get_length(data) > 0) - { - char *gnome_copied_files; - gboolean status; - MNGnomeCopiedFilesType type; - GSList *uri_list; - -- gnome_copied_files = g_strndup(data->data, data->length); -+ gnome_copied_files = g_strndup(gtk_selection_data_get_data(data), gtk_selection_data_get_length(data)); - status = mn_parse_gnome_copied_files(gnome_copied_files, &type, &uri_list); - g_free(gnome_copied_files); - ---- build/src/mn-shell.c.orig 2011-02-07 23:02:17.852293679 +0100 -+++ build/src/mn-shell.c 2011-02-07 23:04:39.223548403 +0100 -@@ -158,7 +158,7 @@ - static void mn_shell_icon_activate_about_h (MNMailIcon * icon, gpointer user_data); - #line 160 "mn-shell.c" - #line 499 "src/mn-shell.gob" --static void mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data); -+static void mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data); - #line 163 "mn-shell.c" - #line 508 "src/mn-shell.gob" - static void mn_shell_update_sensitivity (MNShell * self); -@@ -1006,7 +1006,7 @@ - - #line 499 "src/mn-shell.gob" - static void --mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data) -+mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data) - { - #line 1004 "mn-shell.c" - #define __GOB_FUNCTION__ "MN:Shell::icon_destroy_h" ---- build/src/mn-text-table.c.orig 2011-02-07 23:05:08.799927792 +0100 -+++ build/src/mn-text-table.c 2011-02-07 23:18:06.480056895 +0100 -@@ -69,9 +69,11 @@ - #line 70 "mn-text-table.c" - #line 104 "src/mn-text-table.gob" - static void ___4_mn_text_table_size_request (GtkWidget * widget, GtkRequisition * requisition); -+static void mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width); -+static void mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height); - #line 73 "mn-text-table.c" - #line 115 "src/mn-text-table.gob" --static gboolean ___5_mn_text_table_expose_event (GtkWidget * widget, GdkEventExpose * event); -+static gboolean ___5_mn_text_table_draw (GtkWidget * widget, cairo_t *cr); - #line 76 "mn-text-table.c" - #line 165 "src/mn-text-table.gob" - static void mn_text_table_set_dirty (MNTextTable * self); -@@ -188,9 +190,10 @@ - parent_class = g_type_class_ref (GTK_TYPE_WIDGET); - - #line 104 "src/mn-text-table.gob" -- gtk_widget_class->size_request = ___4_mn_text_table_size_request; -+ gtk_widget_class->get_preferred_width = mn_text_table_get_preferred_width; -+ gtk_widget_class->get_preferred_height = mn_text_table_get_preferred_height; - #line 115 "src/mn-text-table.gob" -- gtk_widget_class->expose_event = ___5_mn_text_table_expose_event; -+ gtk_widget_class->draw = ___5_mn_text_table_draw; - #line 257 "src/mn-text-table.gob" - c->clear = ___real_mn_text_table_clear; - #line 197 "mn-text-table.c" -@@ -216,7 +219,7 @@ - { - #line 80 "src/mn-text-table.gob" - -- GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW); -+ gtk_widget_set_has_window(GTK_WIDGET(self), FALSE); - - g_object_connect(self, - "swapped-signal::style-set", self_context_changed, self, -@@ -290,9 +293,29 @@ - #undef __GOB_FUNCTION__ - #undef PARENT_HANDLER - -+static void -+mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width) -+{ -+ GtkRequisition requisition; -+ -+ ___4_mn_text_table_size_request (widget, &requisition); -+ -+ *minimal_width = *natural_width = requisition.width; -+} -+ -+static void -+mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height) -+{ -+ GtkRequisition requisition; -+ -+ ___4_mn_text_table_size_request (widget, &requisition); -+ -+ *minimal_height = *natural_height = requisition.height; -+} -+ - #line 115 "src/mn-text-table.gob" - static gboolean --___5_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event) -+___5_mn_text_table_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr) - #line 297 "mn-text-table.c" - #define PARENT_HANDLER(___widget,___event) \ - ((GTK_WIDGET_CLASS(parent_class)->expose_event)? \ -@@ -304,10 +327,14 @@ - #line 117 "src/mn-text-table.gob" - - Self *self = SELF(widget); -+ GtkAllocation allocation; - int i; -- int y = widget->allocation.y; -+ int y; -+ -+ gtk_widget_get_allocation(widget, &allocation); -+ y = 0; - -- if (! GTK_WIDGET_DRAWABLE(widget)) -+ if (! gtk_widget_is_drawable(widget)) - return FALSE; - - self_relayout(self); -@@ -316,7 +343,7 @@ - { - Row *row = g_ptr_array_index(selfp->rows, i); - int j; -- int x = widget->allocation.x; -+ int x = 0; - int column = 0; - - MN_ARRAY_FOREACH(j, row->cells) -@@ -324,11 +351,10 @@ - MNTextTableCell *cell = g_ptr_array_index(row->cells, j); - - if (cell->layout) -- gtk_paint_layout(widget->style, -- widget->window, -- GTK_WIDGET_STATE(widget), -+ gtk_paint_layout(gtk_widget_get_style(widget), -+ cr, -+ gtk_widget_get_state_flags(widget), - FALSE, -- &event->area, - widget, - NULL, - x, ---- build/src/mn-tooltips.c.orig 2011-02-07 23:19:05.903761972 +0100 -+++ build/src/mn-tooltips.c 2011-02-07 23:41:19.368621912 +0100 -@@ -104,7 +104,7 @@ - static void mn_tooltips_set_tip_widget_real (MNTooltips * self, GtkWidget * widget, GtkWidget * tip_widget, int border_width); - #line 106 "mn-tooltips.c" - #line 287 "src/mn-tooltips.gob" --static gboolean mn_tooltips_paint_window (MNTooltips * self); -+static gboolean mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr); - #line 109 "mn-tooltips.c" - #line 308 "src/mn-tooltips.gob" - static void mn_tooltips_draw_tips (MNTooltips * self); -@@ -422,7 +422,13 @@ - - if (! selfp->window) - { -+ GtkStyleContext *ctx; -+ - selfp->window = gtk_window_new(GTK_WINDOW_POPUP); -+ -+ ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window)); -+ gtk_style_context_add_class(ctx, "tooltip"); -+ - self_update_screen(self, TRUE); - gtk_widget_set_app_paintable(selfp->window, TRUE); - gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE); -@@ -430,7 +430,7 @@ - gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width); - - g_signal_connect_swapped(selfp->window, -- "expose-event", -+ "draw", - G_CALLBACK(self_paint_window), - self); - -@@ -490,7 +490,7 @@ - - if (selfp->active_data - && selfp->active_data->widget == widget -- && GTK_WIDGET_DRAWABLE(selfp->active_data->widget)) -+ && gtk_widget_is_drawable(selfp->active_data->widget)) - { - if (data->tip_widget) - g_object_unref(data->tip_widget); -@@ -594,7 +594,7 @@ - - #line 287 "src/mn-tooltips.gob" - static gboolean --mn_tooltips_paint_window (MNTooltips * self) -+mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr) - { - #line 600 "mn-tooltips.c" - #define __GOB_FUNCTION__ "MN:Tooltips::paint_window" -@@ -608,18 +608,13 @@ - - GtkRequisition req; - -- gtk_widget_size_request(selfp->window, &req); -- gtk_paint_flat_box(selfp->window->style, -- selfp->window->window, -- GTK_STATE_NORMAL, -- GTK_SHADOW_OUT, -- NULL, -- selfp->window, -- "tooltip", -- 0, -- 0, -- req.width, -- req.height); -+ gtk_widget_size_request(GTK_WIDGET(selfp->window), &req); -+ gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)), -+ cr, -+ 0, -+ 0, -+ req.width, -+ req.height); - - return FALSE; - }} -@@ -651,10 +650,11 @@ - gint monitor_num, px, py; - GdkRectangle monitor; - int screen_width; -+ GtkAllocation allocation; - - if (! selfp->window) - self_force_window(self); -- else if (GTK_WIDGET_VISIBLE(selfp->window)) -+ else if (gtk_widget_get_visible(selfp->window)) - g_get_current_time(&selfp->last_popdown); - - gtk_widget_ensure_style(selfp->window); -@@ -670,7 +670,7 @@ - - data = selfp->active_data; - -- child = GTK_BIN(selfp->window)->child; -+ child = gtk_bin_get_child(GTK_BIN(selfp->window)); - if (child) - gtk_container_remove(GTK_CONTAINER(selfp->window), child); - -@@ -684,14 +684,16 @@ - w = requisition.width; - h = requisition.height; - -- gdk_window_get_origin(widget->window, &x, &y); -- if (GTK_WIDGET_NO_WINDOW(widget)) -+ gtk_widget_get_allocation(selfp->window, &allocation); -+ -+ gdk_window_get_origin(gtk_widget_get_window(widget), &x, &y); -+ if (! gtk_widget_get_has_window(widget)) - { -- x += widget->allocation.x; -- y += widget->allocation.y; -+ x += allocation.x; -+ y += allocation.y; - } - -- x += widget->allocation.width / 2; -+ x += allocation.width / 2; - - if (! keyboard_mode) - gdk_window_get_pointer(gdk_screen_get_root_window(screen), &x, NULL, NULL); -@@ -712,11 +714,11 @@ - else if (x < monitor.x) - x = monitor.x; - -- if ((y + h + widget->allocation.height + 4) > monitor.y + monitor.height -+ if ((y + h + allocation.height + 4) > monitor.y + monitor.height - && (y - 4) > monitor.y) - y = y - h - 4; - else -- y = y + widget->allocation.height + 4; -+ y = y + allocation.height + 4; - - /* - * The following block is not part of GTK+ and has been added to -@@ -760,7 +762,7 @@ - - Self *self = SELF(data); - -- if (selfp->active_data && GTK_WIDGET_DRAWABLE(selfp->active_data->widget)) -+ if (selfp->active_data && gtk_widget_is_drawable(selfp->active_data->widget)) - self_draw_tips(self); - - selfp->timeout_id = 0; -@@ -785,7 +787,7 @@ - - if (selfp->window) - { -- if (GTK_WIDGET_VISIBLE(selfp->window)) -+ if (gtk_widget_get_visible(selfp->window)) - g_get_current_time(&selfp->last_popdown); - gtk_widget_hide(selfp->window); - } -@@ -802,7 +804,7 @@ - { - TooltipsData *data = l->data; - -- if (data->widget == widget && GTK_WIDGET_DRAWABLE(widget)) -+ if (data->widget == widget && gtk_widget_is_drawable(widget)) - { - selfp->active_data = data; - break; -@@ -937,7 +939,7 @@ - - if (GTK_IS_WINDOW(toplevel)) - { -- GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget; -+ GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel)); - - g_object_set_data(G_OBJECT(toplevel), TOOLTIPS_KEYBOARD_MODE, GINT_TO_POINTER(TRUE)); - -@@ -966,7 +968,7 @@ - - if (GTK_IS_WINDOW(toplevel)) - { -- GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget; -+ GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel)); - - if (focus) - self_hide_tip(focus); -@@ -1057,24 +1059,24 @@ - break; - - case GDK_ENTER_NOTIFY: -- if (! (GTK_IS_MENU_ITEM(widget) && GTK_MENU_ITEM(widget)->submenu)) -+ if (! (GTK_IS_MENU_ITEM(widget) && gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)))) - self_start_delay(self, widget); - break; - - case GDK_LEAVE_NOTIFY: - self_set_active_widget(self, NULL); -- selfp->use_sticky_delay = selfp->window && GTK_WIDGET_VISIBLE(selfp->window); -+ selfp->use_sticky_delay = selfp->window && gtk_widget_get_visible(selfp->window); - break; - - case GDK_MOTION_NOTIFY: - /* Handle menu items specially ... pend popup for each motion - * on other widgets, we ignore motion. - */ -- if (GTK_IS_MENU_ITEM(widget) && ! GTK_MENU_ITEM(widget)->submenu) -+ if (GTK_IS_MENU_ITEM(widget) && ! gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget))) - { - /* Completely evil hack to make sure we get the LEAVE_NOTIFY - */ -- GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING); -+ //GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING); - self_set_active_widget(self, NULL); - self_start_delay(self, widget); - break; ---- src/nautilus-cell-renderer-pixbuf-emblem.c.orig 2011-02-08 00:16:43.847831409 +0100 -+++ src/nautilus-cell-renderer-pixbuf-emblem.c 2011-02-08 00:32:59.128682767 +0100 -@@ -39,17 +39,16 @@ - GtkWidget *widget); - static void nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell, - GtkWidget *widget, -- GdkRectangle *rectangle, -+ const GdkRectangle *rectangle, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height); - static void nautilus_cell_renderer_pixbuf_emblem_render (GtkCellRenderer *cell, -- GdkWindow *window, -+ cairo_t *cr, - GtkWidget *widget, -- GdkRectangle *background_area, -- GdkRectangle *cell_area, -- GdkRectangle *expose_area, -+ const GdkRectangle *background_area, -+ const GdkRectangle *cell_area, - GtkCellRendererState flags); - - enum { -@@ -356,7 +355,7 @@ - static void - nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell, - GtkWidget *widget, -- GdkRectangle *cell_area, -+ const GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, -@@ -368,6 +367,10 @@ - gint pixbuf_height = 0; - gint calc_width; - gint calc_height; -+ int xpad; -+ int ypad; -+ gfloat xalign; -+ gfloat yalign; - - if (!cellpixbuf->pixbuf && cellinfo->stock_id) - nautilus_cell_renderer_pixbuf_emblem_create_stock_pixbuf (cellpixbuf, widget); -@@ -385,8 +388,11 @@ - pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_closed)); - } - -- calc_width = (gint) cell->xpad * 2 + pixbuf_width; -- calc_height = (gint) cell->ypad * 2 + pixbuf_height; -+ gtk_cell_renderer_get_padding(cell, &xpad, &ypad); -+ gtk_cell_renderer_get_alignment(cell, &xalign, &yalign); -+ -+ calc_width = (gint) xpad * 2 + pixbuf_width; -+ calc_height = (gint) ypad * 2 + pixbuf_height; - - if (x_offset) *x_offset = 0; - if (y_offset) *y_offset = 0; -@@ -394,14 +400,14 @@ - if (cell_area && pixbuf_width > 0 && pixbuf_height > 0) { - if (x_offset) { - *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? -- 1.0 - cell->xalign : cell->xalign) * -- (cell_area->width - calc_width - 2 * cell->xpad)); -- *x_offset = MAX (*x_offset, 0) + cell->xpad; -+ 1.0 - xalign : xalign) * -+ (cell_area->width - calc_width - 2 * xpad)); -+ *x_offset = MAX (*x_offset, 0) + xpad; - } - if (y_offset) { -- *y_offset = (cell->yalign * -- (cell_area->height - calc_height - 2 * cell->ypad)); -- *y_offset = MAX (*y_offset, 0) + cell->ypad; -+ *y_offset = (yalign * -+ (cell_area->height - calc_height - 2 * ypad)); -+ *y_offset = MAX (*y_offset, 0) + ypad; - } - } - -@@ -414,11 +420,10 @@ - - static void - nautilus_cell_renderer_pixbuf_emblem_render (GtkCellRenderer *cell, -- GdkWindow *window, -+ cairo_t *cr, - GtkWidget *widget, -- GdkRectangle *background_area, -- GdkRectangle *cell_area, -- GdkRectangle *expose_area, -+ const GdkRectangle *background_area, -+ const GdkRectangle *cell_area, - GtkCellRendererState flags) - - { -@@ -429,13 +434,19 @@ - GdkRectangle pix_emblem_rect; - GdkRectangle draw_rect; - gboolean stock_pixbuf = FALSE; -+ gboolean is_expander = FALSE; -+ gboolean is_expanded = FALSE; -+ int xpad; -+ int ypad; -+ -+ g_object_get(cell, "is-expander", &is_expander, "is-expanded", &is_expanded, NULL); - - pixbuf = cellpixbuf->pixbuf; -- if (cell->is_expander) { -- if (cell->is_expanded && -+ if (is_expander) { -+ if (is_expanded && - cellpixbuf->pixbuf_expander_open != NULL) { - pixbuf = cellpixbuf->pixbuf_expander_open; -- } else if (!cell->is_expanded && -+ } else if (!is_expanded && - cellpixbuf->pixbuf_expander_closed != NULL) { - pixbuf = cellpixbuf->pixbuf_expander_closed; - } -@@ -456,15 +467,20 @@ - if (stock_pixbuf) - pixbuf = cellpixbuf->pixbuf; - -+ gtk_cell_renderer_get_padding(cell, &xpad, &ypad); -+ - pix_rect.x += cell_area->x; - pix_rect.y += cell_area->y; -- pix_rect.width -= cell->xpad * 2; -- pix_rect.height -= cell->ypad * 2; -+ pix_rect.width -= xpad * 2; -+ pix_rect.height -= ypad * 2; - -+ if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) { -+#if 0 - if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) && - gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) { -+ - gdk_draw_pixbuf (window, -- widget->style->black_gc, -+ gtk_widget_get_style(widget)->black_gc, - pixbuf, - /* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */ - draw_rect.x - pix_rect.x, -@@ -475,6 +491,11 @@ - draw_rect.height, - GDK_RGB_DITHER_NORMAL, - 0, 0); -+#endif -+ -+ cairo_move_to (cr, draw_rect.x - pix_rect.x, draw_rect.y - pix_rect.y); -+ gdk_cairo_set_source_pixbuf (cr, pixbuf, draw_rect.x, draw_rect.y); -+ cairo_paint (cr); - } - - if (cellpixbuf->pixbuf_emblem) { -@@ -482,8 +503,11 @@ - pix_emblem_rect.height = gdk_pixbuf_get_height (cellpixbuf->pixbuf_emblem); - pix_emblem_rect.x = pix_rect.x; - pix_emblem_rect.y = pix_rect.y + pix_rect.height - pix_emblem_rect.height; -+ if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect)) { -+#if 0 - if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect) && - gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) { -+ - gdk_draw_pixbuf (window, - widget->style->black_gc, - cellpixbuf->pixbuf_emblem, -@@ -496,6 +520,11 @@ - draw_rect.height, - GDK_RGB_DITHER_NORMAL, - 0, 0); -+#endif -+ -+ cairo_move_to (cr, draw_rect.x - pix_emblem_rect.x, draw_rect.y - pix_emblem_rect.y); -+ gdk_cairo_set_source_pixbuf (cr, cellpixbuf->pixbuf_emblem, draw_rect.x, draw_rect.y); -+ cairo_paint (cr); - } - } - } ---- src/nautilus-cell-renderer-pixbuf-emblem.h.orig 2011-02-07 22:18:12.336471764 +0100 -+++ src/nautilus-cell-renderer-pixbuf-emblem.h 2011-02-08 00:20:30.461758697 +0100 -@@ -25,18 +25,18 @@ - #ifndef NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H - #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H - --#include <gtk/gtkcellrenderer.h> -+#include <gtk/gtk.h> - - #define NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM \ - (nautilus_cell_renderer_pixbuf_emblem_get_type ()) - #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \ -- (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem)) -+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem)) - #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \ -- (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass)) -+ (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass)) - #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \ -- (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) -+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) - #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \ -- (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) -+ (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) - - typedef struct _NautilusCellRendererPixbufEmblem NautilusCellRendererPixbufEmblem; - typedef struct _NautilusCellRendererPixbufEmblemClass NautilusCellRendererPixbufEmblemClass; ---- build/src/mn-authenticated-mailbox.c.orig 2011-02-08 00:34:16.332610802 +0100 -+++ build/src/mn-authenticated-mailbox.c 2011-02-08 00:36:23.706936717 +0100 -@@ -25,7 +25,7 @@ - #line 29 "src/mn-authenticated-mailbox.gob" - - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-mailbox-private.h" - #include "mn-shell.h" - #include "mn-util.h" -@@ -859,6 +859,7 @@ - - /* keep the title in sync with gnome-authentication-manager */ - -+#if 0 - /* translators: header capitalization */ - selfp->auth_dialog = gnome_password_dialog_new(_("Authentication Required"), - message, -@@ -891,6 +892,9 @@ - gtk_widget_destroy(selfp->auth_dialog); - - return ok; -+#else -+ return FALSE; -+#endif - }} - #line 896 "mn-authenticated-mailbox.c" - #undef __GOB_FUNCTION__ ---- build/src/mn-about-dialog.c.orig 2011-02-08 22:20:54.469841262 +0100 -+++ build/src/mn-about-dialog.c 2011-02-08 22:21:13.309839037 +0100 -@@ -111,9 +111,11 @@ - { - #line 32 "src/mn-about-dialog.gob" - -+#if 0 - gtk_about_dialog_set_email_hook(self_activate_link_cb, "mailto:", NULL); - gtk_about_dialog_set_url_hook(self_activate_link_cb, NULL, NULL); -- -+#endif -+ - #line 118 "mn-about-dialog.c" - } - } ---- build/src/mn-autodetect-mailbox-properties.c.orig 2011-02-08 22:21:58.639427345 +0100 -+++ build/src/mn-autodetect-mailbox-properties.c 2011-02-08 22:22:43.564035901 +0100 -@@ -355,10 +355,9 @@ - - toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); - /* translators: header capitalization */ -- selfp->chooser = gtk_file_chooser_dialog_new_with_backend(_("Select a File or Folder"), -+ selfp->chooser = gtk_file_chooser_dialog_new(_("Select a File or Folder"), - GTK_WINDOW(toplevel), - GTK_FILE_CHOOSER_ACTION_OPEN, -- "gnome-vfs", - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, 1, - NULL); ---- build/src/mn-pi-mailbox-properties.c.orig 2011-02-08 22:30:08.051375715 +0100 -+++ build/src/mn-pi-mailbox-properties.c 2011-02-08 22:30:21.398665261 +0100 -@@ -415,7 +415,7 @@ - int i; - - for (i = 0; i < MN_PI_MAILBOX_N_CONNECTION_TYPES; i++) -- gtk_widget_set_sensitive(self->port_spin[i], GTK_WIDGET_SENSITIVE(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i]))); -+ gtk_widget_set_sensitive(self->port_spin[i], gtk_widget_get_sensitive(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i]))); - - g_object_notify(G_OBJECT(self), "complete"); - }} ---- src/eggtrayicon.c.orig 2011-02-07 23:42:30.405791829 +0100 -+++ src/eggtrayicon.c 2011-02-08 23:06:16.092968325 +0100 -@@ -25,7 +25,7 @@ - - #include "eggtrayicon.h" - --#include <gdkconfig.h> -+#include <gdk/gdk.h> - #if defined (GDK_WINDOWING_X11) - #include <gdk/gdkx.h> - #include <X11/Xatom.h> -@@ -258,7 +258,7 @@ - { - GdkWindow *gdkwin; - -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), -+ gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (widget), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); -@@ -290,7 +290,7 @@ - ev.window = window; - ev.message_type = icon->system_tray_opcode_atom; - ev.format = 32; -- ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window); -+ ev.data.l[0] = gdk_x11_get_server_time (gtk_widget_get_window(GTK_WIDGET (icon))); - ev.data.l[1] = message; - ev.data.l[2] = data1; - ev.data.l[3] = data2; -@@ -342,12 +342,12 @@ - { - GdkWindow *gdkwin; - -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), -+ gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); - -- if (dock_if_realized && GTK_WIDGET_REALIZED (icon)) -+ if (dock_if_realized && gtk_widget_get_realized (GTK_WIDGET(icon))) - egg_tray_icon_send_dock_request (icon); - - egg_tray_icon_get_orientation_property (icon); -@@ -355,10 +355,16 @@ - } - - static gboolean --transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) -+transparent_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) - { -- gdk_window_clear_area (widget->window, event->area.x, event->area.y, -+#if 0 -+ gdk_window_clear_area (gtk_widget_get_window(widget), event->area.x, event->area.y, - event->area.width, event->area.height); -+#endif -+ cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); -+ //gdk_cairo_region (cr, event->region); -+ cairo_fill (cr); -+ - return FALSE; - } - -@@ -366,20 +372,20 @@ - make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, - gpointer user_data) - { -- gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -+ //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE); - } - - static void - make_transparent (GtkWidget *widget, gpointer user_data) - { -- if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) -+ if (! gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget)) - return; - - gtk_widget_set_app_paintable (widget, TRUE); - gtk_widget_set_double_buffered (widget, FALSE); -- gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -- g_signal_connect (widget, "expose_event", -- G_CALLBACK (transparent_expose_event), NULL); -+ //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE); -+ g_signal_connect (widget, "draw", -+ G_CALLBACK (transparent_draw), NULL); - g_signal_connect_after (widget, "style_set", - G_CALLBACK (make_transparent_again), NULL); - } -@@ -391,7 +397,7 @@ - - g_return_if_fail (icon->manager_window != None); - -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), -+ gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); ---- build/src/mn-properties-dialog.c.orig 2011-02-08 23:37:12.605200174 +0100 -+++ build/src/mn-properties-dialog.c 2011-02-08 23:37:18.601881191 +0100 -@@ -183,7 +183,7 @@ - GtkTreeSelection *selection; - - mn_container_create_interface(GTK_CONTAINER(self), -- PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.glade", -+ PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.ui", - "main_vbox", - "mn_properties_dialog_", - "notebook", &selfp->notebook, ---- src/mn-util.c.orig 2011-02-08 00:01:25.167207512 +0100 -+++ src/mn-util.c 2011-02-09 00:01:35.718285446 +0100 -@@ -26,8 +26,7 @@ - #include <gmodule.h> - #include <glib/gi18n.h> - #include <gobject/gvaluecollector.h> --#include <gnome.h> --#include <glade/glade.h> -+#include <libgnome/libgnome.h> - #include "mn-util.h" - #include "mn-mailboxes.h" - #include "mn-shell.h" -@@ -303,49 +302,55 @@ - return pixbuf; - } - --static GladeXML * -+static GtkBuilder * - mn_glade_xml_new (const char *filename, const char *root, const char *domain) - { -- GladeXML *xml; -+ GtkBuilder *builder; -+ GError *err = NULL; - - g_return_val_if_fail(filename != NULL, NULL); - -- xml = glade_xml_new(filename, root, domain); -- if (! xml) -- mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\".", filename); -+ builder = gtk_builder_new(); -+ gtk_builder_set_translation_domain(builder, domain); -+ if (! gtk_builder_add_from_file(builder, filename, &err)) { -+ mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\": %s.", filename, err->message); -+ g_error_free(err); -+ g_object_unref(builder); -+ return NULL; -+ } - -- return xml; -+ return builder; - } - - static GtkWidget * --mn_glade_xml_get_widget (GladeXML *xml, const char *widget_name) -+mn_glade_xml_get_widget (GtkBuilder *builder, const char *widget_name) - { - GtkWidget *widget; - -- g_return_val_if_fail(GLADE_IS_XML(xml), NULL); -+ g_return_val_if_fail(GTK_IS_BUILDER(builder), NULL); - g_return_val_if_fail(widget_name != NULL, NULL); - -- widget = glade_xml_get_widget(xml, widget_name); -+ widget = GTK_WIDGET(gtk_builder_get_object(builder, widget_name)); - if (! widget) -- mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface \"%s\".", widget_name, xml->filename); -+ mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface.", widget_name); - - return widget; - } - - static void --create_interface_connect_cb (const char *handler_name, -+create_interface_connect_cb (GtkBuilder *builder, - GObject *object, - const char *signal_name, -- const char *signal_data, -+ const char *handler_name, - GObject *connect_object, -- gboolean after, -+ GConnectFlags flags, - gpointer user_data) - { - static GModule *module = NULL; - ContainerCreateInterfaceConnectInfo *info = user_data; - char *cb_name; - GCallback cb; -- GConnectFlags flags; -+ GConnectFlags cflags; - - if (! module) - { -@@ -359,11 +364,9 @@ - mn_show_fatal_error_dialog(NULL, "Signal handler \"%s\" not found.", cb_name); - g_free(cb_name); - -- flags = G_CONNECT_SWAPPED; -- if (after) -- flags |= G_CONNECT_AFTER; -+ cflags = G_CONNECT_SWAPPED; - -- g_signal_connect_data(object, signal_name, cb, info->container, NULL, flags); -+ g_signal_connect_data(object, signal_name, cb, info->container, NULL, cflags); - } - - void -@@ -373,7 +376,7 @@ - const char *callback_prefix, - ...) - { -- GladeXML *xml; -+ GtkBuilder *xml; - GtkWidget *child; - ContainerCreateInterfaceConnectInfo info; - va_list args; -@@ -387,14 +390,16 @@ - xml = mn_glade_xml_new(filename, child_name, NULL); - child = mn_glade_xml_get_widget(xml, child_name); - -- if (GTK_IS_DIALOG(container)) -- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(container)->vbox), child, TRUE, TRUE, 0); -- else -+ if (GTK_IS_DIALOG(container)) { -+ gtk_widget_unparent(child); -+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(container))), child, TRUE, TRUE, 0); -+ } else { - gtk_container_add(container, child); -+ } - - info.container = container; - info.callback_prefix = callback_prefix; -- glade_xml_signal_autoconnect_full(xml, create_interface_connect_cb, &info); -+ gtk_builder_connect_signals_full(xml, create_interface_connect_cb, &info); - - va_start(args, callback_prefix); - -@@ -422,7 +427,7 @@ - - toplevel = gtk_widget_get_toplevel(widget); - -- return GTK_WIDGET_TOPLEVEL(toplevel) ? GTK_WINDOW(toplevel) : NULL; -+ return gtk_widget_get_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL; - } - - static void -@@ -493,9 +498,11 @@ - gpointer user_data) - { - GtkAdjustment *adjustment; -+ GtkAllocation allocation; - -+ gtk_widget_get_allocation(widget, &allocation); - adjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(widget)); -- gtk_adjustment_set_value(adjustment, (double) y / (widget->allocation.height - 2) * (adjustment->upper - adjustment->page_size)); -+ gtk_adjustment_set_value(adjustment, (double) y / (allocation.height - 2) * (gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment))); - - return TRUE; /* we're forcibly in a drop zone */ - } -@@ -562,7 +569,7 @@ - MNMailbox *mailbox; - - /* text/x-moz-url is encoded in UCS-2 but in format 8: broken */ -- if (selection_data->format != 8 || selection_data->length <= 0 || (selection_data->length % 2) != 0) -+ if (gtk_selection_data_get_format(selection_data) != 8 || gtk_selection_data_get_length(selection_data) <= 0 || (gtk_selection_data_get_length(selection_data) % 2) != 0) - { - mn_show_error_dialog(mn_widget_get_parent_window(widget), - _("A drag and drop error has occurred"), -@@ -570,8 +577,8 @@ - return; - } - -- char_data = (const guint16 *) selection_data->data; -- char_len = selection_data->length / 2; -+ char_data = (const guint16 *) gtk_selection_data_get_data(selection_data); -+ char_len = gtk_selection_data_get_length(selection_data) / 2; - - url = g_string_new(NULL); - for (i = 0; i < char_len && char_data[i] != '\n'; i++) -@@ -1322,7 +1329,7 @@ - } - - static void --dialog_run_nonmodal_destroy_h (GtkObject *object, gpointer user_data) -+dialog_run_nonmodal_destroy_h (GtkWidget *object, gpointer user_data) - { - RunNonmodalInfo *info = user_data; - -@@ -1375,7 +1382,7 @@ - - g_object_ref(dialog); - -- if (! GTK_WIDGET_VISIBLE(dialog)) -+ if (! gtk_widget_get_visible(dialog)) - gtk_widget_show(GTK_WIDGET(dialog)); - - g_object_connect(dialog, ---- src/mn-main.c.gtk3 2008-05-22 17:45:35.000000000 +0200 -+++ src/mn-main.c 2011-02-08 23:32:33.800030659 +0100 -@@ -21,7 +21,7 @@ - #include <stdlib.h> - #include <signal.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include <libgnomevfs/gnome-vfs.h> - #include <libnotify/notify.h> - #include <dbus/dbus-glib-lowlevel.h> -@@ -452,7 +452,7 @@ - - gnome_program_init(PACKAGE, - VERSION, -- LIBGNOMEUI_MODULE, -+ LIBGNOME_MODULE, - argc, - argv, - GNOME_PARAM_HUMAN_READABLE_NAME, _("Mail Notification"), -@@ -460,6 +460,8 @@ - GNOME_PARAM_GOPTION_CONTEXT, option_context, - NULL); - -+ gtk_init(&argc, &argv); -+ - if (arg_version) - { - print_version(); -@@ -497,7 +499,9 @@ - if (! gnome_vfs_init()) - mn_show_fatal_error_dialog(NULL, _("Unable to initialize the GnomeVFS library.")); - -+#if 0 - gnome_authentication_manager_init(); -+#endif - - /* must be called before init_gmime() */ - mn_conf_init(); ---- src/mn-conf.c.gtk3 2008-05-22 17:45:35.000000000 +0200 -+++ src/mn-conf.c 2011-02-07 20:07:01.630580132 +0100 -@@ -23,7 +23,7 @@ - #include <errno.h> - #include <stdarg.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-util.h" - #include "mn-conf.h" - #include "mn-shell.h" ---- data/mail-notification.desktop.in.orig 2011-07-08 13:46:52.327548264 +0200 -+++ data/mail-notification.desktop.in 2011-07-08 13:47:00.732704467 +0200 -@@ -5,7 +5,7 @@ - _Comment=Get notified when new mail arrives - Type=Application - Categories=GNOME;GTK;Network;Email; --Exec=mail-notification --sm-disable -+Exec=mail-notification - Terminal=false - StartupNotify=true - X-GNOME-DocPath=mail-notification/mail-notification.xml diff --git a/staging/mail-notification/mail-notification-5.4-icons.patch b/staging/mail-notification/mail-notification-5.4-icons.patch deleted file mode 100644 index 48d54742a..000000000 --- a/staging/mail-notification/mail-notification-5.4-icons.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nrbu mail-notification-5.4/src/mn-stock.c mail-notification-5.4-OK/src/mn-stock.c ---- mail-notification-5.4/src/mn-stock.c 2008-05-22 19:45:35.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-stock.c 2010-05-24 19:36:03.000000000 +0400 -@@ -32,11 +32,11 @@ - const char *icon_name; - const char *source_stock_id; - } icons[] = { -- { MN_STOCK_MAIL, NULL, "stock_mail" }, -- { MN_STOCK_NO_MAIL, NULL, "stock_inbox" }, -- { MN_STOCK_LOCAL, NULL, "stock_folder" }, -- { MN_STOCK_REMOTE, NULL, "stock_internet" }, -- { MN_STOCK_UNKNOWN, NULL, "stock_unknown" }, -+ { MN_STOCK_MAIL, NULL, "mail-message-new" }, -+ { MN_STOCK_NO_MAIL, NULL, "mail-notification" }, -+ { MN_STOCK_LOCAL, NULL, "folder" }, -+ { MN_STOCK_REMOTE, NULL, "applications-internet" }, -+ { MN_STOCK_UNKNOWN, NULL, "dialog-question" }, - { MN_STOCK_ERROR, NULL, NULL, GTK_STOCK_DIALOG_ERROR }, - #if WITH_GMAIL - { MN_STOCK_GMAIL, PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" }, -@@ -48,14 +48,14 @@ - { MN_STOCK_HOTMAIL, PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" }, - #endif - #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED -- { MN_STOCK_SYSTEM_MAILBOX, NULL, "system" }, -+ { MN_STOCK_SYSTEM_MAILBOX, NULL, "applications-system" }, - #endif - #if WITH_EVOLUTION - { MN_STOCK_EVOLUTION_MAILBOX, NULL, "evolution" }, - #endif -- { MN_STOCK_MAIL_READER, NULL, "stock_mail-handling" }, -- { MN_STOCK_OPEN_MESSAGE, NULL, "stock_mail-open" }, -- { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" } -+ { MN_STOCK_MAIL_READER, NULL, "mail-unread" }, -+ { MN_STOCK_OPEN_MESSAGE, NULL, "mail-read" }, -+ { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" } - }; - GtkIconFactory *factory; - GtkIconTheme *icon_theme; diff --git a/staging/mail-notification/mail-notification-5.4-kde-trayicon.patch b/staging/mail-notification/mail-notification-5.4-kde-trayicon.patch deleted file mode 100644 index a3bdc8372..000000000 --- a/staging/mail-notification/mail-notification-5.4-kde-trayicon.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c ---- mail-notification-5.4/build/src/mn-shell.c 2010-10-11 17:45:23.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-shell.c 2010-10-11 17:45:48.000000000 +0400 -@@ -313,6 +313,29 @@ - #undef __GOB_FUNCTION__ - - static void -+mn_shell_init_icon_base (MNShell * self) -+{ -+ g_return_if_fail (self != NULL); -+ g_return_if_fail (MN_IS_SHELL (self)); -+ -+ self->icon = MN_MAIL_ICON(mn_mail_icon_new()); -+ mn_add_weak_pointer(&self->icon); -+ -+ g_object_connect(self->icon, -+ "signal::activate", self_icon_activate_h, self, -+ "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self, -+ "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self, -+ "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self, -+ "swapped-signal::activate-update", self_update, self, -+ "signal::activate-properties", self_icon_activate_properties_h, self, -+ "signal::activate-help", self_icon_activate_help_h, self, -+ "signal::activate-about", self_icon_activate_about_h, self, -+ "swapped-signal::activate-remove", self_quit, self, -+ "signal::destroy", self_icon_destroy_h, self, -+ NULL); -+} -+ -+static void - mn_shell_init (MNShell * o G_GNUC_UNUSED) - { - #define __GOB_FUNCTION__ "MN:Shell::init" -@@ -793,22 +816,7 @@ - { - #line 360 "src/mn-shell.gob" - -- self->icon = MN_MAIL_ICON(mn_mail_icon_new()); -- mn_add_weak_pointer(&self->icon); -- -- g_object_connect(self->icon, -- "signal::activate", self_icon_activate_h, self, -- "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self, -- "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self, -- "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self, -- "swapped-signal::activate-update", self_update, self, -- "signal::activate-properties", self_icon_activate_properties_h, self, -- "signal::activate-help", self_icon_activate_help_h, self, -- "signal::activate-about", self_icon_activate_about_h, self, -- "swapped-signal::activate-remove", self_quit, self, -- "signal::destroy", self_icon_destroy_h, self, -- NULL); -- -+ mn_shell_init_icon_base(self); - self_update_sensitivity(self); - self_update_tooltip(self); - self_update_icon(self); -@@ -1094,7 +1102,13 @@ - } - else - { -- gtk_widget_hide(GTK_WIDGET(self->icon)); -+ /* Re-create the icon as a regular gtk_widget_hide causes the -+ * icon to remain visible on non-GNOME environments. We can't -+ * use the callback self_icon_destroy_h here as it can cause an -+ * endless recursion */ -+ g_signal_handlers_disconnect_by_func(self->icon, self_icon_destroy_h, self); -+ gtk_widget_destroy(GTK_WIDGET(self->icon)); -+ mn_shell_init_icon_base(self); - mn_mail_icon_set_blinking(self->icon, FALSE); - } - }} diff --git a/staging/mail-notification/mail-notification-5.4-libx11.patch b/staging/mail-notification/mail-notification-5.4-libx11.patch deleted file mode 100644 index bb3574fda..000000000 --- a/staging/mail-notification/mail-notification-5.4-libx11.patch +++ /dev/null @@ -1,13 +0,0 @@ -Link with libX11 explicitly. - ---- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c -+++ mail-notification-5.4.dfsg.1/jbsrc/jb.c -@@ -445,6 +445,8 @@ - - jb_compile_options_add_libs(object->compile_options, "-lm"); - -+ jb_compile_options_add_libs(object->compile_options, "-lX11"); -+ - jb_compile_options_add_package(object->compile_options, "gettext"); - jb_compile_options_add_package(object->compile_options, "gnome"); - jb_compile_options_add_package(object->compile_options, "dbus"); diff --git a/staging/mail-notification/mail-notification-5.4-popup-attach.patch b/staging/mail-notification/mail-notification-5.4-popup-attach.patch deleted file mode 100644 index b8d5f6a09..000000000 --- a/staging/mail-notification/mail-notification-5.4-popup-attach.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-popup.c mail-notification-5.4-OK/build/src/mn-popup.c ---- mail-notification-5.4/build/src/mn-popup.c 2008-05-22 19:47:49.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-popup.c 2010-10-11 17:42:32.000000000 +0400 -@@ -177,6 +177,29 @@ - #undef __GOB_FUNCTION__ - - static void -+mn_popup_wait_for_icon_to_become_ready (void) -+{ -+ int x, y; -+ int count = 0; -+ -+ /* When the tray icon is created, it can still take some time before -+ * it has arrived at the correct position. This is especially the case -+ * on KDE environments. To work around this, add a little delay of at -+ * most 2 seconds before showing a popup which is attached to the notification */ -+ do { -+ gdk_window_get_origin (gtk_widget_get_window (mn_shell->icon), &x, &y); -+ -+ if (x != 0 || y != 0) { -+ break; -+ } -+ -+ g_usleep(G_USEC_PER_SEC / 10); -+ count++; -+ } while (count < 20); -+} -+ -+ -+static void - mn_popup_init (MNPopup * o G_GNUC_UNUSED) - { - #define __GOB_FUNCTION__ "MN:Popup::init" -@@ -299,8 +322,10 @@ - "icon-name", "stock_mail", - NULL); - -- if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED) -+ if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED) { -+ mn_popup_wait_for_icon_to_become_ready(); - g_object_set(self, "attach-widget", mn_shell->icon, NULL); -+ } - - g_string_free(body, TRUE); - diff --git a/staging/mail-notification/mail-notification-5.4-sasl_encode64.patch b/staging/mail-notification/mail-notification-5.4-sasl_encode64.patch deleted file mode 100644 index 80a7304d1..000000000 --- a/staging/mail-notification/mail-notification-5.4-sasl_encode64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c ---- mail-notification-5.4/build/src/mn-pop3-mailbox.c 2009-05-19 10:29:58.448201837 +0200 -+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c 2009-05-19 10:23:29.356204287 +0200 -@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS - - if (initial_clientoutlen > 0) - { -- char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */ -+ char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */ - unsigned int outlen; - int result; - char *str; -diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c ---- mail-notification-5.4/src/mn-client-session.c 2008-05-22 17:45:35.000000000 +0200 -+++ mail-notification-5.4-OK/src/mn-client-session.c 2009-05-19 10:29:09.112211055 +0200 -@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession - static int - write_base64 (MNClientSession *session, const char *buf, unsigned int len) - { -- char buf64[len * 2]; /* Base64 is 33% larger than the data it encodes */ -+ char buf64[len * 2 + 1]; /* Base64 is 33% larger than the data it encodes */ - unsigned int outlen; - int result; - char *str; diff --git a/staging/mail-notification/mail-notification-5.4-weak.patch b/staging/mail-notification/mail-notification-5.4-weak.patch deleted file mode 100644 index 2e2a233aa..000000000 --- a/staging/mail-notification/mail-notification-5.4-weak.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c ---- mail-notification-5.4/build/src/mn-shell.c 2008-05-22 19:47:49.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-shell.c 2010-05-24 19:39:48.000000000 +0400 -@@ -1008,6 +1008,7 @@ - Self *self = user_data; - - /* The Notification Area applet has been terminated. Recreate the icon. */ -+ mn_remove_weak_pointer(&self->icon); - self_init_icon(self); - }} - #line 1014 "mn-shell.c" diff --git a/staging/mail-notification/mail-notification.install b/staging/mail-notification/mail-notification.install deleted file mode 100644 index 21cd94399..000000000 --- a/staging/mail-notification/mail-notification.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=mail-notification - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1 - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1 - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/staging/mail-notification/remove-ubuntu-special-case.patch b/staging/mail-notification/remove-ubuntu-special-case.patch deleted file mode 100644 index 4516f32c6..000000000 --- a/staging/mail-notification/remove-ubuntu-special-case.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- jbsrc/lib/src/core/jb-feature.c.~1~ 2008-04-27 16:47:27.000000000 +0200 -+++ jbsrc/lib/src/core/jb-feature.c 2008-07-22 11:40:50.856886210 +0200 -@@ -164,8 +164,6 @@ - static void - gconf_configure (void) - { -- JBVariable *variable; -- - jb_require_program("gconftool-2"); - - if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect")) -@@ -178,21 +176,6 @@ - jb_variable_set_string("gconf-config-source", config_source); - g_free(config_source); - } -- -- /* fix the default schemas dir on Ubuntu */ -- variable = jb_variable_get_variable_or_error("gconf-schemas-dir"); -- if (! variable->user_set) -- { -- static const char *ubuntu_dir = "$datadir/gconf/schemas"; -- char *expanded; -- -- expanded = jb_variable_expand(ubuntu_dir, NULL); -- -- if (g_file_test(expanded, G_FILE_TEST_IS_DIR)) -- jb_variable_set_string("gconf-schemas-dir", ubuntu_dir); -- -- g_free(expanded); -- } - } - - static void diff --git a/staging/metacity/PKGBUILD b/staging/metacity/PKGBUILD deleted file mode 100644 index fcd149581..000000000 --- a/staging/metacity/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 147952 2012-01-29 03:06:23Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=metacity -pkgver=2.34.1 -pkgrel=2 -pkgdesc="A window manager for GNOME" -arch=(i686 x86_64) -license=('GPL') -depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm') -makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') -install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/metacity \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/staging/metacity/metacity.install b/staging/metacity/metacity.install deleted file mode 100644 index 2eb1e5094..000000000 --- a/staging/metacity/metacity.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=metacity - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/staging/mjpegtools/PKGBUILD b/staging/mjpegtools/PKGBUILD deleted file mode 100644 index 8a43df518..000000000 --- a/staging/mjpegtools/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 147692 2012-01-27 05:35:16Z eric $ -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Maintainer: Roberto Carvajal <roberto@archlinux.org> - -pkgname=mjpegtools -pkgver=2.0.0 -pkgrel=2 -pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" -arch=(i686 x86_64) -license=('GPL') -url="http://mjpeg.sourceforge.net/" -depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv') -makedepends=('gtk2' 'v4l-utils') -optdepends=('gtk2: glav GUI') -options=('!makeflags' '!libtool') -install=mjpegtools.install -source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz - mjpegtools-v4l-2.6.38.patch) -md5sums=('903e1e3b967eebcc5fe5626d7517dc46' - '44006d6f844017fe57aa123aa43f4508') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch" - sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure - ./configure --prefix=/usr --enable-largefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/" -} diff --git a/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch b/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch deleted file mode 100644 index 6adeb921c..000000000 --- a/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch +++ /dev/null @@ -1,100 +0,0 @@ -Index: lavtools/lavvideo.c -=================================================================== ---- lavtools/lavvideo.c.orig -+++ lavtools/lavvideo.c -@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler. - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - - #include <videodev_mjpeg.h> - #include <frequencies.h> -Index: lavtools/liblavplay.c -=================================================================== ---- lavtools/liblavplay.c.orig -+++ lavtools/liblavplay.c -@@ -68,7 +68,8 @@ - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> -+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - #else - #define VIDEO_MODE_PAL 0 - #define VIDEO_MODE_NTSC 1 -Index: lavtools/liblavrec.c -=================================================================== ---- lavtools/liblavrec.c.orig -+++ lavtools/liblavrec.c -@@ -63,7 +63,8 @@ - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> -+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - #ifdef HAVE_SYS_SOUNDCARD_H - #include <sys/soundcard.h> - #endif -Index: lavtools/testrec.c -=================================================================== ---- lavtools/testrec.c.orig -+++ lavtools/testrec.c -@@ -89,7 +89,7 @@ - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - #include <linux/soundcard.h> - - /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit - AS_IF([test "x$with_v4l" != "xno"], [ - case $host in - *-*-linux*) -- AC_CHECK_HEADER(linux/videodev.h, -+ AC_CHECK_HEADER(libv4l1-videodev.h, - [have_video4linux=true - AC_DEFINE(HAVE_V4L, 1, - [Building for Linux - using the video4linux API])], []) -@@ -173,7 +173,7 @@ esac]) - - AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"], - [have_video4linux=false -- AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) -+ AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) - AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) - - dnl ********************************************************************* -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then : - - case $host in - *-*-linux*) -- ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" -+ ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" - if test "x$ac_cv_header_linux_videodev_h" = xyes; then : - have_video4linux=true - -@@ -16407,8 +16407,8 @@ fi - - if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then : - have_video4linux=false -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 --$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 -+$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} - fi - if test x$have_video4linux = xtrue; then - HAVE_V4L_TRUE= diff --git a/staging/mjpegtools/mjpegtools.install b/staging/mjpegtools/mjpegtools.install deleted file mode 100644 index 4d1231686..000000000 --- a/staging/mjpegtools/mjpegtools.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file=mjpeg-howto.info - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD deleted file mode 100644 index 1ed1f0303..000000000 --- a/staging/moc/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 145847 2012-01-02 21:43:42Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=moc -pkgver=20110528 -pkgrel=5 -pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" -arch=('i686' 'x86_64') -url="http://moc.daper.net/" -license=('GPL') -depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') -makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') -optdepends=('speex: for using the speex plugin' - 'ffmpeg: for using the ffmpeg plugin' - 'taglib: for using the musepack plugin' - 'libmpcdec: for using the musepack plugin' - 'wavpack: for using the wavpack plugin' - 'libmodplug: for using the modplug plugin') -options=('!libtool') -source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ - gcc-undefined-symbols.diff moc-ffmpeg.patch) -sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' - 'a811a4ac7e049914aab528d3f06a6be6634c2720' - 'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d') - -build() { - cd "${srcdir}/${pkgname}" - patch -p0 -i ../gcc-undefined-symbols.diff - patch -p0 -i ../moc-ffmpeg.patch - -# Disabling aac to use the external ffmpeg to play them (FS#13164) - ./autogen.sh - ./configure --prefix=/usr --without-rcc --without-aac \ - --with-oss --with-alsa --with-jack --with-mp3 \ - --with-musepack --with-vorbis --with-flac --with-wavpack \ - --with-sndfile --with-modplug --with-ffmpeg --with-speex \ - --with-samplerate --with-curl --disable-debug - make -} - -package() { - cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff deleted file mode 100644 index 09e9b8bda..000000000 --- a/staging/moc/gcc-undefined-symbols.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 -+++ decoder.c 2011-05-10 21:40:48.887941968 +0200 -@@ -259,6 +259,9 @@ - for (i = 0; i < plugins_num; i++) - if (plugins[i].decoder->destroy) - plugins[i].decoder->destroy (); -+ for (i = 0; i < plugins_num; i++) -+ if (plugins[i].handle) -+ lt_dlclose(plugins[i].handle); - - if (lt_dlexit()) - logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch deleted file mode 100644 index 7554ea14e..000000000 --- a/staging/moc/moc-ffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: decoder_plugins/ffmpeg/ffmpeg.c -=================================================================== ---- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) -+++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) -@@ -28,12 +28,6 @@ - #include <ffmpeg/avformat.h> - #endif - --/* libavformat's API will be changing at version 53, but at present there -- * appears to be no guidance on what will replace the deprecated fields. */ --#ifndef FF_API_OLD_METADATA --#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) --#endif -- - /* FFmpeg also likes common names, without that, our common.h and log.h - * would not be included. */ - #undef COMMON_H -@@ -137,7 +131,7 @@ - av_read_play (data->ic); - for (i = 0; i < data->ic->nb_streams; i++) { - data->enc = data->ic->streams[i]->codec; -- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { -+ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { - audio_index = i; - break; - } diff --git a/staging/mtpaint/PKGBUILD b/staging/mtpaint/PKGBUILD deleted file mode 100644 index 50049b123..000000000 --- a/staging/mtpaint/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63381 2012-01-31 21:35:06Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: yosh64 <yosh64.at.gmail.dot.com> -pkgname=mtpaint -pkgver=3.40 -pkgrel=2 -pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork" -arch=('x86_64' 'i686') -url="http://mtpaint.sourceforge.net/" -license=('GPL3') -depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2') -install=mtpaint.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" - "libpng15.patch") -sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' - 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/libpng15.patch" - ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff - sed -i 's:-lpng:-lpng -lgif:' _conf.txt - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: - diff --git a/staging/mtpaint/libpng15.patch b/staging/mtpaint/libpng15.patch deleted file mode 100644 index 7df3b2127..000000000 --- a/staging/mtpaint/libpng15.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c ---- mtpaint-3.31.orig/src/png.c 2010-01-25 00:43:07.000000000 +0200 -+++ mtpaint-3.31/src/png.c 2010-01-25 00:43:39.000000000 +0200 -@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_ - if (settings->bpp == 3) - { - png_set_strip_16(png_ptr); -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - png_set_palette_to_rgb(png_ptr); - png_set_gray_to_rgb(png_ptr); - -@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_ - png_set_strip_alpha(png_ptr); - png_set_packing(png_ptr); - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - for (i = 0; i < height; i++) - { - row_pointers[i] = settings->img[CHN_IMAGE] + i * width; diff --git a/staging/mtpaint/mtpaint.install b/staging/mtpaint/mtpaint.install deleted file mode 100644 index 99a538dea..000000000 --- a/staging/mtpaint/mtpaint.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/netpbm/PKGBUILD b/staging/netpbm/PKGBUILD deleted file mode 100644 index e94519534..000000000 --- a/staging/netpbm/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 147094 2012-01-21 19:51:59Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> - -pkgname=netpbm -pkgver=10.57.1 -pkgrel=1 -pkgdesc="A toolkit for manipulation of graphic images" -arch=('i686' 'x86_64') -license=('custom' 'BSD' 'GPL' 'LGPL') -url="http://netpbm.sourceforge.net/" -depends=('perl' 'libpng' 'libtiff' 'libxml2') -makedepends=('python2') -options=('!makeflags') -# Releases after 10.34 are available via SVN only. -# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball -# Get version number from version.mk -# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ -source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \ - ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \ - netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch) -sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e' - 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2' - 'b79cf9d42488fea065ba16262ed97694c47af08d' - '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5' - '2ac31f714121e08e47af9337c6bbaab3cbfc5c75') - -build() { - cd "${srcdir}/advanced" - patch -p1 < ../netpbm-CAN-2005-2471.patch - patch -p1 < ../netpbm-security-code.patch - patch -p1 < ../netpbm-security-scripts.patch - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman - sed -i 's|@python|@python2|' buildtools/manpage.mk - - cp config.mk.in config.mk - [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk - echo "NETPBM_DOCURL = file://${srcdir}/doc" >> config.mk - echo 'TIFFLIB = libtiff.so' >> config.mk - echo 'JPEGLIB = libjpeg.so' >> config.mk - echo 'PNGLIB = libpng.so' >> config.mk - echo 'ZLIB = libz.so' >> config.mk - - sed -i 's|misc|share/netpbm|' common.mk - sed -i 's|/link|/lib|' lib/Makefile - sed -i 's|install.manweb install.man|install.man|' GNUmakefile - - make - - # Generating useful man pages with html doc - cd "${srcdir}/doc" - make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \ - -f "${srcdir}/advanced/buildtools/manpage.mk" manpages -} - -package() { - cd "${srcdir}/advanced" - make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev - -# Removing dummy man pages - rm "${pkgdir}"/usr/share/man/man{1,3,5}/* - - cd "${srcdir}/doc" - make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \ - -f "${srcdir}/advanced/buildtools/manpage.mk" installman - -# Replace obsolete utility - echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm" - -# Licensing. Note that each program in the package has a separate license. - install -D -m644 "${srcdir}/advanced/doc/copyright_summary" \ - "${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt" -} diff --git a/staging/netpbm/netpbm-CAN-2005-2471.patch b/staging/netpbm/netpbm-CAN-2005-2471.patch deleted file mode 100644 index 3759d7ebe..000000000 --- a/staging/netpbm/netpbm-CAN-2005-2471.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 -+++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 -@@ -711,11 +711,11 @@ - ghostscriptProg, arg0, - deviceopt, outfileopt, gopt, ropt, textalphabitsopt, - "-q", "-dNOPAUSE", -- "-dSAFER", "-"); -+ "-dPARANOIDSAFER", "-"); - } - - execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", -- "-dNOPAUSE", "-dSAFER", "-", NULL); -+ "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); - - pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", - ghostscriptProg, errno, strerror(errno)); diff --git a/staging/netpbm/netpbm-security-code.patch b/staging/netpbm/netpbm-security-code.patch deleted file mode 100644 index da67a8f92..000000000 --- a/staging/netpbm/netpbm-security-code.patch +++ /dev/null @@ -1,1668 +0,0 @@ -diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c ---- netpbm-10.47.04/analyzer/pgmtexture.c.security 2009-10-21 13:38:55.000000000 +0200 -+++ netpbm-10.47.04/analyzer/pgmtexture.c 2009-10-21 15:09:33.000000000 +0200 -@@ -79,6 +79,9 @@ vector (int nl, int nh) - { - float *v; - -+ if(nh < nl) -+ pm_error("assert: h < l"); -+ overflow_add(nh - nl, 1); - MALLOCARRAY(v, (unsigned) (nh - nl + 1)); - if (v == NULL) - pm_error("Unable to allocate memory for a vector."); -@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n - float **m; - - /* allocate pointers to rows */ -+ if(nrh < nrl) -+ pm_error("assert: h < l"); -+ overflow_add(nrh - nrl, 1); - MALLOCARRAY(m, (unsigned) (nrh - nrl + 1)); - if (m == NULL) - pm_error("Unable to allocate memory for a matrix."); -@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n - assert (nch >= ncl); - - /* allocate rows and set pointers to them */ -+ if(nch < ncl) -+ pm_error("assert: h < l"); -+ overflow_add(nch - ncl, 1); - for (i = nrl; i <= nrh; ++i) { - MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); - if (m[i] == NULL) -diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c ---- netpbm-10.47.04/converter/other/gemtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/gemtopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -106,6 +106,7 @@ main(argc, argv) - - pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 ); - -+ overflow_add(cols, padright); - { - /* allocate input row data structure */ - int plane; -diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c ---- netpbm-10.47.04/converter/other/jpegtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/jpegtopnm.c 2009-10-21 15:54:30.000000000 +0200 -@@ -861,6 +861,8 @@ convertImage(FILE * - /* Calculate output image dimensions so we can allocate space */ - jpeg_calc_output_dimensions(cinfoP); - -+ overflow2(cinfoP->output_width, cinfoP->output_components); -+ - /* Start decompressor */ - jpeg_start_decompress(cinfoP); - -diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c ---- netpbm-10.47.04/converter/other/pbmtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pbmtopgm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -47,6 +47,7 @@ main(int argc, char *argv[]) { - "than the image height (%u rows)", height, rows); - - outrow = pgm_allocrow(cols) ; -+ overflow2(width, height); - maxval = MIN(PGM_OVERALLMAXVAL, width*height); - pgm_writepgminit(stdout, cols, rows, maxval, 0) ; - -diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c -diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c ---- netpbm-10.47.04/converter/other/pnmtoddif.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtoddif.c 2009-10-21 15:09:33.000000000 +0200 -@@ -632,6 +632,7 @@ main(int argc, char *argv[]) { - switch (PNM_FORMAT_TYPE(format)) { - case PBM_TYPE: - ip.bits_per_pixel = 1; -+ overflow_add(cols, 7); - ip.bytes_per_line = (cols + 7) / 8; - ip.spectral = 2; - ip.components = 1; -@@ -647,6 +648,7 @@ main(int argc, char *argv[]) { - ip.polarity = 2; - break; - case PPM_TYPE: -+ overflow2(cols, 3); - ip.bytes_per_line = 3 * cols; - ip.bits_per_pixel = 24; - ip.spectral = 5; -diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c ---- netpbm-10.47.04/converter/other/pnmtojpeg.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtojpeg.c 2009-10-21 15:56:32.000000000 +0200 -@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci - want JPOOL_PERMANENT. - */ - const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info); -- jpeg_scan_info * const scan_info = -+ const jpeg_scan_info * scan_info; -+ -+ overflow2(nscans, sizeof(jpeg_scan_info)); -+ -+ scan_info = - (jpeg_scan_info *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - scan_info_size); -@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const - const long half_maxval = maxval / 2; - long val; - -+ overflow_add(maxval, 1); -+ overflow2(maxval+1, sizeof(JSAMPLE)); - *rescale_p = (JSAMPLE *) - (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE, - (size_t) (((long) maxval + 1L) * -@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s - */ - - /* Allocate the libpnm output and compressor input buffers */ -+ overflow2(cinfo_p->image_width, cinfo_p->input_components); - buffer = (*cinfo_p->mem->alloc_sarray) - ((j_common_ptr) cinfo_p, JPOOL_IMAGE, - (unsigned int) cinfo_p->image_width * cinfo_p->input_components, -diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c ---- netpbm-10.47.04/converter/other/pnmtosgi.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtosgi.c 2009-10-21 15:09:33.000000000 +0200 -@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put - } - } - -+static void * -+xmalloc2(int x, int y) -+{ -+ void *mem; -+ -+ overflow2(x,y); -+ if( x * y == 0 ) -+ return NULL; -+ -+ mem = malloc2(x, y); -+ if( mem == NULL ) -+ pm_error("out of memory allocating %d bytes", x * y); -+ return mem; -+} -+ -+ - static void - put_big_short(short s) - { -@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int - #endif - - if( storage != STORAGE_VERBATIM ) { -+ overflow2(channels, rows); - MALLOCARRAY_NOFAIL(table, channels * rows); - MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); - } -@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no, - break; - case STORAGE_RLE: - tabrow = chan_no * rows + row; -+ overflow2(chan_no, rows); -+ overflow_add(chan_no* rows, row); - len = rle_compress(temp, cols); /* writes result into rletemp */ - channel[chan_no][row].length = len; - MALLOCARRAY(p, len); -diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c ---- netpbm-10.47.04/converter/other/rletopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/rletopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -19,6 +19,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - /* - * rletopnm - A conversion program to convert from Utah's "rle" image format -diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c ---- netpbm-10.47.04/converter/other/sgitopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/sgitopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -252,10 +252,14 @@ read_channels(ifp, head, table, func, oc - MALLOCARRAY_NOFAIL(image, head->ysize); - } else { - maxchannel = MIN(3, head->zsize); -+ overflow2(head->ysize, maxchannel); - MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); - } -- if (table) -+ if (table) { -+ overflow2(head->xsize, 2); -+ overflow_add(head->xsize*2, 2); - MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); -+ } - - for(channel = 0; channel < maxchannel; ++channel) { - unsigned int row; -diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c ---- netpbm-10.47.04/converter/other/sirtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/sirtopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -69,6 +69,7 @@ char* argv[]; - } - break; - case PPM_TYPE: -+ overflow3(cols, rows, 3); - picsize = cols * rows * 3; - planesize = cols * rows; - if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) -diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c ---- netpbm-10.47.04/converter/other/tifftopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/tifftopnm.c 2009-10-21 15:49:29.000000000 +0200 -@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut * const - if (scanbuf == NULL) - pm_error("can't allocate memory for scanline buffer"); - -- MALLOCARRAY(samplebuf, cols * spp); -+ /* samplebuf is unsigned int * !!! */ -+ samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp); -+ - if (samplebuf == NULL) - pm_error("can't allocate memory for row buffer"); - -diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c ---- netpbm-10.47.04/converter/other/xwdtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/xwdtopnm.c 2009-10-21 15:53:27.000000000 +0200 -@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader * cons - *colorsP = pnm_allocrow(2); - PNM_ASSIGN1((*colorsP)[0], 0); - PNM_ASSIGN1((*colorsP)[1], *maxvalP); -+ overflow_add(h10P->pixmap_width, 15); -+ if(h10P->pixmap_width < 0) -+ pm_error("assert: negative width"); -+ overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8); - *padrightP = - (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8; - *bits_per_itemP = 16; -@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader * cons - - *colsP = h11FixedP->pixmap_width; - *rowsP = h11FixedP->pixmap_height; -+ overflow2(h11FixedP->bytes_per_line, 8); - *padrightP = - h11FixedP->bytes_per_line * 8 - - h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; -diff -up netpbm-10.47.04/converter/other/sunicontopnm.c.security netpbm-10.47.04/converter/other/sunicontopnm.c ---- netpbm-10.47.04/converter/other/sunicontopnm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/other/sunicontopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -11,6 +11,7 @@ - */ - - #include <string.h> -+#include <limits.h> - - #include "nstring.h" - #include "pbm.h" -@@ -87,6 +88,11 @@ ReadIconFile(FILE * const - if (*heightP <= 0) - pm_error("invalid height (must be positive): %d", *heightP); - -+ if ( *widthP > INT_MAX - 16 || *widthP < 0) -+ pm_error( "invalid width: %d", *widthP); -+ -+ overflow2(*widthP + 16, *heightP); -+ - } - - -diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c ---- netpbm-10.47.04/converter/pbm/mdatopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/mdatopbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -245,10 +245,13 @@ main(int argc, char **argv) { - pm_readlittleshort(infile, &yy); nInCols = yy; - } - -+ overflow2(nOutCols, 8); - nOutCols = 8 * nInCols; - nOutRows = nInRows; -- if (bScale) -+ if (bScale) { -+ overflow2(nOutRows, 2); - nOutRows *= 2; -+ } - - data = pbm_allocarray(nOutCols, nOutRows); - -diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c ---- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP, - if (head.h_high < ' ' || head.l_high < ' ') - pm_error("Invalid width field in MGR header"); - -+ overflow_add(*colsP, pad); -+ - *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); - *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); - *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; -diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c ---- netpbm-10.47.04/converter/pbm/pbmto10x.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmto10x.c 2009-10-21 15:09:33.000000000 +0200 -@@ -162,7 +162,7 @@ main(int argc, char * argv[]) { - res_60x72(); - - pm_close(ifp); -- exit(0); -+ return 0; - } - - -diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c ---- netpbm-10.47.04/converter/pbm/pbmto4425.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmto4425.c 2009-10-21 15:09:33.000000000 +0200 -@@ -2,6 +2,7 @@ - - #include "nstring.h" - #include "pbm.h" -+#include <string.h> - - static char bit_table[2][3] = { - {1, 4, 0x10}, -@@ -160,7 +161,7 @@ main(int argc, char * argv[]) { - xres = vmap_width * 2; - yres = vmap_height * 3; - -- vmap = malloc(vmap_width * vmap_height * sizeof(char)); -+ vmap = malloc3(vmap_width, vmap_height, sizeof(char)); - if(vmap == NULL) - { - pm_error( "Cannot allocate memory" ); -diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c ---- netpbm-10.47.04/converter/pbm/pbmtogem.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtogem.c 2009-10-21 15:09:33.000000000 +0200 -@@ -123,6 +123,7 @@ putinit (rows, cols) - bitsperitem = 0; - bitshift = 7; - outcol = 0; -+ overflow_add(cols, 7); - outmax = (cols + 7) / 8; - outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); - lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); -diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c ---- netpbm-10.47.04/converter/pbm/pbmtogo.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtogo.c 2009-10-21 15:09:33.000000000 +0200 -@@ -158,6 +158,7 @@ main(int argc, - bitrow = pbm_allocrow(cols); - - /* Round cols up to the nearest multiple of 8. */ -+ overflow_add(cols, 7); - rucols = ( cols + 7 ) / 8; - bytesperrow = rucols; /* GraphOn uses bytes */ - rucols = rucols * 8; -diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c ---- netpbm-10.47.04/converter/pbm/pbmtolj.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtolj.c 2009-10-21 15:09:33.000000000 +0200 -@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv, - static void - allocateBuffers(unsigned int const cols) { - -+ overflow_add(cols, 8); - rowBufferSize = (cols + 7) / 8; -+ overflow_add(rowBufferSize, 128); -+ overflow_add(rowBufferSize, rowBufferSize+128); -+ overflow_add(rowBufferSize+10, rowBufferSize/8); - packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1; - deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10; - -diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c ---- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c 2009-10-21 15:09:33.000000000 +0200 -@@ -101,6 +101,7 @@ char *argv[]; - if( !lflg ) - left = 0; - -+ overflow_add(left, MAX_COLS - 1); - if( rflg ) - { if( right - left >= MAX_COLS ) - right = left + MAX_COLS - 1; -@@ -111,6 +112,8 @@ char *argv[]; - if( !tflg ) - top = 0; - -+ overflow_add(top, MAX_LINES - 1); -+ - if( bflg ) - { if( bottom - top >= MAX_LINES ) - bottom = top + MAX_LINES - 1; -diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c ---- netpbm-10.47.04/converter/pbm/pbmtomda.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtomda.c 2009-10-21 15:09:33.000000000 +0200 -@@ -179,6 +179,7 @@ int main(int argc, char **argv) - - nOutRowsUnrounded = bScale ? nInRows/2 : nInRows; - -+ overflow_add(nOutRowsUnrounded, 3); - nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4; - /* MDA wants rows a multiple of 4 */ - nOutCols = nInCols / 8; -diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c -diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c ---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned - return 0; - - case P4: -+ overflow_add(pbm->width, 7); - tmp=(pbm->width+7)/8; - tmp2=fread(data,1,tmp,pbm->fptr); - if(tmp2 == tmp) -@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void - return; - - pbm->unread = 1; -- pbm->revdata = malloc ((pbm->width+7)/8); -+ overflow_add(pbm->width, 7); -+ pbm->revdata = malloc((pbm->width+7)/8); - memcpy (pbm->revdata, data, (pbm->width+7)/8); - pbm->current_line--; - } -diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c ---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c 2009-10-21 15:09:33.000000000 +0200 -@@ -441,6 +441,7 @@ main(int argc, char *argv[]) { - pm_error("main(): unrecognized parameter '%s'", argv[argn]); - } - -+ overflow_add(Width, 7); - Pwidth=(Width+7)/8; - printer.fptr=out; - -diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c ---- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c 2009-10-21 15:36:54.000000000 +0200 -@@ -335,6 +335,8 @@ convertRaster(FILE * const ifP, - - unsigned char * bitrow; - unsigned int row; -+ -+ overflow_add(cols, padright); - - putinit(xbmVersion); - -diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c ---- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -45,6 +45,7 @@ main( argc, argv ) - bitrow = pbm_allocrow(cols); - - /* Compute padding to round cols up to the nearest multiple of 16. */ -+ overflow_add(cols, 16); - padright = ((cols + 15) / 16) * 16 - cols; - - putinit(cols, rows); -diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c ---- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c 2009-10-21 15:09:33.000000000 +0200 -@@ -65,6 +65,7 @@ main(int argc, char * argv[]) { - bitrow = pbm_allocrow( cols ); - - /* Compute padding to round cols up to the nearest multiple of 16. */ -+ overflow_add(cols, 16); - padright = ( ( cols + 15 ) / 16 ) * 16 - cols; - - printf( "USHORT %s[] = {\n",name); -diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c ---- netpbm-10.47.04/converter/pbm/pktopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pktopbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -277,6 +277,7 @@ main(int argc, char *argv[]) { - if (flagbyte == 7) { /* long form preamble */ - integer packetlength = get32() ; /* character packet length */ - car = get32() ; /* character number */ -+ overflow_add(packetlength, pktopbm_pkloc); - endofpacket = packetlength + pktopbm_pkloc; - /* calculate end of packet */ - if ((car >= MAXPKCHAR) || !filename[car]) { -diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l ---- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l 2009-10-21 15:09:33.000000000 +0200 -@@ -107,7 +107,9 @@ DIG [0-9] - <RASTERMODE>\033\*b{DIG}+W { - int l; - if (rowCount >= rowCapacity) { -+ overflow_add(rowCapacity, 100); - rowCapacity += 100; -+ overflow2(rowCapacity, sizeof *rows); - rows = realloc (rows, rowCapacity * sizeof *rows); - if (rows == NULL) - pm_error ("Out of memory."); -@@ -217,6 +219,8 @@ yywrap (void) - /* - * Quite simple since ThinkJet bit arrangement matches PBM - */ -+ -+ overflow2(maxRowLength, 8); - pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0); - - packed_bitrow = malloc(maxRowLength); -diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c ---- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -88,4 +88,5 @@ getinit( file, colsP, rowsP, depthP, pad - pm_error("EOF / read error"); - - *depthP = 1; -+ overflow_add(*colsP, 15); - *padrightP = ((*colsP + 15) / 16) * 16 - *colsP; -} - -diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c ---- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -58,6 +58,7 @@ main( argc, argv ) - pm_error( "depth (%d bits) is too large", depth); - - pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 ); -+ overflow_add(cols, 7); - grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 ); - - for ( row = 0; row < rows; ++row ) -@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad - - if ( *depthP == 0 ) - *depthP = 1; /* very old file */ -- -+ -+ overflow_add((int)colsP, 31); -+ - *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP; - - if ( *colsP != (cols_32 - *padrightP) ) { -diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c ---- netpbm-10.47.04/converter/pgm/psidtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/pgm/psidtopgm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -78,6 +78,7 @@ main(int argc, - pm_error("bits/sample (%d) is too large.", bitspersample); - - pgm_writepgminit(stdout, cols, rows, maxval, 0); -+ overflow_add(cols, 7); - grayrow = pgm_allocrow((cols + 7) / 8 * 8); - for (row = 0; row < rows; ++row) { - unsigned int col; -diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c ---- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -594,6 +594,7 @@ decode_row(FILE * const ifP, - rawtype *chp; - - cols = bmhdP->w; -+ overflow_add(cols, 15); - bytes = RowBytes(cols); - for( plane = 0; plane < nPlanes; plane++ ) { - int mask; -@@ -681,6 +682,23 @@ decode_mask(FILE * const ifP, - Multipalette handling - ****************************************************************************/ - -+static void * -+xmalloc2(x, y) -+ int x; -+ int y; -+{ -+ void *mem; -+ -+ overflow2(x,y); -+ if( x * y == 0 ) -+ return NULL; -+ -+ mem = malloc2(x,y); -+ if( mem == NULL ) -+ pm_error("out of memory allocating %d bytes", x * y); -+ return mem; -+} -+ - - static void - multi_adjust(cmap, row, palchange) -@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE * const ifP, - if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) - pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); - -+ overflow_add(redmaxval, 1); -+ overflow_add(greenmaxval, 1); -+ overflow_add(bluemaxval, 1); - MALLOCARRAY_NOFAIL(redtable, redmaxval +1); - MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); - MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); -@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data - ChangeCount32 = *data++; - datasize -= 2; - -+ overflow_add(ChangeCount16, ChangeCount32); - changes = ChangeCount16 + ChangeCount32; -+ overflow_add(changes, 1); - for( i = 0; i < changes; i++ ) { - if( totalchanges >= PCHG->TotalChanges ) goto fail; - if( datasize < 2 ) goto fail; -@@ -1994,6 +2017,9 @@ read_pchg(FILE * const ifp, - cmap->mp_change[i] = NULL; - if( PCHG.StartLine < 0 ) { - int nch; -+ if(PCHG.MaxReg < PCHG.MinReg) -+ pm_error("assert: MinReg > MaxReg"); -+ overflow_add(PCHG.MaxReg-PCHG.MinReg, 2); - nch = PCHG.MaxReg - PCHG.MinReg +1; - MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1); - for( i = 0; i < nch; i++ ) -@@ -2070,6 +2096,7 @@ process_body( FILE * const ifp, - if( typeid == ID_ILBM ) { - int isdeep; - -+ overflow_add(bmhdP->w, 15); - MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w)); - *viewportmodesP |= fakeviewport; /* -isham/-isehb */ - -diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c ---- netpbm-10.47.04/converter/ppm/imgtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/imgtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -84,6 +84,7 @@ main(int argc, char ** argv) { - len = atoi((char*) buf ); - if ( fread( buf, len, 1, ifp ) != 1 ) - pm_error( "bad colormap buf" ); -+ overflow2(cmaplen, 3); - if ( cmaplen * 3 != len ) - { - pm_message( -@@ -105,6 +106,7 @@ main(int argc, char ** argv) { - pm_error( "bad pixel data header" ); - buf[8] = '\0'; - len = atoi((char*) buf ); -+ overflow2(cols, rows); - if ( len != cols * rows ) - pm_message( - "pixel data length (%d) does not match image size (%d)", -diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile ---- netpbm-10.47.04/converter/ppm/Makefile.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/Makefile 2009-10-21 15:09:33.000000000 +0200 -@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg - - PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ - leaftoppm mtvtoppm neotoppm \ -- pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \ -+ pcxtoppm pc1toppm pi1toppm pjtoppm \ - ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \ - ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ - ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ -diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c ---- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, - /* - * clear the pixel buffer - */ -+ overflow2(bytesperline, 8); - npixels = (bytesperline * 8) / bitsperpixel; - p = pixels; - while (--npixels >= 0) -@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE * const ifP, - } - - /* BytesPerLine should be >= BitsPerPixel * cols / 8 */ -+ overflow2(BytesPerLine, 8); - rawcols = BytesPerLine * 8 / BitsPerPixel; - if (headerCols > rawcols) { - pm_message("warning - BytesPerLine = %d, " -diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c ---- netpbm-10.47.04/converter/ppm/picttoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/picttoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -1,3 +1,5 @@ -+#error "Unfixable. Don't ship me" -+ - /* - * picttoppm.c -- convert a MacIntosh PICT file to PPM format. - * -diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c ---- netpbm-10.47.04/converter/ppm/pjtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/pjtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -127,19 +127,21 @@ main(argc, argv) - case 'V': /* send plane */ - case 'W': /* send last plane */ - if (rows == -1 || r >= rows || image == NULL) { -- if (rows == -1 || r >= rows) -+ if (rows == -1 || r >= rows) { -+ overflow_add(rows, 100); - rows += 100; -+ } - if (image == NULL) { -- MALLOCARRAY(image, rows * planes); -- MALLOCARRAY(imlen, rows * planes); -+ image = (unsigned char **) -+ malloc3(rows , planes , sizeof(unsigned char *)); -+ imlen = (int *) malloc3(rows , planes, sizeof(int)); - } - else { -+ overflow2(rows,planes); - image = (unsigned char **) -- realloc(image, -- rows * planes * -+ realloc2(image, rows * planes, - sizeof(unsigned char *)); -- imlen = (int *) -- realloc(imlen, rows * planes * sizeof(int)); -+ imlen = (int *) realloc2(imlen, rows * planes, sizeof(int)); - } - } - if (image == NULL || imlen == NULL) -@@ -212,8 +214,10 @@ main(argc, argv) - for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2) - for (cmd = image[p + r * planes][c], - val = image[p + r * planes][c+1]; -- cmd >= 0 && i < newcols; cmd--, i++) -+ cmd >= 0 && i < newcols; cmd--, i++) { - buf[i] = val; -+ overflow_add(i, 1); -+ } - cols = cols > i ? cols : i; - free(image[p + r * planes]); - /* -@@ -224,6 +228,7 @@ main(argc, argv) - image[p + r * planes] = (unsigned char *) realloc(buf, i); - } - } -+ overflow2(cols, 8); - cols *= 8; - } - -diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c ---- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c 2009-10-21 15:09:33.000000000 +0200 -@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva - - int index; - -+ overflow_add(maxval, 1); - MALLOCARRAY_NOFAIL(mult299 , maxval+1); - MALLOCARRAY_NOFAIL(mult587 , maxval+1); - MALLOCARRAY_NOFAIL(mult114 , maxval+1); -diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c ---- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c 2009-10-21 15:09:33.000000000 +0200 -@@ -169,7 +169,7 @@ char* argv[]; - - if (rleflag) { - pm_message("sending run-length encoded picture data ..." ); -- testimage = (char*) malloc(rows*cols); -+ testimage = (char*) malloc2(rows, cols); - p = testimage; - for (i=0; i<rows; i++) - for (j=0; j<cols; j++) -diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c ---- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c 2009-10-21 15:47:50.000000000 +0200 -@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval) - - maskmethod = 0; /* no masking - RGB8 uses genlock bits */ - compmethod = 4; /* RGB8 files are always compressed */ -+ overflow2(cols, 4); - MALLOCARRAY_NOFAIL(compr_row, cols * 4); - - if( maxval != 255 ) { -@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval) - - maskmethod = 0; /* no masking - RGBN uses genlock bits */ - compmethod = 4; /* RGBN files are always compressed */ -+ overflow2(cols, 2); - MALLOCARRAY_NOFAIL(compr_row, cols * 2); - - if( maxval != 15 ) { -@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval) - unsigned int i; - int * table; - -+ overflow_add(oldmaxval, 1); - MALLOCARRAY_NOFAIL(table, oldmaxval + 1); - for (i = 0; i <= oldmaxval; ++i) - table[i] = ROUNDDIV(i * newmaxval, oldmaxval); -@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) { - MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols)); - for (i = 0; i < RowBytes(cols); ++i) - coded_rowbuf[i] = 0; -- if (DO_COMPRESS) -+ if (DO_COMPRESS) { -+ overflow2(cols,2); -+ overflow_add(cols*2,2); - MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols))); -+ } - } - - switch (mode) { -diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c ---- netpbm-10.47.04/converter/ppm/ppmtolj.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtolj.c 2009-10-21 15:09:33.000000000 +0200 -@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) { - - ppm_readppminit( ifp, &cols, &rows, &maxval, &format ); - pixelrow = ppm_allocrow( cols ); -- -+ -+ overflow2(cols, 6); - obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char)); - cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char)); - if (mode == C_TRANS_MODE_DELTA) -diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c ---- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c 2009-10-21 15:48:30.000000000 +0200 -@@ -685,6 +685,8 @@ main(int argc, char * argv[]) { - medias = MSize_User; - - if (dpi300) { -+ overflow2(medias.maxcols, 2); -+ overflow2(medias.maxrows, 2); - medias.maxcols *= 2; - medias.maxrows *= 2; - } -diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c ---- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c 2009-10-21 15:09:33.000000000 +0200 -@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel ** cons - else Planes = 1; - } - } -+ overflow2(BitsPerPixel, cols); -+ overflow_add(BitsPerPixel * cols, 7); - BytesPerLine = ((cols * BitsPerPixel) + 7) / 8; - MALLOCARRAY_NOFAIL(indexRow, cols); - MALLOCARRAY_NOFAIL(planesrow, BytesPerLine); -diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c ---- netpbm-10.47.04/converter/ppm/ppmtopict.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopict.c 2009-10-21 15:09:33.000000000 +0200 -@@ -245,6 +245,8 @@ char *argv[]; - putShort(stdout, 0); /* mode */ - - /* Finally, write out the data. */ -+ overflow_add(cols/MAX_COUNT, 1); -+ overflow_add(cols, cols/MAX_COUNT+1); - packed = malloc((unsigned)(cols+cols/MAX_COUNT+1)); - for (row = 0, oc = 0; row < rows; row++) - oc += putRow(stdout, row, cols, pixels[row], packed); -diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c ---- netpbm-10.47.04/converter/ppm/ppmtopj.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopj.c 2009-10-21 15:09:33.000000000 +0200 -@@ -179,6 +179,7 @@ char *argv[]; - pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); - - pm_close( ifp ); -+ overflow2(cols,2); - obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char)); - cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char)); - -diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c ---- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c 2009-10-21 15:43:31.000000000 +0200 -@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) { - pm_error("image too large; reduce with ppmscale"); - if (maxval > PCL_MAXVAL) - pm_error("color range too large; reduce with ppmcscale"); -+ if (cols < 0 || rows < 0) -+ pm_error("negative size is not possible"); - - /* Figure out the colormap. */ - pm_message("Computing colormap..."); -@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) { - case 0: /* direct mode (no palette) */ - bpp = bitsperpixel(maxval); /* bits per pixel */ - bpg = bpp; bpb = bpp; -+ overflow2(bpp, 3); -+ overflow_add(bpp*3, 7); - bpp = (bpp*3+7)>>3; /* bytes per pixel now */ - bpr = (bpp<<3)-bpg-bpb; - bpp *= cols; /* bytes per row now */ -@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) { - case 3: case 7: pclindex++; - default: - bpp = 8/pclindex; -+ overflow_add(cols, bpp); -+ if(bpp == 0) -+ pm_error("assert: no bpp"); - bpp = (cols+bpp-1)/bpp; /* bytes per row */ - } - } -+ overflow2(bpp,2); - inrow = (char *)malloc((unsigned)bpp); - outrow = (char *)malloc((unsigned)bpp*2); - runcnt = (signed char *)malloc((unsigned)bpp); -diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c ---- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c 2009-10-21 15:44:54.000000000 +0200 -@@ -12,6 +12,7 @@ - - #include <math.h> - #include <string.h> -+#include <stdlib.h> - - #include "pm_c_util.h" - #include "winico.h" -@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c - MALLOCARRAY_NOFAIL(rowData, rows); - icBitmap->xBytes = xBytes; - icBitmap->data = rowData; -+ overflow2(xBytes, rows); - icBitmap->size = xBytes * rows; - for (y=0;y<rows;y++) { - u1 * row; -@@ -347,6 +349,7 @@ create4Bitmap (pixel ** const pa, int co - MALLOCARRAY_NOFAIL(rowData, rows); - icBitmap->xBytes = xBytes; - icBitmap->data = rowData; -+ overflow2(xBytes, rows); - icBitmap->size = xBytes * rows; - - for (y=0;y<rows;y++) { -@@ -407,6 +410,7 @@ create8Bitmap (pixel ** const pa, int co - MALLOCARRAY_NOFAIL(rowData, rows); - icBitmap->xBytes = xBytes; - icBitmap->data = rowData; -+ overflow2(xBytes, rows); - icBitmap->size = xBytes * rows; - - for (y=0;y<rows;y++) { -@@ -714,6 +718,10 @@ addEntryToIcon(MS_Ico const MSIcon - entry->bitcount = bpp; - entry->ih = createInfoHeader(entry, xorBitmap, andBitmap); - entry->colors = palette->colors; -+ overflow2(4, entry->color_count); -+ overflow_add(xorBitmap->size, andBitmap->size); -+ overflow_add(xorBitmap->size + andBitmap->size, 40); -+ overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count); - entry->size_in_bytes = - xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count); - if (verbose) -diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c ---- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int - unsigned int i; - - /* Allocate memory for printed number. Abort if error. */ -+ overflow_add(digits, 1); - if (!(str = (char *) malloc(digits + 1))) - pm_error("out of memory"); - -@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, - unsigned int charsPerPixel; - unsigned int xpmMaxval; - -+ if (includeTransparent) overflow_add(ncolors, 1); - MALLOCARRAY(cmap, cmapSize); - if (cmapP == NULL) - pm_error("Out of memory allocating %u bytes for a color map.", -diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c ---- netpbm-10.47.04/converter/ppm/qrttoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/qrttoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -46,7 +46,7 @@ main( argc, argv ) - - ppm_writeppminit( stdout, cols, rows, maxval, 0 ); - pixelrow = ppm_allocrow( cols ); -- buf = (unsigned char *) malloc( 3 * cols ); -+ buf = (unsigned char *) malloc2( 3 , cols ); - if ( buf == (unsigned char *) 0 ) - pm_error( "out of memory" ); - -diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c ---- netpbm-10.47.04/converter/ppm/sldtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/sldtoppm.c 2009-10-21 15:44:11.000000000 +0200 -@@ -455,6 +455,8 @@ slider(slvecfn slvec, - - /* Allocate image buffer and clear it to black. */ - -+ overflow_add(ixdots,1); -+ overflow_add(iydots,1); - pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); - PPM_ASSIGN(rgbcolor, 0, 0, 0); - ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, -diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c ---- netpbm-10.47.04/converter/ppm/ximtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/ximtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -117,6 +117,7 @@ ReadXimHeader(FILE * const in_fp, - header->bits_channel = atoi(a_head.bits_per_channel); - header->alpha_flag = atoi(a_head.alpha_channel); - if (strlen(a_head.author)) { -+ overflow_add(strlen(a_head.author),1); - if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1, - 1))) { - pm_message("ReadXimHeader: can't calloc author string" ); -@@ -126,6 +127,7 @@ ReadXimHeader(FILE * const in_fp, - strncpy(header->author, a_head.author, strlen(a_head.author)); - } - if (strlen(a_head.date)) { -+ overflow_add(strlen(a_head.date),1); - if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){ - pm_message("ReadXimHeader: can't calloc date string" ); - return(0); -@@ -134,6 +136,7 @@ ReadXimHeader(FILE * const in_fp, - strncpy(header->date, a_head.date, strlen(a_head.date)); - } - if (strlen(a_head.program)) { -+ overflow_add(strlen(a_head.program),1); - if (!(header->program = calloc( - (unsigned int)strlen(a_head.program) + 1, 1))) { - pm_message("ReadXimHeader: can't calloc program string" ); -@@ -160,6 +163,7 @@ ReadXimHeader(FILE * const in_fp, - if (header->nchannels == 3 && header->bits_channel == 8) - header->ncolors = 0; - else if (header->nchannels == 1 && header->bits_channel == 8) { -+ overflow2(header->ncolors, sizeof(Color)); - header->colors = (Color *)calloc((unsigned int)header->ncolors, - sizeof(Color)); - if (header->colors == NULL) { -diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c ---- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c - &ncolors, colorsP, &ptab); - *transparentP = -1; /* No transparency in version 1 */ - } -+ overflow2(*widthP, *heightP); - totalpixels = *widthP * *heightP; - MALLOCARRAY(*dataP, totalpixels); - if (*dataP == NULL) -diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c ---- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -72,6 +72,7 @@ main(argc, argv) - - ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0); - pixrow = ppm_allocrow(cols); -+ overflow_add(cols, 1); - MALLOCARRAY(yuvbuf, (cols+1)/2); - if (yuvbuf == NULL) - pm_error("Unable to allocate YUV buffer for %d columns.", cols); -diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c ---- netpbm-10.47.04/editor/pamcut.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pamcut.c 2009-10-21 15:29:36.000000000 +0200 -@@ -655,6 +655,8 @@ cutOneImage(FILE * const ifP - - outpam = inpam; /* Initial value -- most fields should be same */ - outpam.file = ofP; -+ overflow_add(rightcol, 1); -+ overflow_add(bottomrow, 1); - outpam.width = rightcol - leftcol + 1; - outpam.height = bottomrow - toprow + 1; - -diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c ---- netpbm-10.47.04/editor/pbmreduce.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pbmreduce.c 2009-10-21 15:26:13.000000000 +0200 -@@ -94,6 +94,7 @@ main( argc, argv ) - if (halftone == QT_FS) { - unsigned int col; - /* Initialize Floyd-Steinberg. */ -+ overflow_add(newcols, 2); - MALLOCARRAY(thiserr, newcols + 2); - MALLOCARRAY(nexterr, newcols + 2); - if (thiserr == NULL || nexterr == NULL) -diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c ---- netpbm-10.47.04/editor/pnmgamma.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmgamma.c 2009-10-21 15:09:34.000000000 +0200 -@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction - xelval ** const btableP) { - - /* Allocate space for the tables. */ -+ overflow_add(maxval, 1); - MALLOCARRAY(*rtableP, maxval+1); - MALLOCARRAY(*gtableP, maxval+1); - MALLOCARRAY(*btableP, maxval+1); -diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c ---- netpbm-10.47.04/editor/pnmhisteq.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmhisteq.c 2009-10-21 15:09:34.000000000 +0200 -@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const * - unsigned int pixelCount; - unsigned int * lumahist; - -+ overflow_add(maxval, 1); - MALLOCARRAY(lumahist, maxval + 1); - if (lumahist == NULL) - pm_error("Out of storage allocating array for %u histogram elements", -diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh ---- netpbm-10.47.04/editor/pnmindex.csh.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmindex.csh 2009-10-21 15:09:34.000000000 +0200 -@@ -1,5 +1,8 @@ - #!/bin/csh -f - # -+echo "Unsafe code, needs debugging, do not ship" -+exit 1 -+# - # pnmindex - build a visual index of a bunch of anymaps - # - # Copyright (C) 1991 by Jef Poskanzer. -diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c ---- netpbm-10.47.04/editor/pnmpad.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmpad.c 2009-10-21 15:33:51.000000000 +0200 -@@ -527,6 +527,8 @@ main(int argc, const char ** argv) { - - computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad); - -+ overflow_add(cols, lpad); -+ overflow_add(cols + lpad, rpad); - newcols = cols + lpad + rpad; - - if (PNM_FORMAT_TYPE(format) == PBM_TYPE) -diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c -diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c ---- netpbm-10.47.04/editor/pnmremap.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmremap.c 2009-10-21 15:28:20.000000000 +0200 -@@ -408,7 +408,7 @@ initFserr(struct pam * const pamP, - unsigned int plane; - - unsigned int const fserrSize = pamP->width + 2; -- -+ overflow_add(pamP->width, 2); - fserrP->width = pamP->width; - - MALLOCARRAY(fserrP->thiserr, pamP->depth); -@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st - - int col; - -+ overflow_add(pamP->width, 2); - for (col = 0; col < pamP->width + 2; ++col) { - unsigned int plane; - for (plane = 0; plane < pamP->depth; ++plane) -diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c ---- netpbm-10.47.04/editor/pnmscalefixed.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmscalefixed.c 2009-10-21 15:09:34.000000000 +0200 -@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c - const int rows, const int cols, - int * newrowsP, int * newcolsP) { - -+ overflow2(rows, cols); -+ - if (cmdline.pixels) { - if (rows * cols <= cmdline.pixels) { - *newrowsP = rows; -@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c - - if (*newcolsP < 1) *newcolsP = 1; - if (*newrowsP < 1) *newrowsP = 1; -+ -+ overflow2(*newcolsP, *newrowsP); - } - - -@@ -443,6 +447,9 @@ main(int argc, char **argv ) { - unfilled. We can address that by stretching, whereas the other - case would require throwing away some of the input. - */ -+ -+ overflow2(newcols, SCALE); -+ overflow2(newrows, SCALE); - sxscale = SCALE * newcols / cols; - syscale = SCALE * newrows / rows; - -diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c ---- netpbm-10.47.04/editor/pnmshear.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pnmshear.c 2009-10-21 15:31:26.000000000 +0200 -@@ -15,6 +15,7 @@ - #include <assert.h> - #include <math.h> - #include <string.h> -+#include <limits.h> - - #include "pm_c_util.h" - #include "ppm.h" -@@ -236,6 +237,11 @@ main(int argc, char * argv[]) { - - shearfac = fabs(tan(cmdline.angle)); - -+ if(rows * shearfac >= INT_MAX-1) -+ pm_error("image too large"); -+ -+ overflow_add(rows * shearfac, cols+1); -+ - newcols = rows * shearfac + cols + 0.999999; - - pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0); -diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c ---- netpbm-10.47.04/editor/specialty/pamoil.c.security 2009-10-21 13:38:56.000000000 +0200 -+++ netpbm-10.47.04/editor/specialty/pamoil.c 2009-10-21 15:09:33.000000000 +0200 -@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) { - tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type)); - pm_close(ifp); - -+ overflow_add(inpam.maxval, 1); - MALLOCARRAY(hist, inpam.maxval + 1); - if (hist == NULL) - pm_error("Unable to allocate memory for histogram."); -diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c ---- netpbm-10.47.04/generator/pbmtext.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/generator/pbmtext.c 2009-10-21 15:23:15.000000000 +0200 -@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char ** - - for (i = 1; i < argc; ++i) { - if (i > 1) { -+ overflow_add(totaltextsize, 1); - totaltextsize += 1; - text = realloc(text, totaltextsize); - if (text == NULL) - pm_error("out of memory allocating space for input text"); - strcat(text, " "); - } -+ overflow_add(totaltextsize, strlen(argv[i])); - totaltextsize += strlen(argv[i]); - text = realloc(text, totaltextsize); - if (text == NULL) -@@ -711,6 +713,7 @@ getText(const char cmdline_text - pm_error("A line of input text is longer than %u characters." - "Cannot process.", sizeof(buf)-1); - if (lineCount >= maxlines) { -+ overflow2(maxlines, 2); - maxlines *= 2; - REALLOCARRAY(text_array, maxlines); - if (text_array == NULL) -@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) { - hmargin = fontP->maxwidth; - } else { - vmargin = fontP->maxheight; -+ overflow2(2, fontP->maxwidth); - hmargin = 2 * fontP->maxwidth; - } - } -diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c ---- netpbm-10.47.04/generator/pgmcrater.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/generator/pgmcrater.c 2009-10-21 15:09:34.000000000 +0200 -@@ -130,7 +130,7 @@ static void gencraters() - /* Acquire the elevation array and initialize it to mean - surface elevation. */ - -- MALLOCARRAY(aux, SCRX * SCRY); -+ aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short)); - if (aux == NULL) - pm_error("out of memory allocating elevation array"); - -diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c ---- netpbm-10.47.04/generator/pgmkernel.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/generator/pgmkernel.c 2009-10-21 15:09:34.000000000 +0200 -@@ -68,7 +68,7 @@ main ( argc, argv ) - kycenter = (fysize - 1) / 2.0; - ixsize = fxsize + 0.999; - iysize = fysize + 0.999; -- MALLOCARRAY(fkernel, ixsize * iysize); -+ fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double)); - for (i = 0; i < iysize; i++) - for (j = 0; j < ixsize; j++) { - fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double) -diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c ---- netpbm-10.47.04/lib/libpam.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpam.c 2009-10-21 15:09:34.000000000 +0200 -@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam - int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); - tuple * tuplerow; - -- tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple)); -+ overflow_add(sizeof(tuple *), bytesPerTuple); -+ tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple); - - if (tuplerow != NULL) { - /* Now we initialize the pointers to the individual tuples -diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c ---- netpbm-10.47.04/lib/libpammap.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpammap.c 2009-10-21 15:09:34.000000000 +0200 -@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const - */ - struct tupleint_list_item * retval; - -+ overflow2(pamP->depth, sizeof(sample)); -+ overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample)); - unsigned int const size = - sizeof(*retval) - sizeof(retval->tupleint.tuple) - + pamP->depth * sizeof(sample); -diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c ---- netpbm-10.47.04/lib/libpbm1.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpbm1.c 2009-10-21 15:09:34.000000000 +0200 -@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che - pm_message("pm_filepos passed to pm_check() is %u bytes", - sizeof(pm_filepos)); - #endif -+ overflow2(bytes_per_row, rows); - pm_check(file, check_type, need_raster_size, retval_p); - } - } ---- netpbm-10.47.04/lib/libpm.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpm.c 2009-10-21 15:09:34.000000000 +0200 -@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) - } - - -+/* -+ * Maths wrapping -+ */ -+ -+void __overflow2(int a, int b) -+{ -+ if(a < 0 || b < 0) -+ pm_error("object too large"); -+ if(b == 0) -+ return; -+ if(a > INT_MAX / b) -+ pm_error("object too large"); -+} -+ -+void overflow3(int a, int b, int c) -+{ -+ overflow2(a,b); -+ overflow2(a*b, c); -+} -+ -+void overflow_add(int a, int b) -+{ -+ if( a > INT_MAX - b) -+ pm_error("object too large"); -+} -+ -+void *malloc2(int a, int b) -+{ -+ overflow2(a, b); -+ if(a*b == 0) -+ pm_error("Zero byte allocation"); -+ return malloc(a*b); -+} -+ -+void *malloc3(int a, int b, int c) -+{ -+ overflow3(a, b, c); -+ if(a*b*c == 0) -+ pm_error("Zero byte allocation"); -+ return malloc(a*b*c); -+} -+ -+void *realloc2(void * a, int b, int c) -+{ -+ overflow2(b, c); -+ if(b*c == 0) -+ pm_error("Zero byte allocation"); -+ return realloc(a, b*c); -+} - -diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h ---- netpbm-10.47.04/lib/pm.h.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/pm.h 2009-10-21 15:09:34.000000000 +0200 -@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg); - #endif - - -+void *malloc2(int, int); -+void *malloc3(int, int, int); -+#define overflow2(a,b) __overflow2(a,b) -+void __overflow2(int, int); -+void overflow3(int, int, int); -+void overflow_add(int, int); -+ - #endif -diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c ---- netpbm-10.47.04/other/pnmcolormap.c.security 2009-10-21 13:38:54.000000000 +0200 -+++ netpbm-10.47.04/other/pnmcolormap.c 2009-10-21 15:09:34.000000000 +0200 -@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP - pamP->width = intsqrt; - else - pamP->width = intsqrt + 1; -+ overflow_add(intsqrt, 1); - } - { - unsigned int const intQuotient = colormap.size / pamP->width; -diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c ---- netpbm-10.47.04/urt/rle_addhist.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_addhist.c 2009-10-21 15:09:34.000000000 +0200 -@@ -14,6 +14,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - /* - * rle_addhist.c - Add to the HISTORY comment in header -@@ -76,13 +78,19 @@ rle_addhist(char * argv[], - return; - - length = 0; -- for (i = 0; argv[i]; ++i) -+ for (i = 0; argv[i]; ++i) { -+ overflow_add(length, strlen(argv[i])); -+ overflow_add(length+1, strlen(argv[i])); - length += strlen(argv[i]) +1; /* length of each arg plus space. */ -+ } - - time(&temp); - timedate = ctime(&temp); - length += strlen(timedate); /* length of date and time in ASCII. */ - -+ overflow_add(strlen(padding), 4); -+ overflow_add(strlen(histoire), strlen(padding) + 4); -+ overflow_add(length, strlen(histoire) + strlen(padding) + 4); - length += strlen(padding) + 3 + strlen(histoire) + 1; - /* length of padding, "on " and length of history name plus "="*/ - if (in_hdr) /* if we are interested in the old comments... */ -@@ -90,9 +98,12 @@ rle_addhist(char * argv[], - else - old = NULL; - -- if (old && *old) -+ if (old && *old) { -+ overflow_add(length, strlen(old)); - length += strlen(old); /* add length if there. */ -+ } - -+ overflow_add(length, 1); - ++length; /*Cater for the null. */ - - MALLOCARRAY(newc, length); -diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c ---- netpbm-10.47.04/urt/rle_getrow.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_getrow.c 2009-10-21 15:09:34.000000000 +0200 -@@ -17,6 +17,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - /* - * rle_getrow.c - Read an RLE file in. -@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) { - register char * cp; - - VAXSHORT( comlen, infile ); /* get comment length */ -+ overflow_add(comlen, 1); - evenlen = (comlen + 1) & ~1; /* make it even */ - if ( evenlen ) - { -diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c ---- netpbm-10.47.04/urt/rle_hdr.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_hdr.c 2009-10-21 15:09:34.000000000 +0200 -@@ -14,6 +14,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - /* - * rle_hdr.c - Functions to manipulate rle_hdr structures. -@@ -79,7 +81,10 @@ int img_num; - /* Fill in with copies of the strings. */ - if ( the_hdr->cmd != pgmname ) - { -- char *tmp = (char *)malloc( strlen( pgmname ) + 1 ); -+ char *tmp ; -+ -+ overflow_add(strlen(pgmname), 1); -+ tmp = malloc( strlen( pgmname ) + 1 ); - RLE_CHECK_ALLOC( pgmname, tmp, 0 ); - strcpy( tmp, pgmname ); - the_hdr->cmd = tmp; -@@ -87,7 +92,9 @@ int img_num; - - if ( the_hdr->file_name != fname ) - { -- char *tmp = (char *)malloc( strlen( fname ) + 1 ); -+ char *tmp; -+ overflow_add(strlen(fname), 1); -+ tmp = malloc( strlen( fname ) + 1 ); - RLE_CHECK_ALLOC( pgmname, tmp, 0 ); - strcpy( tmp, fname ); - the_hdr->file_name = tmp; -@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr; - if ( to_hdr->bg_color ) - { - int size = to_hdr->ncolors * sizeof(int); -+ overflow2(to_hdr->ncolors, sizeof(int)); - to_hdr->bg_color = (int *)malloc( size ); - RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" ); - memcpy( to_hdr->bg_color, from_hdr->bg_color, size ); -@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr; - if ( to_hdr->cmap ) - { - int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map); -- to_hdr->cmap = (rle_map *)malloc( size ); -+ to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map)); - RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" ); - memcpy( to_hdr->cmap, from_hdr->cmap, size ); - } -@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr; - int size = 0; - CONST_DECL char **cp; - for ( cp=to_hdr->comments; *cp; cp++ ) -+ { -+ overflow_add(size, 1); - size++; /* Count the comments. */ -+ } - /* Check if there are really any comments. */ - if ( size ) - { -+ overflow_add(size, 1); - size++; /* Copy the NULL pointer, too. */ -+ overflow2(size, sizeof(char *)); - size *= sizeof(char *); - to_hdr->comments = (CONST_DECL char **)malloc( size ); - RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); -diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c ---- netpbm-10.47.04/urt/rle_open_f.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_open_f.c 2009-10-21 15:15:38.000000000 +0200 -@@ -163,64 +163,7 @@ dealWithSubprocess(const char * const f - bool * const noSubprocessP, - const char ** const errorP) { - --#ifdef NO_OPEN_PIPES - *noSubprocessP = TRUE; --#else -- const char *cp; -- -- reapChildren(catchingChildrenP, pids); -- -- /* Real file, not stdin or stdout. If name ends in ".Z", -- * pipe from/to un/compress (depending on r/w mode). -- * -- * If it starts with "|", popen that command. -- */ -- -- cp = file_name + strlen(file_name) - 2; -- /* Pipe case. */ -- if (file_name[0] == '|') { -- pid_t thepid; /* PID from my_popen */ -- -- *noSubprocessP = FALSE; -- -- *fpP = my_popen(file_name + 1, mode, &thepid); -- if (*fpP == NULL) -- *errorP = "%s: can't invoke <<%s>> for %s: "; -- else { -- /* One more child to catch, eventually. */ -- if (*catchingChildrenP < MAX_CHILDREN) -- pids[(*catchingChildrenP)++] = thepid; -- } -- } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) { -- /* Compress case. */ -- pid_t thepid; /* PID from my_popen. */ -- const char * command; -- -- *noSubprocessP = FALSE; -- -- if (*mode == 'w') -- pm_asprintf(&command, "compress > %s", file_name); -- else if (*mode == 'a') -- pm_asprintf(&command, "compress >> %s", file_name); -- else -- pm_asprintf(&command, "compress -d < %s", file_name); -- -- *fpP = my_popen(command, mode, &thepid); -- -- if (*fpP == NULL) -- *errorP = "%s: can't invoke 'compress' program, " -- "trying to open %s for %s"; -- else { -- /* One more child to catch, eventually. */ -- if (*catchingChildrenP < MAX_CHILDREN) -- pids[(*catchingChildrenP)++] = thepid; -- } -- pm_strfree(command); -- } else { -- *noSubprocessP = TRUE; -- *errorP = NULL; -- } --#endif - } - - -diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c ---- netpbm-10.47.04/urt/rle_putcom.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle_putcom.c 2009-10-21 15:09:34.000000000 +0200 -@@ -14,6 +14,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - /* - * rle_putcom.c - Add a picture comment to the header struct. -@@ -98,12 +100,14 @@ rle_putcom(const char * const value, - const char * v; - const char ** old_comments; - int i; -- for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) -+ for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) { -+ overflow_add(i, 1); - if (match(value, *cp) != NULL) { - v = *cp; - *cp = value; - return v; - } -+ } - /* Not found */ - /* Can't realloc because somebody else might be pointing to this - * comments block. Of course, if this were true, then the -diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c ---- netpbm-10.47.04/urt/Runput.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/Runput.c 2009-10-21 15:09:34.000000000 +0200 -@@ -17,6 +17,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - /* - * Runput.c - General purpose Run Length Encoding. -@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr) - if ( the_hdr->background != 0 ) - { - register int i; -- register rle_pixel *background = -- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); -+ register rle_pixel *background; - register int *bg_color; -+ -+ overflow_add(the_hdr->ncolors,1); -+ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); - /* - * If even number of bg color bytes, put out one more to get to - * 16 bit boundary. -@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr) - /* Big-endian machines are harder */ - register int i, nmap = (1 << the_hdr->cmaplen) * - the_hdr->ncmap; -- register char *h_cmap = (char *)malloc( nmap * 2 ); -+ register char *h_cmap = (char *)malloc2( nmap, 2 ); - if ( h_cmap == NULL ) - { - fprintf( stderr, -diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c ---- netpbm-10.47.04/urt/scanargs.c.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/scanargs.c 2009-10-21 15:09:34.000000000 +0200 -@@ -38,6 +38,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - - #include "rle.h" -@@ -65,8 +67,8 @@ typedef int *ptr; - /* - * Storage allocation macros - */ --#define NEW( type, cnt ) (type *) malloc( (cnt) * sizeof( type ) ) --#define RENEW( type, ptr, cnt ) (type *) realloc( ptr, (cnt) * sizeof( type ) ) -+#define NEW( type, cnt ) (type *) malloc2( (cnt) , sizeof( type ) ) -+#define RENEW( type, ptr, cnt ) (type *) realloc2( ptr, (cnt), sizeof( type ) ) - - #if defined(c_plusplus) && !defined(USE_PROTOTYPES) - #define USE_PROTOTYPES ---- advanced/urt/rle_hdr.c.old 2012-01-21 05:57:25.000000000 -0500 -+++ advanced/urt/rle_hdr.c 2012-01-21 05:57:50.000000000 -0500 -@@ -29,6 +29,18 @@ - - #include <string.h> - -+/* -+ * Provided by pm library -+ */ -+ -+extern void overflow_add(int, int); -+#define overflow2(a,b) __overflow2(a,b) -+extern void __overflow2(int, int); -+extern void overflow3(int, int, int); -+extern void *malloc2(int, int); -+/*extern void *malloc3(int, int, int);*/ -+extern void *realloc2(void *, int, int); -+ - /***************************************************************** - * TAG( rle_names ) - * diff --git a/staging/netpbm/netpbm-security-scripts.patch b/staging/netpbm/netpbm-security-scripts.patch deleted file mode 100644 index 557914b66..000000000 --- a/staging/netpbm/netpbm-security-scripts.patch +++ /dev/null @@ -1,393 +0,0 @@ -diff -up netpbm-10.47.05/converter/other/anytopnm.security-scripts netpbm-10.47.05/converter/other/anytopnm ---- netpbm-10.47.05/converter/other/anytopnm.security-scripts 2009-12-10 08:34:36.000000000 +0100 -+++ netpbm-10.47.05/converter/other/anytopnm 2010-03-16 21:28:09.000000000 +0100 -@@ -510,10 +510,7 @@ else - inputFile="-" - fi - --tempdir="${TMPDIR-/tmp}/anytopnm.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting."; exit 1;} --trap 'rm -rf $tempdir' 0 -+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1 - - # Take out all spaces - # Find the filename extension for last-ditch efforts later -@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then - echo "$progname: unknown file type. " \ - "'file' says mime type is '$mimeType', " 1>&2 - echo "type description is '$typeDescription'" 1>&2 -+ if [ -d "$tempdir" ] ; then -+ rm -rf "$tempdir" -+ fi -+ - exit 1 - fi - - convertIt $file $filetype - -+if [ -d "$tempdir" ] ; then -+ rm -rf "$tempdir" -+fi -+ - exit 0 -diff -up netpbm-10.47.05/editor/pamstretch-gen.security-scripts netpbm-10.47.05/editor/pamstretch-gen ---- netpbm-10.47.05/editor/pamstretch-gen.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ netpbm-10.47.05/editor/pamstretch-gen 2010-03-16 21:28:47.000000000 +0100 -@@ -31,13 +31,9 @@ if [ "$1" = "" ]; then - exit 1 - fi - --tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting."; exit 1;} -+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1 - trap 'rm -rf $tempdir' 0 1 3 15 - --tempfile=$tempdir/pnmig -- - if ! cat $2 >$tempfile 2>/dev/null; then - echo 'pamstretch-gen: error reading file' 1>&2 - exit 1 -diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts netpbm-10.47.05/editor/pnmmargin ---- netpbm-10.47.05/editor/pnmmargin.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ netpbm-10.47.05/editor/pnmmargin 2010-03-16 21:28:09.000000000 +0100 -@@ -11,15 +11,11 @@ - # documentation. This software is provided "as is" without express or - # implied warranty. - --tempdir="${TMPDIR-/tmp}/pnmmargin.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting." 1>&2; exit 1;} --trap 'rm -rf $tempdir' 0 1 3 15 -- --tmp1=$tempdir/pnmm1 --tmp2=$tempdir/pnmm2 --tmp3=$tempdir/pnmm3 --tmp4=$tempdir/pnmm4 -+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1 -+tmp1="$tmpdir/tmp1" -+tmp2="$tmpdir/tmp2" -+tmp3="$tmpdir/tmp3" -+tmp4="$tmpdir/tmp4" - - color="-gofigure" - plainopt="" -@@ -90,6 +86,7 @@ else - -white | -black ) - pnmpad $plainopt $color \ - -left=$size -right=$size -top=$size -bottom=$size $tmp1 -+ rm -rf "$tmpdir" - exit - ;; - * ) -@@ -102,7 +99,4 @@ else - pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4 - pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3 - fi -- -- -- -- -+rm -rf "$tmpdir" -diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade ---- netpbm-10.47.05/editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ netpbm-10.47.05/editor/ppmfade 2010-03-16 21:28:09.000000000 +0100 -@@ -14,6 +14,7 @@ - # - #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - use strict; -+use File::Temp "tempdir"; - - my $SPREAD = 1; - my $SHIFT = 2; -@@ -111,20 +112,26 @@ if ($first_file ne "undefined") { - - print("Frames are " . $width . "W x " . $height . "H\n"); - -+# -+# We create a tmp-directory right here -+# -+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1); -+ -+ - if ($first_file eq "undefined") { - print "Fading from black to "; -- system("ppmmake \\#000 $width $height >junk1$$.ppm"); -+ system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm"); - } else { - print "Fading from $first_file to "; -- system("cp", $first_file, "junk1$$.ppm"); -+ system("cp", $first_file, "$tmpdir/junk1$$.ppm"); - } - - if ($last_file eq "undefined") { - print "black.\n"; -- system("ppmmake \\#000 $width $height >junk2$$.ppm"); -+ system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm"); - } else { - print "$last_file\n"; -- system("cp", $last_file, "junk2$$.ppm"); -+ system("cp", $last_file, "$tmpdir/junk2$$.ppm"); - } - - # -@@ -132,14 +139,14 @@ if ($last_file eq "undefined") { - # - - # Here's what our temporary files are: --# junk1$$.ppm: The original (fade-from) image --# junk2$$.ppm: The target (fade-from) image --# junk3$$.ppm: The frame of the fade for the current iteration of the --# the for loop. --# junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate --# image to another, this is the first frame of that --# sequence. --# junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence -+# $tmpdir/junk1$$.ppm: The original (fade-from) image -+# $tmpdir/junk2$$.ppm: The target (fade-from) image -+# $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the -+# the for loop. -+# $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate -+# image to another, this is the first frame of that -+# sequence. -+# $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence - - my $i; # Frame number - for ($i = 1; $i <= $nframes; $i++) { -@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) { - if ($mode eq $SPREAD) { - if ($i <= 10) { - my $n = $spline20[$i] * 100; -- system("ppmspread $n junk1$$.ppm >junk3$$.ppm"); -+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n; - $n = $spline20[$i] * 100; -- system("ppmspread $n junk1$$.ppm >junk1a$$.ppm"); -+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); - $n = (1-$spline20[$i-10]) * 100; -- system("ppmspread $n junk2$$.ppm >junk2a$$.ppm"); -+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); - $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = (1-$spline20[$i-10])*100; -- system("ppmspread $n junk2$$.ppm >junk3$$.ppm"); -+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - } elsif ($mode eq $SHIFT) { - if ($i <= 10) { - my $n = $spline20[$i] * 100; -- system("ppmshift $n junk1$$.ppm >junk3$$.ppm"); -+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n; - $n = $spline20[$i] * 100; -- system("ppmshift $n junk1$$.ppm >junk1a$$.ppm"); -+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); - $n = (1-$spline20[$i-10])*100; -- system("ppmshift $n junk2$$.ppm >junk2a$$.ppm"); -+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); - $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = (1-$spline20[$i-10]) * 100; -- system("ppmshift $n junk2$$.ppm >junk3$$.ppm"); -+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - } elsif ($mode eq $RELIEF) { - if ($i == 1) { -- system("ppmrelief junk1$$.ppm >junk1r$$.ppm"); -+ system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmrelief junk2$$.ppm >junk2r$$.ppm"); -+ system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm"); - } - } elsif ($mode eq $OIL) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $EDGE) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $BENTLEY) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $BLOCK) { - if ($i <= 10) { - my $n = 1 - 1.9*$spline20[$i]; -- system("pamscale $n junk1$$.ppm | " . -- "pamscale -width $width -height $height >junk3$$.ppm"); -+ system("pamscale $n $tmpdir/junk1$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = 1 - 1.9*$spline20[31-$i]; -- system("pamscale $n junk2$$.ppm | " . -- "pamscale -width $width -height $height >junk3$$.ppm"); -+ system("pamscale $n $tmpdir/junk2$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("cp", "junk3$$.ppm", "junk1a$$.ppm"); -- system("pamscale $n junk2$$.ppm | " . -- "pamscale -width $width -height $height >junk2a$$.ppm"); -+ system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm"); -+ system("pamscale $n $tmpdir/junk2$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm"); - } - } elsif ($mode eq $MIX) { - my $fade_factor = sqrt(1/($nframes-$i+1)); -- system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - print("Internal error: impossible mode value '$mode'\n"); - } - - my $outfile = sprintf("%s.%04d.ppm", $base_name, $i); -- system("cp", "junk3$$.ppm", $outfile); -+ system("cp", "$tmpdir/junk3$$.ppm", $outfile); - } - - # - # Clean up shop. - # --system("rm junk*$$.ppm"); -+system("rm $tmpdir/junk*$$.ppm"); - - exit(0); -diff -up netpbm-10.47.05/editor/ppmquantall.security-scripts netpbm-10.47.05/editor/ppmquantall ---- netpbm-10.47.05/editor/ppmquantall.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ netpbm-10.47.05/editor/ppmquantall 2010-03-16 21:28:09.000000000 +0100 -@@ -70,12 +70,8 @@ for i in ${files[@]}; do - heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`) - done - --tempdir="${TMPDIR-/tmp}/ppmquantall.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting."; exit 1;} --trap 'rm -rf $tempdir' 0 1 3 15 -- --all=$tempdir/pqa.all.$$ -+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1 -+rm -f $all - - pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all - if [ $? != 0 ]; then -diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/editor/ppmshadow ---- netpbm-10.47.05/editor/ppmshadow.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ netpbm-10.47.05/editor/ppmshadow 2010-03-16 21:28:09.000000000 +0100 -@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) { - - - my $tmpdir = $ENV{TMPDIR} || "/tmp"; --my $ourtmp = "$tmpdir/ppmshadow$$"; --mkdir($ourtmp, 0777) or -- die("Unable to create directory for temporary files '$ourtmp"); -+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`); -+if ($? >> 8) { -+ die "Can't create directory for temporary files"; -+} - - # Process command line options - diff --git a/staging/neverball/PKGBUILD b/staging/neverball/PKGBUILD deleted file mode 100644 index 2413373e9..000000000 --- a/staging/neverball/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 146885 2012-01-19 03:40:43Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=neverball -pkgver=1.5.4 -pkgrel=4 -pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" -arch=('i686' 'x86_64') -url="http://neverball.org/" -license=('GPL') -depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs') -makedepends=('mesa') -source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch) -sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' - 'f71982b7187d569c57b30c4c40fedd6c0e72baca') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h - patch -p0 -i ../neverball-1.5.4-underlink.patch - - if [ "${CARCH}" = "i686" ] ;then - make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" - else - make ENABLE_NLS=1 DATADIR=/usr/share/neverball - fi -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball} - install -d "${pkgdir}"/usr/share/man/man{1,6} - - install -m755 neverball neverputt mapc "${pkgdir}/usr/bin" - cp -r locale/* "${pkgdir}/usr/share/locale/" - cp -r data/* "${pkgdir}/usr/share/neverball/" - install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" - install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" - install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" - install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1" - install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6" - - ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" - ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" - find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \; -} diff --git a/staging/neverball/neverball-1.5.4-underlink.patch b/staging/neverball/neverball-1.5.4-underlink.patch deleted file mode 100644 index 1a848cad3..000000000 --- a/staging/neverball/neverball-1.5.4-underlink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.old 2011-06-22 06:30:52.441788160 +0200 -+++ Makefile 2011-06-22 06:31:59.754087534 +0200 -@@ -138,7 +138,7 @@ - endif - - ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ -- -lvorbisfile $(OGL_LIBS) -+ -lvorbisfile $(OGL_LIBS) -lX11 - - #------------------------------------------------------------------------------ - ---- Makefile.old 2012-01-18 21:28:23.000000000 -0500 -+++ Makefile 2012-01-18 21:28:55.000000000 -0500 -@@ -131,7 +131,7 @@ - OGL_LIBS := -framework OpenGL - endif - --BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm - - ifdef DARWIN - BASE_LIBS += -L/opt/local/lib diff --git a/staging/nx-common/NXproto.h.64bit.diff b/staging/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/staging/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/staging/nx-common/PKGBUILD b/staging/nx-common/PKGBUILD deleted file mode 100644 index 372871404..000000000 --- a/staging/nx-common/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 147024 2012-01-20 21:12:16Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=3 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs' 'bash') -makedepends=('xorg-server-devel') -source=( #Compression libs and proxy sources - http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch - nx-3.5.0-libpng15.patch) -options=(!libtool) -md5sums=('ad8c0f133122c6d07732ca69c8759410' - '84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c' - '2966353cabb96829eab291212ef078dc') - -build() { - # nxcomp - cd ${srcdir}/nxcomp - patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch - - ./configure --prefix=/opt/NX - make - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - - ./configure --prefix=/opt/NX - make - # nxssh - cd ${srcdir}/nxssh - ./configure --prefix=/opt/NX - make -} - -package() { - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - - # nxcomp - cd ${srcdir}/nxcomp - cp -a libXcomp.so* ${pkgdir}/opt/NX/lib - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh -} diff --git a/staging/nx-common/nx-3.5.0-libpng15.patch b/staging/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/staging/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/staging/nx-common/nxcompsh-gcc43.patch b/staging/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/staging/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/staging/nxserver/NXproto.h.64bit.diff b/staging/nxserver/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/staging/nxserver/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/staging/nxserver/PKGBUILD b/staging/nxserver/PKGBUILD deleted file mode 100644 index 5110e7097..000000000 --- a/staging/nxserver/PKGBUILD +++ /dev/null @@ -1,95 +0,0 @@ -# $Id: PKGBUILD 147028 2012-01-20 21:33:04Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nxserver -pkgver=3.5.0 -pkgrel=5 -pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." -arch=(i686 x86_64) -url="http://nomachine.com/" -license=('GPL') -depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver - 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2' - 'xorg-sessreg') -makedepends=('imake') -source=( -#X11 support programs and libraries -http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common -#X11 Agent sources -http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common -#Compression libs and proxy sources -http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz -# gcc 43 fix -nxcompsh-gcc43.patch -nx-3.5.0-libpng15.patch) -options=(!libtool) -md5sums=('12060433a74ac61a1c776d1d6d136117' - '84c7f1575d9a1506370125ed050514ab' - 'cf38ec1e5a5f6453946cd387c14f2684' - 'ad8c0f133122c6d07732ca69c8759410' - '0a36c7e6a86c6c741179464b8f79c487' - '84ade443b79ea079380b754aba9d392e' - '488bb4d9b8e9f82dc272b4e6e9c57d30' - 'abde2ccc33e31fc695031c2cfb60f3dd' - '90a762dd9eb19c8c97876ad837923857' - 'b6c279654dac421fc3dd1a27d66ff53c' - '2966353cabb96829eab291212ef078dc') - -build() { - cd ${srcdir} - - # nxcomp - cd ${srcdir}/nxcomp - patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch - ./configure --prefix=/opt/NX - make - # nxcompshad - cd ${srcdir}/nxcompshad - ./configure --prefix=/opt/NX - make - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - ./configure --prefix=/opt/NX - make - # nxproxy - cd ${srcdir}/nxproxy - ./configure --prefix=/opt/NX - make - # nx-X11 - cd ${srcdir}/nx-X11 - make World - # nxcompext - cd ${srcdir}/nxcompext - ./configure --prefix=/opt/NX - make -} - -package() { - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - - # nxcompshad - cd ${srcdir}/nxcompshad - cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib - # nxproxy - cd ${srcdir}/nxproxy - make prefix=${pkgdir}/opt/NX install - # nx-X11 - cd ${srcdir}/nx-X11 - cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib - cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib - cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib - install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent - install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth - # nxcompext - cd ${srcdir}/nxcompext - cp -a libXcompext.so* ${pkgdir}/opt/NX/lib -}
\ No newline at end of file diff --git a/staging/nxserver/nx-3.5.0-libpng15.patch b/staging/nxserver/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/staging/nxserver/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/staging/nxserver/nxcompsh-gcc43.patch b/staging/nxserver/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/staging/nxserver/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD deleted file mode 100644 index be1122504..000000000 --- a/staging/opencv/PKGBUILD +++ /dev/null @@ -1,119 +0,0 @@ -# $Id: PKGBUILD 147678 2012-01-26 14:03:05Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') -_realname=OpenCV -pkgver=2.3.1_a -_realver=2.3.1 -pkgrel=4 -pkgdesc="Open Source Computer Vision Library" -arch=('i686' 'x86_64') -license=('BSD') -url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') -optdepends=('opencv-docs' - 'opencv-samples' - 'eigen2' - 'python2-numpy: Python 2.x interface') -options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2") -md5sums=('82e4b6bfa349777233eea09b075e931e') - -_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' - '-D CMAKE_INSTALL_PREFIX=/usr' - '-D CMAKE_SKIP_RPATH=ON' - '-D BUILD_TESTS=OFF' - '-D ENABLE_SSE=ON' - '-D ENABLE_SSE2=ON' - '-D ENABLE_SSE3=OFF' - '-D ENABLE_SSSE3=OFF' - '-D ENABLE_SSE41=OFF' - '-D ENABLE_SSE42=OFF' - '-D BUILD_EXAMPLES=ON' - '-D INSTALL_C_EXAMPLES=ON' - '-D INSTALL_PYTHON_EXAMPLES=ON' - '-D WITH_XINE=ON' - '-D WITH_QT=OFF' - '-D WITH_QT_OPENGL=OFF' - '-D WITH_UNICAP=OFF' - '-D WITH_PVAPI=OFF' - '-D WITH_OPENNI=OFF' - '-D WITH_TBB=OFF' - '-D WITH_IPP=OFF' - '-D WITH_CUDA=OFF' - '-D USE_FAST_MATH=ON') - -build() { - cd "$srcdir/$_realname-$_realver" - - # x64, i.e "Athlon64" and upwards, can use SSE3 - [ $CARCH = x86_64 ] && \ - _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} - - cmake ${_cmakeopts[@]} . - - make -} - -package_opencv() { - cd "$srcdir/$_realname-$_realver" - - make DESTDIR="$pkgdir" install - - # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - cd "$pkgdir/usr/share" - - # prepare FSH-friendly dirs - if [ -d OpenCV ]; then - mv opencv/samples OpenCV/ - rm -r opencv - mv OpenCV opencv - fi - - # separate docs package; also be -R friendly - [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" - - # separate samples package - [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" -} - -package_opencv-docs() { - pkgdesc+=" (documentation)" - unset depends - unset optdepends - options=('docs') - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" - - # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_opencv-samples() { - pkgdesc+=" (samples)" - depends=('bash') - unset optdepends - unset options - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" - - # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/opengtl/PKGBUILD b/staging/opengtl/PKGBUILD deleted file mode 100644 index 30d4c64d7..000000000 --- a/staging/opengtl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 147180 2012-01-24 01:25:15Z foutrelis $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andries Radu <admiral0@live.it> - -pkgname=opengtl -pkgver=0.9.16 -pkgrel=1 -pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" -url="http://www.opengtl.org" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gcc-libs' 'llvm') -makedepends=('cmake' 'libpng') -optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) -sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../OpenGTL-${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/staging/openjdk6/PKGBUILD b/staging/openjdk6/PKGBUILD deleted file mode 100644 index 428f10348..000000000 --- a/staging/openjdk6/PKGBUILD +++ /dev/null @@ -1,183 +0,0 @@ -# $Id: PKGBUILD 147004 2012-01-20 15:47:29Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=('openjdk6' 'openjdk6-src') -pkgbase="openjdk6" -_javaver=6 -_icedteaver=1.10.5 -_openjdk_version=b22 -_openjdk_date=28_feb_2011 -pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=2 -url='http://icedtea.classpath.org' -arch=('i686' 'x86_64') -license=('custom') -makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' - 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'libxt' 'nss' - 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6') -options=('!emptydirs') # 'force') # force needed for hg shots -source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz - http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - http://icedtea.classpath.org/download/drops/jaxp144_01.zip - http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip - http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip - fix_jdk_cmds_path.diff - fix_corba_cmds_path.diff - fontconfig-paths.diff - nonreparenting-wm.diff - openjdk6.profile - openjdk6.profile.csh - glibc2_15.diff) -noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - jaxp144_01.zip - jdk6-jaxws-b20.zip - jdk6-jaf-b20.zip) -md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a' - '2d2bbbb0f9b81f1fec41ec730da8a933' - 'ef7a8b3624ea904bf584bc46d79b5e75' - '91adfd41e6f001add4f92ae31216b1e3' - 'bc95c133620bd68c161cac9891592901' - '5da3e39fa60985576c4f37d1491efbe2' - 'f7e7a212e50abb56a6ef1a2b1bd27405' - 'ee1afda124d5927345014ab382ef581e' - '9b4d368f5ee08de248eaf029303a446c' - '74c4a7adc782edd087802bf92ae3d6d0' - 'fdf295e2f186dfa4d308691a3d7ac8c5' - '0c8f0a398c88f85e0db44b4417562cf3') - -build() { - - unset JAVA_HOME - unset CLASSPATH - - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - - cd ${srcdir}/icedtea6-${_icedteaver} - - ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz . - - cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/ - - autoreconf -i - - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/glibc2_15.diff" - - export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" - export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" - unset MAKEFLAGS - - ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ - --with-xalan2-jar=/usr/share/java/xalan.jar \ - --with-ant-home=/usr/share/java/apache-ant \ - --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \ - --with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \ - --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \ - --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ - --disable-bootstrap - LD_PRELOAD="" make -} - -package_openjdk6() { - pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' - backup=(etc/profile.d/openjdk6.sh) - depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7') - optdepends=('icedtea-web: web browser plugin + Java Web Start' - 'alsa-lib: for sound' - 'giflib: for gif format support') - conflicts=('java-environment' 'java-runtime') - provides=('java-environment=6' 'java-runtime=6') - install=openjdk6.install - - if [ "${CARCH}" = "x86_64" ]; then - _arch=amd64 - else - _arch=i586 - fi - - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - - cd ${srcdir}/icedtea6-${_icedteaver} - install -m755 -d ${pkgdir}/${_jvmdir}/jre - - pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image - - # Install main files. - cp -a bin include lib ${pkgdir}/${_jvmdir}/ - cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ - - mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ - ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src - mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ - ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc - rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc - rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src - - # Install man pages. - install -m755 -d ${pkgdir}/usr/share/man/man1 - install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ - - # Install demos and samples. - cp -a demo ${pkgdir}/${_jvmdir}/ - install -m755 -d sample/rmi - mv bin/java-rmi.cgi sample/rmi - cp -a sample ${pkgdir}/${_jvmdir}/ - popd - - # Install icons and menu entries. - for s in 16 24 32 48 ; do - install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps - install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ - ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png - done - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications - - # link binaries into /usr/bin - install -m755 -d ${pkgdir}/usr/bin - pushd ${pkgdir}/${_jvmdir}/bin - for file in *; do - ln -sf ${_jvmdir}/bin/${file} \ - ${pkgdir}/usr/bin - done - popd - - # link JKS keystore from ca-certificates-java - rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" - - # set some variables - install -m755 -d ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh - install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh - - # install license - install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} - -package_openjdk6-src() { - pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle' - depends=('openjdk6') - - if [ "${CARCH}" = "x86_64" ]; then - _arch=amd64 - else - _arch=i586 - fi - - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - - cd ${srcdir}/icedtea6-${_icedteaver} - install -m755 -d ${pkgdir}/${_jvmdir}/jre - - pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image - # Install src.zip file - cp -a src.zip ${pkgdir}/${_jvmdir}/ -} diff --git a/staging/openjdk6/fix_corba_cmds_path.diff b/staging/openjdk6/fix_corba_cmds_path.diff deleted file mode 100644 index 842657880..000000000 --- a/staging/openjdk6/fix_corba_cmds_path.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -86,10 +86,10 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio --CUT = $(UTILS_USR_BIN_PATH)cut -+CUT = $(UTILS_COMMAND_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df - DIFF = $(UTILS_USR_BIN_PATH)diff -@@ -136,7 +136,7 @@ - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test - TOUCH = $(UTILS_COMMAND_PATH)touch --TR = $(UTILS_USR_BIN_PATH)tr -+TR = $(UTILS_COMMAND_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq -@@ -186,7 +186,7 @@ - # others have it in /usr/bin. - SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/staging/openjdk6/fix_jdk_cmds_path.diff b/staging/openjdk6/fix_jdk_cmds_path.diff deleted file mode 100644 index 7e16e1744..000000000 --- a/staging/openjdk6/fix_jdk_cmds_path.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:33:23.000000000 +0300 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2008-04-14 15:37:34.000000000 +0300 -@@ -76,10 +76,10 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio --CUT = $(UTILS_USR_BIN_PATH)cut -+CUT = $(UTILS_COMMAND_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df - DIFF = $(UTILS_USR_BIN_PATH)diff -@@ -126,7 +126,7 @@ - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test - TOUCH = $(UTILS_COMMAND_PATH)touch --TR = $(UTILS_USR_BIN_PATH)tr -+TR = $(UTILS_COMMAND_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq -@@ -173,7 +173,7 @@ - BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \ - $(wildcard $(UTILS_USR_BIN_PATH)basename)) - -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/staging/openjdk6/fontconfig-paths.diff b/staging/openjdk6/fontconfig-paths.diff deleted file mode 100644 index fa08db629..000000000 --- a/staging/openjdk6/fontconfig-paths.diff +++ /dev/null @@ -1,134 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 -+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 -@@ -275,73 +275,61 @@ - - # Font File Names - --filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf --filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf --filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf --filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf -- --filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf --filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf --filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf --filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf -- --filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf --filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf --filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf --filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf -- --filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf -- --filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf --filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf --filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf --filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf --filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf --filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf --filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf --filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf --filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf --filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf --filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf --filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf --filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf -- --filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf --filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf --filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf --filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf --#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf --filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf --filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf --filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf --filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf --filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf -- --filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf --filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf --filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf --filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf --filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf --filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf --filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf --filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf --filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf --filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf --filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf --filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf -- --# AWT X11 font paths --awtfontpath.latin-1=/usr/share/fonts/X11/Type1 --awtfontpath.umingcn=/usr/share/fonts/truetype/arphic --awtfontpath.uminghk=/usr/share/fonts/truetype/arphic --awtfontpath.umingtw=/usr/share/fonts/truetype/arphic --awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic --awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy --awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi --awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami --awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic --awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk --awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts -+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf -+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf -+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf -+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf -+ -+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf -+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf -+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf -+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf -+ -+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf -+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf -+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf -+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf -+ -+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf -+ -+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf -+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf -+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf -+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf -+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf -+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf -+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf -+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf -+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf -+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf -+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf -+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf -+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf -+ -+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf -+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf -+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf -+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf -+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf -+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf -+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf -+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf -+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf -+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf -+ -+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf -+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf -+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf -+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf -+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf -+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf -+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf -+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf -+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf -+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf -+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf -+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf -+ diff --git a/staging/openjdk6/glibc2_15.diff b/staging/openjdk6/glibc2_15.diff deleted file mode 100644 index 8fe1b077a..000000000 --- a/staging/openjdk6/glibc2_15.diff +++ /dev/null @@ -1,236 +0,0 @@ -# HG changeset patch -# User never -# Date 1319555835 25200 -# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28 -# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926 -7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc -Reviewed-by: never -Contributed-by: Omair Majid <omajid@redhat.com> - -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp ---- openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -34,8 +34,6 @@ - - // Portions of code courtesy of Clifford Click - --#define MAXFLOAT ((float)3.40282346638528860e+38) -- - // Classic Add functionality. This covers all the usual 'add' behaviors for - // an algebraic ring. Add-integer, add-float, add-double, and binary-or are - // all inherited from this class. The various identity values are supplied -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jniCheck.cpp ---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -107,7 +107,7 @@ - if (env != xenv) { \ - NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ - } \ -- __ENTRY(result_type, header, thr) -+ VM_ENTRY_BASE(result_type, header, thr) - - - #define UNCHECKED() (unchecked_jni_NativeInterface) -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnter.xsl ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 08:17:15 2011 -0700 -@@ -426,7 +426,7 @@ - <xsl:value-of select="$space"/> - <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> - <xsl:value-of select="$space"/> -- <xsl:text>__ENTRY(jvmtiError, </xsl:text> -+ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> - <xsl:apply-templates select="." mode="functionid"/> - <xsl:text> , current_thread)</xsl:text> - <xsl:value-of select="$space"/> -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnv.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -173,7 +173,7 @@ - // from native so as to resolve the jthread. - - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) -+ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - oop thread_oop = JNIHandles::resolve_external_guard(thread); -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiExport.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -373,7 +373,7 @@ - JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); - // transition code: native to VM - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) -+ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/runtime/interfaceSupport.hpp ---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700 -@@ -72,9 +72,9 @@ - } - }; - --// InterfaceSupport provides functionality used by the __LEAF and __ENTRY --// macros. These macros are used to guard entry points into the VM and --// perform checks upon leave of the VM. -+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and -+// VM_ENTRY_BASE macros. These macros are used to guard entry points into -+// the VM and perform checks upon leave of the VM. - - - class InterfaceSupport: AllStatic { -@@ -433,7 +433,7 @@ - - // LEAF routines do not lock, GC or throw exceptions - --#define __LEAF(result_type, header) \ -+#define VM_LEAF_BASE(result_type, header) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - /* begin of body */ -@@ -441,7 +441,7 @@ - - // ENTRY routines may lock, GC and throw exceptions - --#define __ENTRY(result_type, header, thread) \ -+#define VM_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - HandleMarkCleaner __hm(thread); \ - Thread* THREAD = thread; \ -@@ -450,7 +450,7 @@ - - // QUICK_ENTRY routines behave like ENTRY but without a handle mark - --#define __QUICK_ENTRY(result_type, header, thread) \ -+#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - Thread* THREAD = thread; \ -@@ -463,20 +463,20 @@ - #define IRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define IRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(No_Safepoint_Verifier __nspv(true);) - - - #define IRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Another special case for nmethod_entry_point so the nmethod that the -@@ -487,7 +487,7 @@ - result_type header { \ - nmethodLocker _nmlock(nm); \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - #define IRT_END } - -@@ -497,20 +497,20 @@ - #define JRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define JRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(JRT_Leaf_Verifier __jlv;) - - - #define JRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Same as JRT Entry but allows for return value after the safepoint -@@ -543,11 +543,11 @@ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - // Ensure that the VMNativeEntryWrapper constructor, which can cause --// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY). -+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE). - #define JNI_QUICK_ENTRY(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ -@@ -555,7 +555,7 @@ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JNI_LEAF(result_type, header) \ -@@ -563,7 +563,7 @@ - result_type JNICALL header { \ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - // Close the routine and the extern "C" -@@ -579,7 +579,7 @@ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_ENTRY_NO_ENV(result_type, header) \ -@@ -588,7 +588,7 @@ - JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_QUICK_ENTRY(result_type, header) \ -@@ -597,14 +597,14 @@ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JVM_LEAF(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ - VM_Exit::block_if_vm_exited(); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - #define JVM_END } }
\ No newline at end of file diff --git a/staging/openjdk6/nonreparenting-wm.diff b/staging/openjdk6/nonreparenting-wm.diff deleted file mode 100644 index 65fa66e89..000000000 --- a/staging/openjdk6/nonreparenting-wm.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java -index 68d1ff7..878327e 100644 ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -@@ -99,7 +99,8 @@ - METACITY_WM = 11, - COMPIZ_WM = 12, - LG3D_WM = 13, -- MUTTER_WM = 14; -+ MUTTER_WM = 14, -+ OTHER_NONREPARENTING_WM = 15; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants { - } - - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants { - * supports WIN or _NET wm spec. - */ - else if (l_net_protocol.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } else if (win.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } - /* - * Check for legacy WMs. -@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants { - awt_wmgr = XWM.MOTIF_WM; - } else if (isOpenLook()) { - awt_wmgr = XWM.OPENLOOK_WM; -+ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; - } else { - awt_wmgr = XWM.OTHER_WM; - } -@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants { - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; diff --git a/staging/openjdk6/openjdk6.install b/staging/openjdk6/openjdk6.install deleted file mode 100644 index 653c8fe2f..000000000 --- a/staging/openjdk6/openjdk6.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi - echo "when you use a non-reparenting window manager" - echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/openjdk6.sh" -# update-desktop-database -q -} - -post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi -# update-desktop-database -q -} - - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -# update-desktop-database -q -} diff --git a/staging/openjdk6/openjdk6.profile b/staging/openjdk6/openjdk6.profile deleted file mode 100644 index 9da4421ef..000000000 --- a/staging/openjdk6/openjdk6.profile +++ /dev/null @@ -1,6 +0,0 @@ -export J2SDKDIR=/usr/lib/jvm/java-6-openjdk -export J2REDIR=$J2SDKDIR/jre -export JAVA_HOME=/usr/lib/jvm/java-6-openjdk - -# enable this for non-reparenting window managers -#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/staging/openjdk6/openjdk6.profile.csh b/staging/openjdk6/openjdk6.profile.csh deleted file mode 100644 index 3cb15fd49..000000000 --- a/staging/openjdk6/openjdk6.profile.csh +++ /dev/null @@ -1,6 +0,0 @@ -setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk" -setenv J2REDIR "$J2SDKDIR/jre" -setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk" - -# enable this for non-reparenting window managers -#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/staging/openldap/PKGBUILD b/staging/openldap/PKGBUILD deleted file mode 100644 index 7a0e367f7..000000000 --- a/staging/openldap/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# $Id: PKGBUILD 145851 2012-01-03 02:45:43Z eric $ -# Maintainer: - -pkgbase=openldap -pkgname=('libldap' 'openldap') -pkgver=2.4.28 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.openldap.org/" -license=('custom') -makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux') -source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default ntlm.patch) -sha1sums=('d888beae1723002a5a2ff5509d3040df40885774' - 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' - 'd89b8a533045123f1ab46c9c430cf132d58a20a4' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}"/ntlm.patch - sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in - sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h - sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf - sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in - - LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" - ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ - --sysconfdir=/etc --localstatedir=/var/lib/openldap \ - --enable-ipv6 --enable-syslog --enable-local \ - --enable-bdb --enable-hdb \ - --enable-crypt --enable-dynamic \ - --with-threads --disable-wrappers \ - --enable-spasswd --with-cyrus-sasl \ - --enable-overlays=mod --enable-modules=yes - make -} - -check() { - cd "${srcdir}"/${pkgbase}-${pkgver} - make test -} - -package_libldap() { - pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" - depends=('libsasl' 'libfetch' 'e2fsprogs') - backup=('etc/openldap/ldap.conf') - options=('!libtool') - - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in include libraries doc/man/man3 ; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 - -# get rid of duplicate default conf files - rm "${pkgdir}"/etc/openldap/*.default - - ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 - ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 - - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_openldap() { - pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" - depends=("libldap>=${pkgver}" 'libltdl' 'util-linux') - backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') - options=('!libtool' 'emptydirs') - install=openldap.install - - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in clients servers doc/man/man{1,5,8} ; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 - rm -r "${pkgdir}"/run - -# get rid of duplicate default conf files - rm "${pkgdir}"/etc/openldap/*.default - - ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd - - chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} - chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} - - install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap - install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d - install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd - install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/staging/openldap/ntlm.patch b/staging/openldap/ntlm.patch deleted file mode 100644 index 6804b610d..000000000 --- a/staging/openldap/ntlm.patch +++ /dev/null @@ -1,230 +0,0 @@ -Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is -actually called by evolution-data-server, checked at version 1.12.2. -Without this patch, the Exchange addressbook integration uses simple binds -with cleartext passwords. - -Russ checked with openldap-software for upstream's opinion on this patch -on 2007-12-21. Upstream had never received it as a patch submission and -given that it's apparently only for older Exchange servers that can't do -SASL and DIGEST-MD5, it's not very appealing. - -Bug#457374 filed against evolution-data-server asking if this support is -still required on 2007-12-21. - -Index: trunk/include/ldap.h -=================================================================== ---- trunk.orig/include/ldap.h -+++ trunk/include/ldap.h -@@ -2461,5 +2461,25 @@ - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * hacks for NTLM -+ */ -+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) -+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) -+LDAP_F( int ) -+ldap_ntlm_bind LDAP_P(( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp )); -+LDAP_F( int ) -+ldap_parse_ntlm_bind_result LDAP_P(( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge)); -+ - LDAP_END_DECL - #endif /* _LDAP_H */ -Index: trunk/libraries/libldap/ntlm.c -=================================================================== ---- /dev/null -+++ trunk/libraries/libldap/ntlm.c -@@ -0,0 +1,138 @@ -+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ -+/* -+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. -+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file -+ */ -+ -+/* Mostly copied from sasl.c */ -+ -+#include "portable.h" -+ -+#include <stdlib.h> -+#include <stdio.h> -+ -+#include <ac/socket.h> -+#include <ac/string.h> -+#include <ac/time.h> -+#include <ac/errno.h> -+ -+#include "ldap-int.h" -+ -+int -+ldap_ntlm_bind( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp ) -+{ -+ BerElement *ber; -+ int rc; -+ ber_int_t id; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( msgidp != NULL ); -+ -+ if( msgidp == NULL ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ /* create a message to send */ -+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ assert( LBER_VALID( ber ) ); -+ -+ LDAP_NEXT_MSGID( ld, id ); -+ rc = ber_printf( ber, "{it{istON}" /*}*/, -+ id, LDAP_REQ_BIND, -+ ld->ld_version, dn, tag, -+ cred ); -+ -+ /* Put Server Controls */ -+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { -+ ld->ld_errno = LDAP_ENCODING_ERROR; -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ /* send the message */ -+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); -+ -+ if(*msgidp < 0) -+ return ld->ld_errno; -+ -+ return LDAP_SUCCESS; -+} -+ -+int -+ldap_parse_ntlm_bind_result( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge) -+{ -+ ber_int_t errcode; -+ ber_tag_t tag; -+ BerElement *ber; -+ ber_len_t len; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( res != NULL ); -+ -+ if ( ld == NULL || res == NULL ) { -+ return LDAP_PARAM_ERROR; -+ } -+ -+ if( res->lm_msgtype != LDAP_RES_BIND ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ if ( ld->ld_error ) { -+ LDAP_FREE( ld->ld_error ); -+ ld->ld_error = NULL; -+ } -+ if ( ld->ld_matched ) { -+ LDAP_FREE( ld->ld_matched ); -+ ld->ld_matched = NULL; -+ } -+ -+ /* parse results */ -+ -+ ber = ber_dup( res->lm_ber ); -+ -+ if( ber == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ tag = ber_scanf( ber, "{ioa" /*}*/, -+ &errcode, challenge, &ld->ld_error ); -+ ber_free( ber, 0 ); -+ -+ if( tag == LBER_ERROR ) { -+ ld->ld_errno = LDAP_DECODING_ERROR; -+ return ld->ld_errno; -+ } -+ -+ ld->ld_errno = errcode; -+ -+ return( ld->ld_errno ); -+} -+ -Index: trunk/libraries/libldap/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap/Makefile.in -+++ trunk/libraries/libldap/Makefile.in -@@ -27,7 +27,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ -@@ -40,7 +40,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include -Index: trunk/libraries/libldap_r/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap_r/Makefile.in -+++ trunk/libraries/libldap_r/Makefile.in -@@ -29,7 +29,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ - thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ -@@ -47,7 +47,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include diff --git a/staging/openldap/openldap.install b/staging/openldap/openldap.install deleted file mode 100644 index cf3cb9f25..000000000 --- a/staging/openldap/openldap.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install(){ - groupadd -g 439 ldap &>/dev/null - useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null - chown -R ldap:ldap var/lib/openldap &>/dev/null -} - -post_upgrade(){ - getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null - getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null - chown -R ldap:ldap var/lib/openldap &>/dev/null -} - -post_remove(){ - if getent passwd ldap >/dev/null 2>&1; then - userdel ldap - fi - if getent group ldap >/dev/null 2>&1; then - groupdel ldap - fi -} diff --git a/staging/openldap/slapd b/staging/openldap/slapd deleted file mode 100755 index 4f212da66..000000000 --- a/staging/openldap/slapd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd - -PID=`pidof -o %PPID /usr/sbin/slapd` -case "$1" in - start) - stat_busy "Starting OpenLDAP" - [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap - if [ -z "$PID" ]; then - if [ -z "$SLAPD_SERVICES" ]; then - /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS - else - /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS - fi - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - add_daemon slapd - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping OpenLDAP" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /run/openldap/slapd.pid - rm -f /run/openldap/slapd.args - rm_daemon slapd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/openldap/slapd.default b/staging/openldap/slapd.default deleted file mode 100644 index 72ae2a6a7..000000000 --- a/staging/openldap/slapd.default +++ /dev/null @@ -1,6 +0,0 @@ -# slapd normally serves ldap only on all TCP-ports 389. slapd can also -# service requests on TCP-port 636 (ldaps) and requests via unix -# sockets. -# Example usage: -#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" -SLAPD_OPTIONS="" diff --git a/staging/pam/PKGBUILD b/staging/pam/PKGBUILD deleted file mode 100644 index 17ca2bdc8..000000000 --- a/staging/pam/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 146066 2012-01-04 22:47:27Z stephane $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=pam -pkgver=1.1.5 -pkgrel=2 -pkgdesc="PAM (Pluggable Authentication Modules) library" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.kernel.org/pub/linux/libs/pam/" -depends=('glibc' 'db' 'cracklib' 'libtirpc') -makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') -backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment) -source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 - #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 - ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2 - other) -options=('!libtool' '!emptydirs') -md5sums=('927ee5585bdec5256c75117e9348aa47' - 'e2788389a6c59224110a45fcff30e02b' - '6e6c8719e5989d976a14610f340bd33a') - -build() { - cd $srcdir/Linux-PAM-$pkgver - ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib - make -} - -package() { - cd $srcdir/Linux-PAM-$pkgver - make INSTALL=/bin/install DESTDIR=$pkgdir install - install -D -m644 ../other $pkgdir/etc/pam.d/other - # build pam_unix2 module - # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 - cd $srcdir/pam_unix2-2.6 - ./configure - make - make DESTDIR=$pkgdir install - # add the realtime permissions for audio users - sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf - cat >>$pkgdir/etc/security/limits.conf <<_EOT -* - rtprio 0 -* - nice 0 -@audio - rtprio 65 -@audio - nice -10 -@audio - memlock 40000 -_EOT - # fix some missing symlinks from old pam for compatibility - cd $pkgdir/lib/security - ln -s pam_unix.so pam_unix_acct.so - ln -s pam_unix.so pam_unix_auth.so - ln -s pam_unix.so pam_unix_passwd.so - ln -s pam_unix.so pam_unix_session.so - # set unix_chkpwd uid - chmod +s $pkgdir/sbin/unix_chkpwd -} -md5sums=('927ee5585bdec5256c75117e9348aa47' - 'e2788389a6c59224110a45fcff30e02b' - '6e6c8719e5989d976a14610f340bd33a') diff --git a/staging/pam/other b/staging/pam/other deleted file mode 100644 index 08498b423..000000000 --- a/staging/pam/other +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so diff --git a/staging/pam/pam.install b/staging/pam/pam.install deleted file mode 100644 index 9d4588084..000000000 --- a/staging/pam/pam.install +++ /dev/null @@ -1,12 +0,0 @@ -# arg 1: the new package version -post_install() { - # need to run this immediately -- pacman only runs it at the end of - # all package installs - /sbin/ldconfig -r . -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/staging/patchage/PKGBUILD b/staging/patchage/PKGBUILD deleted file mode 100644 index b4294b173..000000000 --- a/staging/patchage/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63005 2012-01-30 12:09:14Z arodseth $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Max Pray a.k.a. Synthead <synthead@gmail.com> -# Contributor: clarence <catchfire at gmail dot com> -pkgname=patchage -pkgver=0.5.0 -pkgrel=3 -pkgdesc="A modular patch bay for audio and MIDI systems" -arch=('i686' 'x86_64') -url="http://drobilla.net/software/patchage" -license=('GPL') -depends=('dbus-glib' 'libglademm' 'hicolor-icon-theme' - 'raul' 'flowcanvas<1.0.0' 'jack') -makedepends=('boost' 'python2') -install=$pkgname.install -source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -sha256sums=('9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf configure --prefix=/usr - python2 waf build $MAKEFLAGS -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf --destdir="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/patchage/patchage.install b/staging/patchage/patchage.install deleted file mode 100644 index e4f8fd06c..000000000 --- a/staging/patchage/patchage.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/pekwm/PKGBUILD b/staging/pekwm/PKGBUILD deleted file mode 100644 index 68cba0015..000000000 --- a/staging/pekwm/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 147166 2012-01-23 20:22:29Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Eddie Lozon <almostlucky@attbi.com> - -pkgname=pekwm -pkgver=0.1.13 -pkgrel=2 -pkgdesc="A small, fast, functional, and flexible window manager" -arch=(i686 x86_64) -license=('GPL') -url="http://pekwm.org/" -depends=('gcc-libs' 'libjpeg>=7' 'libpng' 'libxft' 'libxinerama' 'libxpm' -'libxrandr') -backup=(etc/pekwm/config - etc/pekwm/vars - etc/pekwm/autoproperties - etc/pekwm/start - etc/pekwm/keys - etc/pekwm/mouse - etc/pekwm/menu) -source=(http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2 -pekwm.desktop libpng-1.4.patch) -md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5' - '075bf1b9d32bf94780329499e4fa40e3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" -# patch -p1 < ../libpng-1.4.patch || return 1 - # Default settings: - # --enable-shape --enable-xinerama --enable-menus \ - # --enable-harbour --disable-debug --disable-pedantic \ - # --enable-xft --enable-image-xpm --enable-image-jpeg \ - # --enable-image-png --enable-xrandr - ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/xsessions/${pkgname}.desktop" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/pekwm/libpng-1.4.patch b/staging/pekwm/libpng-1.4.patch deleted file mode 100644 index bc4df2c4d..000000000 --- a/staging/pekwm/libpng-1.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur pekwm-0.1.11-orig/src/PImageLoaderPng.cc pekwm-0.1.11/src/PImageLoaderPng.cc ---- pekwm-0.1.11-orig/src/PImageLoaderPng.cc 2010-01-22 01:57:08.000000000 -0500 -+++ pekwm-0.1.11/src/PImageLoaderPng.cc 2010-01-22 02:00:02.000000000 -0500 -@@ -108,7 +108,7 @@ - - // gray -> 8 bit gray - if (color_type == PNG_COLOR_TYPE_GRAY && (bpp < 8)) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { -@@ -179,7 +179,7 @@ - - status = fread(sig, 1, PImageLoaderPng::PNG_SIG_BYTES, fp); - if (status == PImageLoaderPng::PNG_SIG_BYTES) { -- return (png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) != 0); -+ return (png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) == 0); - } - return false; - } diff --git a/staging/pekwm/pekwm.desktop b/staging/pekwm/pekwm.desktop deleted file mode 100644 index 2f59528bd..000000000 --- a/staging/pekwm/pekwm.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Pekwm -Comment=The pekwm window manager -Exec=pekwm -# no icon yet, only the top three are currently used -Icon= -Type=Application diff --git a/staging/perl-tk/PKGBUILD b/staging/perl-tk/PKGBUILD deleted file mode 100644 index 5e195a545..000000000 --- a/staging/perl-tk/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 146993 2012-01-20 05:40:57Z eric $ -# Maintainer: François Charette <francois ατ archlinux δοτ org> -# Contributor: Jason Chu <jchu@xentac.net> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=perl-tk -_cpanname=Tk -pkgver=804.030 -pkgrel=2 -pkgdesc="A graphical user interface toolkit for Perl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" -license=('PerlArtistic' 'GPL' 'custom') -depends=('libpng' 'libjpeg' 'tk' 'perl') -options=('!emptydirs') -replaces=('perltk') -provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('13275e85f99ee467a86d9598a437abff') - -build() { - cd "$srcdir/${_cpanname}-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -#check() { -# cd "$srcdir/${_cpanname}-$pkgver" -# make test -#} - -package() { - cd "$srcdir/${_cpanname}-$pkgver" - make install DESTDIR="$pkgdir" - - # license - install -D -m644 pTk/license.terms \ - "${pkgdir}/usr/share/licenses/${pkgname}/tk.license" - install -D -m644 pTk/Tix.license \ - "${pkgdir}/usr/share/licenses/${pkgname}/tix.license" -} diff --git a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch deleted file mode 100644 index 1404460df..000000000 --- a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch +++ /dev/null @@ -1,83 +0,0 @@ -From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Thu, 28 Apr 2011 09:18:54 +0300 -Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in - EU::CBuilder - -Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), -CFLAGS and LDFLAGS from the environment have overridden the Config.pm -ccflags and ldflags settings. This can cause binary incompatibilities -between the core Perl and extensions built with EU::CBuilder. - -Append to the Config.pm values rather than overriding them. ---- - .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- - dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- - 2 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -index b572312..2255c51 100644 ---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -@@ -40,11 +40,13 @@ sub new { - $self->{config}{$k} = $v unless exists $self->{config}{$k}; - } - $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; -- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; -+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) -+ if defined $ENV{CFLAGS}; - $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; - $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; - $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; -- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; -+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) -+ if defined $ENV{LDFLAGS}; - - unless ( exists $self->{config}{cxx} ) { - my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); -diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t -index c3bf6b5..1bb15aa 100644 ---- a/dist/ExtUtils-CBuilder/t/04-base.t -+++ b/dist/ExtUtils-CBuilder/t/04-base.t -@@ -1,7 +1,7 @@ - #! perl -w - - use strict; --use Test::More tests => 50; -+use Test::More tests => 64; - use Config; - use Cwd; - use File::Path qw( mkpath ); -@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, - "_prepare_mksymlists_args(): got expected arguments for Mksymlists", - ); - -+my %testvars = ( -+ CFLAGS => 'ccflags', -+ LDFLAGS => 'ldflags', -+); -+ -+while (my ($VAR, $var) = each %testvars) { -+ local $ENV{$VAR}; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "honours $var from Config.pm"); -+ -+ $ENV{$VAR} = "-foo -bar"; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, -+ "honours $VAR from the environment"); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "doesn't override $var from Config.pm with $VAR from the environment"); -+} -+ - ##### - - for ($source_file, $object_file, $lib_file) { --- -1.7.4.4 - diff --git a/staging/perl/ChangeLog b/staging/perl/ChangeLog deleted file mode 100644 index 9add39e20..000000000 --- a/staging/perl/ChangeLog +++ /dev/null @@ -1,66 +0,0 @@ -2011-06-22 Angel Velasquez <angvp@archlinux.org> - * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS - * Fixed #FS22197, FS#22441, FS#24767 - * Rebuilt perl 5.14.1-2 against db 5.2.28 - -2011-06-16 Angel Velasquez <angvp@archlinux.org> - * Fixed #FS24660 - * Rebuilt against db 5.2.28 - -2011-05-16 Angel Velasquez <angvp@archlinux.org> - * perl 5.14.0 - * Removed patch for h2ph warning from 5.12.3 - * Removed provides array, you can use corelist -v 5.14.0 to know the - modules included with the perl core, through Module::CoreList (thx j3nnn1 - for the tip) - -2010-11-07 kevin <kevin@archlinux.org> - - * perl 5.12.2-1 - - Using /usr/bin/*_perl for script directories - -2010-11-06 kevin <kevin@archlinux.org> - - - Removed otherlibdirs directive from Configure - - Removed /usr/*/perl5/site_perl/5.10.1 from INC - - Finally removed legacy dirs /usr/lib/perl5/current and - /usr/lib/perl5/site_perl/current from @INC - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-2 - - Francois updated the provides array. - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-1 - -2010-05-16 kevin <kevin@archlinux.org> - - * perl 5.12.0-2 - -2010-05-12 kevin <kevin@archlinux.org> - - - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh. - This makes the loop variables unnecessary so the script no longer - pollutes the user's environment. - - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support - user built modules. - -2010-05-09 kevin <kevin@archlinux.org> - - * perl 5.12.0-1 - - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402, - path points to non-existant directories - -2010-05-07 kevin <kevin@archlinux.org> - - - Added this changelog. - - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC. - This removes the duplicates and versioned directory entries. - - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix - Fix FS#13808, binaries don't follow FHS. - - Stopped using versioned directories in sitelib and sitearch. - - -# vim: set ft=changelog ts=4 sw=4 et: diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD deleted file mode 100644 index 85fecb1d9..000000000 --- a/staging/perl/PKGBUILD +++ /dev/null @@ -1,117 +0,0 @@ -# $Id: PKGBUILD 145893 2012-01-03 21:13:07Z bluewind $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: kevin <kevin.archlinux.org> -# Contributor: judd <jvinet.zeroflux.org> -# Contributor: francois <francois.archlinux.org> -pkgname=perl -pkgver=5.14.2 -pkgrel=6 -pkgdesc="A highly capable, feature-rich programming language" -arch=(i686 x86_64) -license=('GPL' 'PerlArtistic') -url="http://www.perl.org" -groups=('base') -depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') -changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 -perlbin.sh -perlbin.csh -provides.pl -0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) -install=perl.install -options=('makeflags' '!purge') -md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26' - '5ed2542fdb9a60682f215bd33701e61a' - '1f0cbbee783e8a6d32f01be5118e0d5e' - '31fc0b5bb4935414394c5cfbec2cb8e5' - 'c25d86206d649046538c3daab7874564') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - if [ "${CARCH}" = "x86_64" ]; then - # for x86_64 - arch_opts="-Dcccdlflags='-fPIC'" - else - # for i686 - arch_opts="" - fi - - ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ - -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ - -Dprivlib=/usr/share/perl5/core_perl \ - -Darchlib=/usr/lib/perl5/core_perl \ - -Dsitelib=/usr/share/perl5/site_perl \ - -Dsitearch=/usr/lib/perl5/site_perl \ - -Dvendorlib=/usr/share/perl5/vendor_perl \ - -Dvendorarch=/usr/lib/perl5/vendor_perl \ - -Dscriptdir=/usr/bin/core_perl \ - -Dsitescript=/usr/bin/site_perl \ - -Dvendorscript=/usr/bin/vendor_perl \ - -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ - -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" - patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness -# make test -} - -package() { - # hack to work around makepkg running the subshell in check_sanity() - new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .)) - provides=(${new_provides[@]}) - - cd ${srcdir}/${pkgname}-${pkgver} - make install - - ### Perl Settings ### - # Change man page extensions for site and vendor module builds. - # Use archlinux email address instead of my own. - sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ - -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ - -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ - -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl - - ### CPAN Settings ### - # Set CPAN default config to use the site directories. - sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ - -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm - - ### CPANPLUS Settings ### - # Set CPANPLUS default config to use the site directories. - sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ - -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - - # Profile script to set paths to perl scripts. - install -D -m755 ${srcdir}/perlbin.sh \ - ${pkgdir}/etc/profile.d/perlbin.sh - # Profile script to set paths to perl scripts on csh. (FS#22441) - install -D -m755 ${srcdir}/perlbin.csh \ - ${pkgdir}/etc/profile.d/perlbin.csh - - (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) - (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) - grep -Rl "${pkgdir}" ${pkgdir}/usr | \ - xargs sed -i "s^${pkgdir}^^g" - - # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ - # (FS#16488) - rm -f $pkgdir/usr/share/perl5/core_perl/*.pod - for d in $pkgdir/usr/share/perl5/core_perl/*; do - if [ -d $d -a $(basename $d) != "pod" ]; then - find $d -name *.pod -delete - fi - done - find $pkgdir/usr/lib -name *.pod -delete - find $pkgdir -name .packlist -delete - # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) - install -dv ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf -} diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch deleted file mode 100644 index a2d176ec6..000000000 --- a/staging/perl/fix-h2ph-and-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001 -From: Robin Barker <rmbarker@cpan.org> -Date: Thu, 22 Apr 2010 11:51:20 +0100 -Subject: [PATCH 1/1] Fix h2ph and test - ---- - lib/h2ph.t | 12 ++++++++++-- - utils/h2ph.PL | 28 +++++++++++++++++++++++----- - 2 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/lib/h2ph.t b/lib/h2ph.t -index 27dd7b9..8d62d46 100644 ---- a/lib/h2ph.t -+++ b/lib/h2ph.t -@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { - exit 0; - } - --plan(4); -+plan(5); - - # quickly compare two text files - sub txt_compare { -@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', - stderr => 1 ); - like( $result, qr/syntax OK$/, "output compiles"); - -+$result = runperl( progfile => '_h2ph_pre.ph', -+ switches => ['-c'], -+ stderr => 1 ); -+like( $result, qr/syntax OK$/, "preamble compiles"); -+ - $result = runperl( switches => ["-w"], -- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); -+ stderr => 1, -+ prog => <<'PROG' ); -+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); -+PROG - is( $result, '', "output free of warnings" ); - - # cleanup -diff --git a/utils/h2ph.PL b/utils/h2ph.PL -index 8f56db4..1255807 100644 ---- a/utils/h2ph.PL -+++ b/utils/h2ph.PL -@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { - exit $Exit; - - sub expr { -- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. -+ if (/\b__asm__\b/) { # freak out -+ $new = '"(assembly code)"'; -+ return -+ } - my $joined_args; - if(keys(%curargs)) { - $joined_args = join('|', keys(%curargs)); -@@ -770,7 +773,7 @@ sub inc_dirs - sub build_preamble_if_necessary - { - # Increment $VERSION every time this function is modified: -- my $VERSION = 2; -+ my $VERSION = 3; - my $preamble = "$Dest_dir/_h2ph_pre.ph"; - - # Can we skip building the preamble file? -@@ -798,7 +801,16 @@ sub build_preamble_if_necessary - # parenthesized value: d=(v) - $define{$_} = $1; - } -- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { -+ if (/^(\w+)\((\w)\)$/) { -+ my($macro, $arg) = ($1, $2); -+ my $def = $define{$_}; -+ $def =~ s/$arg/\$\{$arg\}/g; -+ print PREAMBLE <<DEFINE; -+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } -+ -+DEFINE -+ } elsif -+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { - # float: - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; -@@ -807,8 +819,14 @@ sub build_preamble_if_necessary - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; - } elsif ($define{$_} =~ /^\w+$/) { -- print PREAMBLE -- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; -+ my $def = $define{$_}; -+ if ($isatype{$def}) { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; -+ } else { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { &$def } }\n\n"; -+ } - } else { - print PREAMBLE - "unless (defined &$_) { sub $_() { \"", --- -1.6.5.2.74.g610f9.dirty - diff --git a/staging/perl/perl.install b/staging/perl/perl.install deleted file mode 100644 index a355c5bbe..000000000 --- a/staging/perl/perl.install +++ /dev/null @@ -1,10 +0,0 @@ -# arg 1: the new package version -post_install() { - for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do - [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver - [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver - [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver - done - return 0 -} - diff --git a/staging/perl/perlbin.csh b/staging/perl/perlbin.csh deleted file mode 100644 index 535f0b18d..000000000 --- a/staging/perl/perlbin.csh +++ /dev/null @@ -1,15 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 diff --git a/staging/perl/perlbin.sh b/staging/perl/perlbin.sh deleted file mode 100755 index 20f830436..000000000 --- a/staging/perl/perlbin.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl - -export PATH - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 - diff --git a/staging/perl/provides.pl b/staging/perl/provides.pl deleted file mode 100644 index 3bf369577..000000000 --- a/staging/perl/provides.pl +++ /dev/null @@ -1,286 +0,0 @@ -# provides.pl -## -# Script for printing out a provides list of every CPAN distribution -# that is bundled with perl. -# -# Justin Davis <jrcd83@gmail.com> - -use warnings 'FATAL' => 'all'; -use strict; - -package Common; - -sub evalver -{ - my ($path, $mod) = @_; - $mod ||= ""; - - open my $fh, '<', $path or die "open $path: $!"; - - while (<$fh>) { - next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/; - my $ver = eval $1; - return $ver unless $@; - warn qq{$path:$. bad version string "$ver"\n}; - } - - close $fh; - return undef; -} - -#----------------------------------------------------------------------------- - -package Dists; - -sub maindistfile -{ - my ($dist, $dir) = @_; - - # libpath is the modern style, installing modules under lib/ - # with dirs matching the name components. - my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm"; - - # dumbpath is an old style where there's no subdirs and just - # a .pm file. - my $dumbpath = $dist; - $dumbpath =~ s/\A.+-//; - $dumbpath .= ".pm"; - - my @paths = ($libpath, $dumbpath); - # Some modules (with simple names like XSLoader, lib, etc) are - # generated by Makefile.PL. Search through their generating code. - push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0; - - for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; } - return undef; -} - -sub module_ver -{ - my ($dist, $dir) = @_; - - my $path = maindistfile($dist, $dir) or return undef; - - my $mod = $dist; - $mod =~ s/-/::/g; - my $ver = Common::evalver($path, $mod); - unless ($ver) { - warn "failed to find version in module file for $dist\n"; - return undef; - } - - return $ver; -} - -sub changelog_ver -{ - my ($dist, $dir) = @_; - - my $path; - for my $tmp (glob "$dir/{Changes,ChangeLog}") { - if (-f $tmp) { $path = $tmp; last; } - } - return undef unless $path; - - open my $fh, '<', $path or die "open: $!"; - while (<$fh>) { - return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/; - return $1 if /\A\s*version\s+([0-9._]+)/i; - } - close $fh; - - return undef; -} - -# for some reason podlators has a VERSION file with perl code in it -sub verfile_ver -{ - my ($dist, $dir) = @_; - - my $path = "$dir/VERSION"; - return undef unless -f $path; # no warning, only podlaters has it - - return Common::evalver($path); -} - -# scans a directory full of nicely separated dist. directories. -sub scan_distroot -{ - my ($distroot) = @_; - opendir my $cpand, "$distroot" or die "failed to open $distroot"; - my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand; - closedir $cpand; - - my @found; - for my $dist (@dists) { - my $distdir = "$distroot/$dist"; - my $ver = (module_ver($dist, $distdir) - || changelog_ver($dist, $distdir) - || verfile_ver($dist, $distdir)); - - if ($ver) { push @found, [ $dist, $ver ]; } - else { warn "failed to find version for $dist\n"; } - } - return @found; -} - -sub find -{ - my ($srcdir) = @_; - return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}"; -} - -#----------------------------------------------------------------------------- - -package Modules; - -use HTTP::Tiny qw(); -use File::Find qw(); -use File::stat; - -*findfile = *File::Find::find; - -sub cpan_provider -{ - my ($module) = @_; - my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module"; - my $http = HTTP::Tiny->new; - my $resp = $http->get($url); - return undef unless $resp->{'success'}; - - my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m - or return undef; - - my $dist = $cpanpath; - $dist =~ s{\A.+/}{}; # remove author directory - $dist =~ s{-[^-]+\z}{}; # remove version and extension - return ($dist eq 'perl' ? undef : $dist); -} - -sub find -{ - my ($srcdir) = @_; - my $libdir = "$srcdir/lib/"; - die "failed to find $libdir directory" unless -d $libdir; - - # Find only the module files that have not changed since perl - # was extracted. We don't want the files perl just recently - # installed into lib/. We processed those already. - my @modfiles; - my $finder = sub { - return unless /[.]pm\z/; - push @modfiles, $_; - }; - findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir); - - # First we have to find what the oldest ctime actually is. - my $oldest = time; - @modfiles = map { - my $modfile = $_; - my $ctime = (stat $modfile)->ctime; - $oldest = $ctime if $ctime < $oldest; - [ $modfile, $ctime ]; # save ctime for later - } @modfiles; - - # Then we filter out any file that was created more than a - # few seconds after that. Process the rest. - my @mods; - for my $modfile (@modfiles) { - my ($mod, $ctime) = @$modfile; - next if $ctime - $oldest > 5; # ignore newer files - - my $path = $mod; - $mod =~ s{[.]pm\z}{}; - $mod =~ s{\A$libdir}{}; - $mod =~ s{/}{::}g; - - my $ver = Common::evalver($path) || q{}; - push @mods, [ $mod, $ver ]; - } - - # Convert modules names to the dist names who provide them. - my %seen; - my @dists; - for my $modref (@mods) { - my ($mod, $ver) = @$modref; - my $dist = cpan_provider($mod) or next; # filter out core modules - next if $seen{$dist}++; # avoid duplicate dists - push @dists, [ $dist, $ver ]; - } - return @dists; -} - -#----------------------------------------------------------------------------- - -package Dist2Pkg; - -sub name -{ - my ($name) = @_; - my $orig = $name; - - # Package names should be lowercase and consist of alphanumeric - # characters only (and hyphens!)... - $name =~ tr/A-Z/a-z/; - $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap) - $name =~ tr/-a-z0-9+//cd; # Delete all other chars. - $name =~ tr/-/-/s; - - # Delete leading or trailing hyphens... - $name =~ s/\A-|-\z//g; - - die qq{Dist. name '$orig' completely violates packaging standards} - unless $name; - - return "perl-$name"; -} - -sub version -{ - my ($version) = @_; - - # Package versions should be numbers and decimal points only... - $version =~ tr/-/./; - $version =~ tr/_0-9.-//cd; - - # Remove developer versions because pacman has no special logic - # to compare them to regular versions like perl does. - $version =~ s/_[^_]+\z//; - - $version =~ tr/_//d; # delete other underscores - $version =~ tr/././s; # only one period at a time - $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period - - return $version; -} - -#----------------------------------------------------------------------------- - -package main; - -my %CPANNAME = ('List-Util' => 'Scalar-List-Utils', - 'Text-Tabs' => 'Text-Tabs+Wrap', - 'Cwd' => 'PathTools'); - -my $perldir = shift or die "Usage: $0 [path to perl source directory]\n"; -die "$perldir is not a valid directory." unless -d $perldir; - -my @dists = (Dists::find($perldir), Modules::find($perldir)); -for my $dist (@dists) { - my $name = $dist->[0]; - $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name}; -} - -my @pkgs = map { - my ($name, $ver) = @$_; - $name = Dist2Pkg::name($name); - $ver = Dist2Pkg::version($ver); - [ $name, $ver ]; -} @dists; - -@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs; - -for my $pkg (@pkgs) { - my ($name, $ver) = @$pkg; - print "$name=$ver\n"; -} diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD deleted file mode 100644 index baced205a..000000000 --- a/staging/php/PKGBUILD +++ /dev/null @@ -1,365 +0,0 @@ -# $Id: PKGBUILD 146829 2012-01-18 19:53:06Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=php -pkgname=('php' - 'php-cgi' - 'php-apache' - 'php-fpm' - 'php-embed' - 'php-pear' - 'php-enchant' - 'php-gd' - 'php-intl' - 'php-ldap' - 'php-mcrypt' - 'php-mssql' - 'php-odbc' - 'php-pgsql' - 'php-pspell' - 'php-snmp' - 'php-sqlite' - 'php-tidy' - 'php-xsl') -pkgver=5.3.9 -_suhosinver=5.3.9-0.9.10 -pkgrel=2 -arch=('i686' 'x86_64') -license=('PHP') -url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' - 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' - 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') -source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" - 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm') -md5sums=('dd3288ed5c08cd61ac5bf619cb357521' - 'c099b3d7eac95018ababd41ded7f3066' - 'c15d18f846be1d69144a5d0056ee6506' - 'ffc338e8ce2a990f6f2a486355bbab65' - 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'b01be5f816988fcee7e78225836e5e27' - '740ec5fe2ecfd9d7febd4081c90ec65b' - '07c4e412909ac65a44ec90e7a2c4bade') - -build() { - phpconfig="--srcdir=../${pkgbase}-${pkgver} \ - --prefix=/usr \ - --sysconfdir=/etc/php \ - --localstatedir=/var \ - --with-layout=GNU \ - --with-config-file-path=/etc/php \ - --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ - --disable-rpath \ - --disable-static \ - --enable-shared \ - --mandir=/usr/share/man \ - --without-pear \ - " - - phpextensions="--enable-bcmath=shared \ - --enable-calendar=shared \ - --enable-dba=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --enable-gd-native-ttf \ - --enable-intl=shared \ - --enable-json=shared \ - --enable-mbregex \ - --enable-mbstring \ - --enable-pdo \ - --enable-phar=shared \ - --enable-posix=shared \ - --enable-session \ - --enable-shmop=shared \ - --enable-soap=shared \ - --enable-sockets=shared \ - --enable-sqlite-utf8 \ - --enable-sysvmsg=shared \ - --enable-sysvsem=shared \ - --enable-sysvshm=shared \ - --enable-xml \ - --enable-zip=shared \ - --with-bz2=shared \ - --with-curl=shared \ - --with-db4=/usr \ - --with-enchant=shared,/usr \ - --with-freetype-dir=shared,/usr \ - --with-gd=shared \ - --with-gdbm=shared \ - --with-gettext=shared \ - --with-gmp=shared \ - --with-iconv=shared \ - --with-icu-dir=/usr \ - --with-imap-ssl=shared \ - --with-imap=shared \ - --with-jpeg-dir=shared,/usr \ - --with-ldap=shared \ - --with-ldap-sasl \ - --with-mcrypt=shared \ - --with-mhash \ - --with-mssql=shared \ - --with-mysql-sock=/var/run/mysqld/mysqld.sock \ - --with-mysql=shared,mysqlnd \ - --with-mysqli=shared,mysqlnd \ - --with-openssl=shared \ - --with-pcre-regex=/usr \ - --with-pdo-mysql=shared,mysqlnd \ - --with-pdo-odbc=shared,unixODBC,/usr \ - --with-pdo-pgsql=shared \ - --with-pdo-sqlite=shared,/usr \ - --with-pgsql=shared \ - --with-png-dir=shared,/usr \ - --with-pspell=shared \ - --with-regex=php \ - --with-snmp=shared \ - --with-sqlite3=shared,/usr \ - --with-sqlite=shared \ - --with-tidy=shared \ - --with-unixODBC=shared,/usr \ - --with-xmlrpc=shared \ - --with-xsl=shared \ - --with-zlib \ - --without-db2 \ - --without-db3 \ - " - - EXTENSION_DIR=/usr/lib/php/modules - export EXTENSION_DIR - PEAR_INSTALLDIR=/usr/share/pear - export PEAR_INSTALLDIR - - cd ${srcdir}/${pkgbase}-${pkgver} - - # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch - - # adjust paths - patch -p0 -i ${srcdir}/php.ini.patch - patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # php - mkdir ${srcdir}/build-php - cd ${srcdir}/build-php - ln -s ../${pkgbase}-${pkgver}/configure - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - ${phpextensions} - make - - # cgi and fcgi - # reuse the previous run; this will save us a lot of time - cp -a ${srcdir}/build-php ${srcdir}/build-cgi - cd ${srcdir}/build-cgi - ./configure ${phpconfig} \ - --disable-cli \ - --enable-cgi \ - ${phpextensions} - make - - # apache - cp -a ${srcdir}/build-php ${srcdir}/build-apache - cd ${srcdir}/build-apache - ./configure ${phpconfig} \ - --disable-cli \ - --with-apxs2 \ - ${phpextensions} - make - - # fpm - cp -a ${srcdir}/build-php ${srcdir}/build-fpm - cd ${srcdir}/build-fpm - ./configure ${phpconfig} \ - --disable-cli \ - --enable-fpm \ - --with-fpm-user=http \ - --with-fpm-group=http \ - ${phpextensions} - make - - # embed - cp -a ${srcdir}/build-php ${srcdir}/build-embed - cd ${srcdir}/build-embed - ./configure ${phpconfig} \ - --disable-cli \ - --enable-embed=shared \ - ${phpextensions} - make - - # pear - cp -a ${srcdir}/build-php ${srcdir}/build-pear - cd ${srcdir}/build-pear - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - --with-pear \ - ${phpextensions} - make -} - -# check() { -# cd ${srcdir}/build-php -# make test -# } - -package_php() { - pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'curl') - replaces=('php-fileinfo' 'php-gmp' 'php-curl') - provides=('php-fileinfo' 'php-gmp' 'php-curl') - conflicts=('php-fileinfo' 'php-gmp' 'php-curl') - backup=('etc/php/php.ini') - - cd ${srcdir}/build-php - make -j1 INSTALL_ROOT=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/pear - # install php.ini - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini - install -d -m755 ${pkgdir}/etc/php/conf.d/ - - # remove static modules - rm -f ${pkgdir}/usr/lib/php/modules/*.a - # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so - # remove empty directory - rmdir ${pkgdir}/usr/include/php/include -} - -package_php-cgi() { - pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php') - - install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi -} - -package_php-apache() { - pkgdesc='Apache SAPI for PHP' - depends=('php' 'apache') - backup=('etc/httpd/conf/extra/php5_module.conf') - - install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so - install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf -} - -package_php-fpm() { - pkgdesc='FastCGI Process Manager for PHP' - depends=('php') - backup=('etc/php/php-fpm.conf') - - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf - install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm - install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm - install -d -m755 ${pkgdir}/etc/php/fpm.d -} - -package_php-embed() { - pkgdesc='Embed SAPI for PHP' - depends=('php') - - install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h -} - -package_php-pear() { - pkgdesc='PHP Extension and Application Repository' - depends=('php') - backup=('etc/php/pear.conf') - - cd ${srcdir}/build-pear - make -j1 install-pear INSTALL_ROOT=${pkgdir} - local i - while read i; do - [ ! -e "$i" ] || rm -rf "$i" - done < <(find ${pkgdir} -name '.*') -} - -package_php-enchant() { - depends=('php' 'enchant') - pkgdesc='enchant module for PHP' - install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so -} - -package_php-gd() { - depends=('php' 'libpng' 'libjpeg' 'freetype2') - pkgdesc='gd module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so -} - -package_php-intl() { - depends=('php' 'icu') - pkgdesc='intl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so -} - -package_php-ldap() { - depends=('php' 'libldap') - pkgdesc='ldap module for PHP' - install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so -} - -package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libltdl') - pkgdesc='mcrypt module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so -} - -package_php-mssql() { - depends=('php' 'freetds') - pkgdesc='mssql module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so -} - -package_php-odbc() { - depends=('php' 'unixodbc') - pkgdesc='ODBC modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so - install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so -} - -package_php-pgsql() { - depends=('php' 'postgresql-libs') - pkgdesc='PostgreSQL modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so - install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so -} - -package_php-pspell() { - depends=('php' 'aspell') - pkgdesc='pspell module for PHP' - install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so -} - -package_php-snmp() { - depends=('php' 'net-snmp') - pkgdesc='snmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so -} - -package_php-sqlite() { - depends=('php' 'sqlite3') - pkgdesc='sqlite3 module for PHP' - install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so - install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so -} - -package_php-tidy() { - depends=('php' 'tidyhtml') - pkgdesc='tidy module for PHP' - install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so -} - -package_php-xsl() { - depends=('php' 'libxslt') - pkgdesc='xsl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so -} diff --git a/staging/php/apache.conf b/staging/php/apache.conf deleted file mode 100644 index c3ca0aad5..000000000 --- a/staging/php/apache.conf +++ /dev/null @@ -1,13 +0,0 @@ -# Required modules: dir_module, php5_module - -<IfModule dir_module> - <IfModule php5_module> - DirectoryIndex index.php index.html - <FilesMatch "\.php$"> - SetHandler application/x-httpd-php - </FilesMatch> - <FilesMatch "\.phps$"> - SetHandler application/x-httpd-php-source - </FilesMatch> - </IfModule> -</IfModule> diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm deleted file mode 100644 index 7a1ba2597..000000000 --- a/staging/php/logrotate.d.php-fpm +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/php-fpm.log { - missingok - postrotate - /etc/rc.d/php-fpm logrotate >/dev/null || true - endscript -} diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch deleted file mode 100644 index b923edb38..000000000 --- a/staging/php/php-fpm.conf.in.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2012-01-11 10:50:14.905161442 +0100 -@@ -12,7 +12,7 @@ - ; Relative path can also be used. They will be prefixed by: - ; - the global prefix if it's been set (-p arguement) - ; - @prefix@ otherwise --;include=etc/fpm.d/*.conf -+;include=/etc/php/fpm.d/*.conf - - ;;;;;;;;;;;;;;;;;; - ; Global Options ; -@@ -22,7 +22,7 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+pid = run/php-fpm/php-fpm.pid - - ; Error log file - ; If it's set to "syslog", log is sent to syslogd instead of being written -@@ -140,7 +140,8 @@ - ; specific port; - ; '/path/to/unix/socket' - to listen on a unix socket. - ; Note: This value is mandatory. --listen = 127.0.0.1:9000 -+;listen = 127.0.0.1:9000 -+listen = /var/run/php-fpm/php-fpm.sock - - ; Set listen(2) backlog. A value of '-1' means unlimited. - ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -151,9 +152,9 @@ - ; BSD-derived systems allow connections regardless of permissions. - ; Default Values: user and group are set as the running user - ; mode is set to 0666 --;listen.owner = @php_fpm_user@ --;listen.group = @php_fpm_group@ --;listen.mode = 0666 -+listen.owner = @php_fpm_user@ -+listen.group = @php_fpm_group@ -+listen.mode = 0660 - - ; List of ipv4 addresses of FastCGI clients which are allowed to connect. - ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -@@ -442,7 +443,7 @@ - ; Chdir to this directory at the start. - ; Note: relative path can be used. - ; Default Value: current directory or / when chroot --;chdir = /var/www -+;chdir = /srv/http - - ; Redirect worker stdout and stderr into main error log. If not set, stdout and - ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch deleted file mode 100644 index 3dc5b6560..000000000 --- a/staging/php/php.ini.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- php.ini-production 2011-12-15 11:31:02.000000000 +0100 -+++ php.ini-production 2012-01-11 10:43:02.069936043 +0100 -@@ -376,7 +376,7 @@ - ; or per-virtualhost web server configuration file. This directive is - ; *NOT* affected by whether Safe Mode is turned On or Off. - ; http://php.net/open-basedir --;open_basedir = -+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ - - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. This directive is -@@ -793,7 +793,7 @@ - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:/usr/share/pear" - ; - ; Windows: "\path1;\path2" - ;include_path = ".;c:\php\includes" -@@ -816,7 +816,7 @@ - - ; Directory in which the loadable extensions (modules) reside. - ; http://php.net/extension-dir --; extension_dir = "./" -+extension_dir = "/usr/lib/php/modules/" - ; On windows: - ; extension_dir = "ext" - -@@ -950,53 +950,49 @@ - ; If you only provide the name of the extension, PHP will look for it in its - ; default extension directory. - ; --; Windows Extensions --; Note that ODBC support is built in, so no dll is needed for it. --; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) --; extension folders as well as the separate PECL DLL download (PHP 5). --; Be sure to appropriately set the extension_dir directive. --; --;extension=php_bz2.dll --;extension=php_curl.dll --;extension=php_fileinfo.dll --;extension=php_gd2.dll --;extension=php_gettext.dll --;extension=php_gmp.dll --;extension=php_intl.dll --;extension=php_imap.dll --;extension=php_interbase.dll --;extension=php_ldap.dll --;extension=php_mbstring.dll --;extension=php_exif.dll ; Must be after mbstring as it depends on it --;extension=php_mysql.dll --;extension=php_mysqli.dll --;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client --;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client --;extension=php_openssl.dll --;extension=php_pdo_firebird.dll --;extension=php_pdo_mssql.dll --;extension=php_pdo_mysql.dll --;extension=php_pdo_oci.dll --;extension=php_pdo_odbc.dll --;extension=php_pdo_pgsql.dll --;extension=php_pdo_sqlite.dll --;extension=php_pgsql.dll --;extension=php_pspell.dll --;extension=php_shmop.dll -- --; The MIBS data available in the PHP distribution must be installed. --; See http://www.php.net/manual/en/snmp.installation.php --;extension=php_snmp.dll -- --;extension=php_soap.dll --;extension=php_sockets.dll --;extension=php_sqlite.dll --;extension=php_sqlite3.dll --;extension=php_sybase_ct.dll --;extension=php_tidy.dll --;extension=php_xmlrpc.dll --;extension=php_xsl.dll --;extension=php_zip.dll -+;extension=bcmath.so -+;extension=bz2.so -+;extension=calendar.so -+extension=curl.so -+;extension=dba.so -+;extension=enchant.so -+;extension=exif.so -+;extension=ftp.so -+;extension=gd.so -+extension=gettext.so -+;extension=gmp.so -+;extension=iconv.so -+;extension=imap.so -+;extension=intl.so -+extension=json.so -+;extension=ldap.so -+;extension=mcrypt.so -+;extension=mssql.so -+;extension=mysqli.so -+;extension=mysql.so -+;extension=odbc.so -+;extension=openssl.so -+;extension=pdo_mysql.so -+;extension=pdo_odbc.so -+;extension=pdo_pgsql.so -+;extension=pdo_sqlite.so -+;extension=pgsql.so -+;extension=phar.so -+;extension=posix.so -+;extension=pspell.so -+;extension=shmop.so -+;extension=snmp.so -+;extension=soap.so -+;extension=sockets.so -+;extension=sqlite3.so -+;extension=sqlite.so -+;extension=sysvmsg.so -+;extension=sysvsem.so -+;extension=sysvshm.so -+;extension=tidy.so -+;extension=xmlrpc.so -+;extension=xsl.so -+;extension=zip.so - - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ; diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm deleted file mode 100644 index 54bcf4d5b..000000000 --- a/staging/php/rc.d.php-fpm +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -wait_for_pid () { - try=0 - while test $try -lt 35 ; do - case "$1" in - 'created') - if [ -f "$2" ] ; then - try='' - break - fi - ;; - 'removed') - if [ ! -f "$2" ] ; then - try='' - break - fi - ;; - esac - - stat_append '.' - try=`expr $try + 1` - sleep 1 - done -} - -test_config() { - stat_busy 'Checking configuration' - if [ $(id -u) -ne 0 ]; then - stat_append '(This script must be run as root)' - stat_die - fi - - if [ ! -r /etc/php/php-fpm.conf ]; then - stat_append '(/etc/php/php-fpm.conf not found)' - stat_die - fi - - local test=$(/usr/sbin/php-fpm -t 2>&1) - if [ $? -gt 0 ]; then - stat_append '(error in /etc/php/php-fpm.conf)' - stat_die - elif echo $test | grep -qi 'error'; then - stat_append '(error in /etc/php/php.ini)' - stat_die - fi - - [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm - - stat_done -} - -case "$1" in - start) - test_config - stat_busy 'Starting php-fpm' - - /usr/sbin/php-fpm - - if [ "$?" != 0 ] ; then - stat_fail - exit 1 - fi - - wait_for_pid created /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - add_daemon php-fpm - stat_done - fi - ;; - - stop) - test_config - stat_busy 'Gracefully shutting down php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - force-quit) - stat_busy 'Terminating php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -TERM `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - test_config - stat_busy 'Reload service php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - logrotate) - stat_busy 'Reopen php-fpm log' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - *) - echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" - exit 1 - ;; - -esac diff --git a/staging/pilot-link/PKGBUILD b/staging/pilot-link/PKGBUILD deleted file mode 100644 index 28fa36618..000000000 --- a/staging/pilot-link/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 147174 2012-01-23 21:43:03Z eric $ -# Maintainer: dale <dale@archlinux.org> - -# todo: add perl support, DESTDIR has no affect on perl -# and it seems that moving the files manually doesn't work - -pkgname=pilot-link -pkgver=0.12.5 -pkgrel=3 -pkgdesc="A suite of tools for connecting to PalmOS handheld devices" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('readline>=6.0' 'libpng>=1.5.0' 'libusb-compat' 'popt' 'bluez>=4.59') -options=('!libtool') -url="http://www.pilot-link.org/" -source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2 - pilot-link-png14.patch) -md5sums=('568c55bf504b044f6fbd50baa407c990' - 'a21a2eeb01544a8a261a75e64a3120c3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/pilot-link-png14.patch" - ./configure --prefix=/usr --enable-conduits --enable-libusb \ - --with-libiconv --with-libpng - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/pilot-link/pilot-link-png14.patch b/staging/pilot-link/pilot-link-png14.patch deleted file mode 100644 index 9d753332e..000000000 --- a/staging/pilot-link/pilot-link-png14.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c pilot-link-0.12.4.png14/src/pilot-read-notepad.c ---- pilot-link-0.12.4/src/pilot-read-notepad.c 2007-02-05 00:06:02.000000000 +0100 -+++ pilot-link-0.12.4.png14/src/pilot-read-notepad.c 2010-01-17 15:04:33.000000000 +0100 -@@ -39,10 +39,6 @@ - - #ifdef HAVE_PNG - #include "png.h" --#if (PNG_LIBPNG_VER < 10201) -- #define png_voidp_NULL (png_voidp)NULL -- #define png_error_ptr_NULL (png_error_ptr)NULL --#endif - #endif - - const char *progname; -@@ -166,8 +162,8 @@ - width = n->body.width + 8; - - png_ptr = png_create_write_struct -- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ ( PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if(!png_ptr) - return; -diff -ru pilot-link-0.12.4/src/pilot-read-palmpix.c pilot-link-0.12.4.png14/src/pilot-read-palmpix.c ---- pilot-link-0.12.4/src/pilot-read-palmpix.c 2007-02-05 00:06:03.000000000 +0100 -+++ pilot-link-0.12.4.png14/src/pilot-read-palmpix.c 2010-01-17 15:03:20.000000000 +0100 -@@ -42,10 +42,6 @@ - - #ifdef HAVE_PNG - #include "png.h" --#if (PNG_LIBPNG_VER < 10201) -- #define png_voidp_NULL (png_voidp)NULL -- #define png_error_ptr_NULL (png_error_ptr)NULL --#endif - #endif - - const char *progname; -@@ -223,8 +219,8 @@ - png_infop info_ptr; - - png_ptr = png_create_write_struct -- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ ( PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if(!png_ptr) - return; -diff -ru pilot-link-0.12.4/src/pilot-read-screenshot.c pilot-link-0.12.4.png14/src/pilot-read-screenshot.c ---- pilot-link-0.12.4/src/pilot-read-screenshot.c 2006-11-02 15:54:31.000000000 +0100 -+++ pilot-link-0.12.4.png14/src/pilot-read-screenshot.c 2010-01-17 15:03:52.000000000 +0100 -@@ -40,10 +40,6 @@ - - #ifdef HAVE_PNG - # include "png.h" --# if (PNG_LIBPNG_VER < 10201) --# define png_voidp_NULL (png_voidp)NULL --# define png_error_ptr_NULL (png_error_ptr)NULL --# endif - #endif - - #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) -@@ -87,8 +83,8 @@ - gray_buf = malloc( state->w ); - - png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if (!png_ptr) - return; -diff -ru pilot-link-0.12.4/src/pilot-read-veo.c pilot-link-0.12.4.png14/src/pilot-read-veo.c ---- pilot-link-0.12.4/src/pilot-read-veo.c 2007-02-05 00:06:03.000000000 +0100 -+++ pilot-link-0.12.4.png14/src/pilot-read-veo.c 2010-01-17 15:04:14.000000000 +0100 -@@ -41,10 +41,6 @@ - - #ifdef HAVE_PNG - # include "png.h" --# if (PNG_LIBPNG_VER < 10201) --# define png_voidp_NULL (png_voidp)NULL --# define png_error_ptr_NULL (png_error_ptr)NULL --# endif - #endif - - #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) -@@ -856,8 +852,8 @@ - png_infop info_ptr; - - png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if (!png_ptr) - return; diff --git a/staging/plotutils/PKGBUILD b/staging/plotutils/PKGBUILD deleted file mode 100644 index 14d4c736e..000000000 --- a/staging/plotutils/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 147686 2012-01-27 01:31:15Z eric $ -# Maintainer: damir <damir@archlinux.org> -# Packager: Maksim Sipos (maxsipos at gmail dot com) - -pkgname=plotutils -pkgver=2.6 -pkgrel=2 -arch=('x86_64' 'i686') -pkgdesc="Set of utilities and libraries for plotting." -url="http://directory.fsf.org/graphics/plotutils.html" -license=("GPL") -depends=("libpng" "gcc-libs" "libxaw>=1.0.5") -options=('!libtool') -install=plotutils.install -source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch) -sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838' - '426f6ee04186af5059ab54322efaf0a6a976682b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../plotutils-2.6-libpng-1.5.patch - ./configure --prefix=/usr \ - --with-gnu-ld \ - --with-x \ - --enable-libplotter - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/plotutils/plotutils-2.6-libpng-1.5.patch b/staging/plotutils/plotutils-2.6-libpng-1.5.patch deleted file mode 100644 index b86d9f457..000000000 --- a/staging/plotutils/plotutils-2.6-libpng-1.5.patch +++ /dev/null @@ -1,31 +0,0 @@ -fix building with libpng-1.5 - ---- libplot/z_write.c -+++ libplot/z_write.c -@@ -164,7 +164,7 @@ - } - - /* cleanup after libpng errors (error handler does a longjmp) */ -- if (setjmp (png_ptr->jmpbuf)) -+ if (png_jmpbuf (png_ptr)) - { - png_destroy_write_struct (&png_ptr, (png_info **)NULL); - return -1; -@@ -444,7 +444,7 @@ - #endif - } - -- longjmp (png_ptr->jmpbuf, 1); -+ longjmp (png_jmpbuf (png_ptr), 1); - } - - static void -@@ -515,7 +515,7 @@ - #endif - } - -- longjmp (png_ptr->jmpbuf, 1); -+ longjmp (png_jmpbuf (png_ptr), 1); - } - - static void diff --git a/staging/plotutils/plotutils.install b/staging/plotutils/plotutils.install deleted file mode 100644 index d3d033e0c..000000000 --- a/staging/plotutils/plotutils.install +++ /dev/null @@ -1,15 +0,0 @@ -infodir=usr/share/info - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null -} diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD deleted file mode 100644 index d05f4945e..000000000 --- a/staging/poppler/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 147129 2012-01-22 11:12:11Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.3 -pkgrel=2 -arch=(i686 x86_64) -license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') -options=('!libtool' '!emptydirs') -url="http://poppler.freedesktop.org/" -_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz - http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 - git-fixes.patch) -md5sums=('d70d2d63d8acd29c97185f7e5f09c9b4' - '9dc64c254a31e570507bdd4ad4ba629a' - 'af56b7b1b24a08f7498a0c7f5e862b93') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.ac - #patch -Np1 -i "${srcdir}/git-fixes.patch" - - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-cairo-output \ - --enable-xpdf-headers \ - --enable-libjpeg --enable-zlib \ - --enable-poppler-qt4 \ - --enable-poppler-glib - make -} - -check() { - cd "${srcdir}" - ln -sf test-${_testtag} test - cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check -} - -package_poppler() { - pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') - conflicts=("poppler-qt3<${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc -} - -package_poppler-glib() { - pkgdesc="Poppler glib bindings" - depends=("poppler=${pkgver}" 'glib2') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/glib" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* - rm -f "${pkgdir}/usr/bin/poppler-glib-demo" -} - -package_poppler-qt() { - pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/qt4" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* -} diff --git a/staging/poppler/git-fixes.patch b/staging/poppler/git-fixes.patch deleted file mode 100644 index 24a66b84f..000000000 --- a/staging/poppler/git-fixes.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Sun, 04 Dec 2011 16:29:45 +0000 -Subject: Do not fail if we are trying to save a file with Encrypt but that we have not modified at all - -Fixes KDE bug #288045 -(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa) ---- -diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc -index 01d2759..2758206 100644 ---- a/poppler/PDFDoc.cc -+++ b/poppler/PDFDoc.cc -@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) { - - int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) { - -- // we don't support files with Encrypt at the moment -+ // find if we have updated objects -+ GBool updated = gFalse; -+ for(int i=0; i<xref->getNumObjects(); i++) { -+ if (xref->getEntry(i)->updated) { -+ updated = gTrue; -+ break; -+ } -+ } -+ -+ // we don't support rewriting files with Encrypt at the moment - Object obj; - xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj); - if (!obj.isNull()) - { - obj.free(); -- return errEncrypted; -+ if (!updated && mode == writeStandard) { -+ // simply copy the original file -+ saveWithoutChangesAs (outStr); -+ } else { -+ return errEncrypted; -+ } - } -- obj.free(); -+ else -+ { -+ obj.free(); - -- if (mode == writeForceRewrite) { -- saveCompleteRewrite(outStr); -- } else if (mode == writeForceIncremental) { -- saveIncrementalUpdate(outStr); -- } else { // let poppler decide -- // find if we have updated objects -- GBool updated = gFalse; -- for(int i=0; i<xref->getNumObjects(); i++) { -- if (xref->getEntry(i)->updated) { -- updated = gTrue; -- break; -+ if (mode == writeForceRewrite) { -+ saveCompleteRewrite(outStr); -+ } else if (mode == writeForceIncremental) { -+ saveIncrementalUpdate(outStr); -+ } else { // let poppler decide -+ if(updated) { -+ saveIncrementalUpdate(outStr); -+ } else { -+ // simply copy the original file -+ saveWithoutChangesAs (outStr); - } - } -- if(updated) { -- saveIncrementalUpdate(outStr); -- } else { -- // simply copy the original file -- saveWithoutChangesAs (outStr); -- } - } - - return errNone; --- -cgit v0.9.0.2-2-gbebe -From 03544e2f602319f0b381f5f357e14cc2cc77d2c1 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Tue, 06 Dec 2011 22:21:15 +0000 -Subject: include strings.h as we use memcpy - -Fixes bug 43558 -(cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b) ---- -diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc -index f88c3a7..1fb8cab 100644 ---- a/goo/PNGWriter.cc -+++ b/goo/PNGWriter.cc -@@ -6,7 +6,7 @@ - // - // Copyright (C) 2009 Warren Toomey <wkt@tuhs.org> - // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com> --// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org> -+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org> - // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com> - // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com> - // Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at> -@@ -19,6 +19,7 @@ - - #include <zlib.h> - #include <stdlib.h> -+#include <string.h> - - #include "poppler/Error.h" - #include "goo/gmem.h" --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/postfix/PKGBUILD b/staging/postfix/PKGBUILD deleted file mode 100644 index 544a08df3..000000000 --- a/staging/postfix/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 145787 2012-01-01 01:35:49Z bisson $ -# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> -# Contributor: Paul Mattal <paul@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=postfix -pkgver=2.8.7 -pkgrel=2 -pkgdesc='Fast, easy to administer, secure mail server' -url='http://www.postfix.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db') -backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ - 'aliases.patch' \ - 'rc.d') -sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0' - '5fc3de6c7df1e5851a0a379e825148868808318b' - '40c6be2eb55e6437a402f43775cdb3d22ea87a66') - -provides=('smtp-server' 'smtp-forwarder') -replaces=('postfix-mysql' 'postfix-pgsql') -conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make makefiles DEBUG='' CCARGS=' \ - -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ - -DHAS_LDAP \ - -DUSE_TLS \ - -DHAS_MYSQL -I/usr/include/mysql \ - -DHAS_PGSQL -I/usr/include/postgresql \ - -DHAS_SQLITE \ - ' AUXLIBS=' \ - -lsasl2 \ - -lldap -llber \ - -lssl -lcrypto \ - -lmysqlclient -lz -lm \ - -lpq \ - -lsqlite3 -lpthread \ - ' OPT="${CFLAGS} ${LDFLAGS}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sh postfix-install -non-interactive \ - install_root="${pkgdir}" \ - daemon_directory="/usr/lib/${pkgname}" \ - sample_directory="/etc/${pkgname}/sample" \ - manpage_directory="/usr/share/man" - - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd "${pkgdir}" - patch -p0 -i "${srcdir}"/aliases.patch -} diff --git a/staging/postfix/aliases.patch b/staging/postfix/aliases.patch deleted file mode 100644 index 6767870b7..000000000 --- a/staging/postfix/aliases.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 -+++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 -@@ -382,6 +382,7 @@ - #alias_maps = hash:/etc/aliases - #alias_maps = hash:/etc/aliases, nis:mail.aliases - #alias_maps = netinfo:/aliases -+alias_maps = hash:/etc/postfix/aliases - - # The alias_database parameter specifies the alias database(s) that - # are built with "newaliases" or "sendmail -bi". This is a separate -@@ -392,6 +393,7 @@ - #alias_database = dbm:/etc/mail/aliases - #alias_database = hash:/etc/aliases - #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases -+alias_database = $alias_maps - - # ADDRESS EXTENSIONS (e.g., user+foo) - # diff --git a/staging/postfix/install b/staging/postfix/install deleted file mode 100644 index c276e0919..000000000 --- a/staging/postfix/install +++ /dev/null @@ -1,34 +0,0 @@ -post_install() { - getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null - getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null - getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null - - cd var/spool/postfix - chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved - chgrp postdrop public maildrop - cd ../../../usr/sbin - chgrp postdrop postqueue postdrop - chmod g+s postqueue postdrop - cd ../.. - chown postfix var/lib/postfix - - newaliases -} - -post_upgrade() { - post_install - - if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF - -==> You must now execute "/etc/rc.d/postfix reload" (or restart). -==> This is needed because of an inter-daemon protocol change. - -EOF - fi -} - -pre_remove() { - getent passwd postfix &>/dev/null && userdel postfix >/dev/null - getent group postfix &>/dev/null && groupdel postfix >/dev/null - getent group postdrop &>/dev/null && groupdel postdrop >/dev/null -} diff --git a/staging/postfix/rc.d b/staging/postfix/rc.d deleted file mode 100755 index fa314bb84..000000000 --- a/staging/postfix/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=postfix - -case "$1" in -start) - stat_busy "Starting $name daemon" - /usr/sbin/postfix start &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - /usr/sbin/postfix stop &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - /usr/sbin/postfix reload &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/staging/pygtk/PKGBUILD b/staging/pygtk/PKGBUILD deleted file mode 100644 index a231b87ef..000000000 --- a/staging/pygtk/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 147168 2012-01-23 21:15:41Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=pygtk -pkgver=2.24.0 -pkgrel=3 -pkgdesc="Python bindings for the GTK widget set" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('libglade' 'python2-cairo' 'pygobject') -makedepends=('python2-numpy' 'pygobject2-devel') -optdepends=('python2-numpy') -options=('!libtool') -url="http://www.pygtk.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - python27.patch) -sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' - '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - #https://bugzilla.gnome.org/show_bug.cgi?id=623965 - patch -Np1 -i "${srcdir}/python27.patch" - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" - - sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py -} diff --git a/staging/pygtk/python27.patch b/staging/pygtk/python27.patch deleted file mode 100644 index 9bbe2b5ae..000000000 --- a/staging/pygtk/python27.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c -index c0e1493..aa8cf10 100644 ---- a/gtk/gtkmodule.c -+++ b/gtk/gtkmodule.c -@@ -227,8 +227,12 @@ init_gtk(void) - pygtk_add_stock_items(d); - - /* extension API */ -- PyDict_SetItemString(d, "_PyGtk_API", -- o=PyCObject_FromVoidPtr(&functions, NULL)); -+#if PY_VERSION_HEX >= 0x02070000 -+ o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL); -+#else -+ o = PyCObject_FromVoidPtr(&functions, NULL); -+#endif -+ PyDict_SetItemString(d, "_PyGtk_API", o); - Py_DECREF(o); - - PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning", -diff --git a/gtk/pygtk.h b/gtk/pygtk.h -index 573c3b9..e4c680f 100644 ---- a/gtk/pygtk.h -+++ b/gtk/pygtk.h -@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; - - - /* a function to initialise the pygtk functions */ -+ -+/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */ -+#if PY_VERSION_HEX >= 0x02070000 -+#define init_pygtk() G_STMT_START { \ -+ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \ -+ if (!capsule) { \ -+ return; \ -+ } \ -+ _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \ -+} G_STMT_END -+#else /* PY_VERSION_HEX */ -+/* Python 2.6 and earlier use the CObject API */ - #define init_pygtk() G_STMT_START { \ - PyObject *pygtk = PyImport_ImportModule("gtk"); \ - if (pygtk != NULL) { \ -@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; - return; \ - } \ - } G_STMT_END -+#endif /* PY_VERSION_HEX */ - - #endif - diff --git a/staging/pygtksourceview2/PKGBUILD b/staging/pygtksourceview2/PKGBUILD deleted file mode 100644 index 794456360..000000000 --- a/staging/pygtksourceview2/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147214 2012-01-24 19:17:55Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=pygtksourceview2 -pkgver=2.10.1 -pkgrel=4 -pkgdesc="Python bindings for gtksourceview2" -arch=(i686 x86_64) -license=('GPL') -depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0') -makedepends=('intltool' 'pkg-config') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2) -sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974') - -build() { - cd "${srcdir}/pygtksourceview-${pkgver}" - PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static --disable-docs - make -} - -package() { - cd "${srcdir}/pygtksourceview-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD deleted file mode 100644 index b00e72a84..000000000 --- a/staging/python-notify/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 147960 2012-01-29 04:17:35Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Mario Danic <mario.danic@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -pkgname=python-notify -pkgver=0.1.1 -pkgrel=11 -pkgdesc="Python bindings for libnotify" -arch=('i686' 'x86_64') -url="http://www.galago-project.org/" -license=('GPL') -depends=('pygtk>=2.22.0' 'libnotify>=0.7.1') -makedepends=('pkgconfig' 'python2') -options=(!libtool) -source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz - libnotify07.patch - notify-python-0.1.1-fix-GTK-symbols.patch) -md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4' - 'b40c4542575d5aef559908fe60a21634' - 'c6922028da5951e69a6a0167bdb4461c') - -build() { - cd ${srcdir}/notify-python-${pkgver} - - patch -Np1 -i ${srcdir}/libnotify07.patch - patch -Np1 -i ${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch - - ./configure --prefix=/usr - - # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c - # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed - touch src/pynotify.override - - make clean - make -} - -package() { - cd ${srcdir}/notify-python-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch deleted file mode 100644 index 289573d50..000000000 --- a/staging/python-notify/libnotify07.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs ---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400 -+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400 -@@ -38,7 +38,6 @@ - '("const-gchar*" "summary") - '("const-gchar*" "message" (null-ok) (default "NULL")) - '("const-gchar*" "icon" (null-ok) (default "NULL")) -- '("GtkWidget*" "attach" (null-ok) (default "NULL")) - ) - ) - -@@ -53,24 +52,6 @@ - ) - ) - --(define-method attach_to_widget -- (of-object "NotifyNotification") -- (c-name "notify_notification_attach_to_widget") -- (return-type "none") -- (parameters -- '("GtkWidget*" "attach") -- ) --) -- --(define-method attach_to_status_icon -- (of-object "NotifyNotification") -- (c-name "notify_notification_attach_to_status_icon") -- (return-type "none") -- (parameters -- '("GtkStatusIcon*" "attach") -- ) --) -- - (define-method show - (of-object "NotifyNotification") - (c-name "notify_notification_show") diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch deleted file mode 100644 index f985c0136..000000000 --- a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py ---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400 -+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400 -@@ -1 +1,21 @@ -+""" -+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea -+was to support being linked against different parallel-installable -+GTK stacks. -+ -+Unfortunately, python needs to jump through some special hoops in order -+to share symbols with extension modules, specifically, pygtk, which does -+link against GTK2. -+ -+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL), -+the result is: -+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name' -+ -+Thanks to David Malcolm for figuring out the workaround. -+""" -+import ctypes -+import sys -+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) -+import gtk -+ - from _pynotify import * diff --git a/staging/python-pygame/ChangeLog b/staging/python-pygame/ChangeLog deleted file mode 100644 index 566be3f65..000000000 --- a/staging/python-pygame/ChangeLog +++ /dev/null @@ -1,34 +0,0 @@ -2012-01-24 Angel Velasquez <angvp@archlinux.org> - - * Rebuilt against libpng 1.5 - -2010-08-24 Eric Belanger <eric@archlinux.org> - - * Rebuilt for python2 - -2009-08-06 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated to: 1.9.1 - -2009-08-03 Douglas Soares de Andrade <douglas@archlinux.org> - - * Adding the examples folder - -2009-08-01 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for x86_64: 1.9.0 - -2008-08-06 Eric Belanger <eric@archlinux.org> - - * python-pygame 1.8.1-2 - * Fixed file permissions (close FS#11082) - -2008-07-31 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 1.8.1 - -2008-03-31 Eric Belanger <eric@archlinux.org> - - * python-pygame 1.8.0-1 - * Upstream update - * Added ChangeLog diff --git a/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD deleted file mode 100644 index 20b37e9ac..000000000 --- a/staging/python-pygame/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 147958 2012-01-29 04:08:03Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: john(?) -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -pkgname=python-pygame -pkgver=1.9.1 -pkgrel=4 -pkgdesc="Python game library" -arch=('i686' 'x86_64') -url="http://www.pygame.org/" -license=('LGPL') -depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg') -makedepends=('python2' 'portmidi') -replaces=('pygame') -provides=('pygame') -changelog=ChangeLog -source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch' -'pygame-v4l.patch') -md5sums=('1c4cdc708d17c8250a2d78ef997222fc' - 'aaa668f3cd710d8604114501ea6a6f48' - '9915b63865c16519e80007909beed876') - -build() { - cd "${srcdir}/pygame-${pkgver}release" - patch -Np0 -i "${srcdir}/config.patch" - patch -Np1 -i "${srcdir}/pygame-v4l.patch" -} - -package() { - cd "${srcdir}/pygame-${pkgver}release" - python2 config.py -auto - python2 setup.py install --root="${pkgdir}" --prefix=/usr - # Copying the examples and tests - cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame" - cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests" - # Fixing permissions - chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/* -} diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch deleted file mode 100644 index b3dab162c..000000000 --- a/staging/python-pygame/config.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: config_unix.py -=================================================================== ---- config_unix.py (revision 2567) -+++ config_unix.py (working copy) -@@ -174,7 +174,7 @@ - - for d in DEPS[1:]: - if not d.found: -- if not confirm(""" -+ if "-auto" not in sys.argv and not confirm(""" - Warning, some of the pygame dependencies were not found. Pygame can still - compile and install, but games that depend on those missing dependencies - will not run. Would you like to continue the configuration?"""): -Index: config_msys.py -=================================================================== ---- config_msys.py (revision 2567) -+++ config_msys.py (working copy) -@@ -283,7 +283,7 @@ - - for d in DEPS[1:]: - if not d.found: -- if not confirm(""" -+ if "-auto" not in sys.argv and not confirm(""" - Warning, some of the pygame dependencies were not found. Pygame can still - compile and install, but games that depend on those missing dependencies - will not run. Would you like to continue the configuration?"""): diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch deleted file mode 100644 index 3b5a2b9d2..000000000 --- a/staging/python-pygame/pygame-v4l.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in -*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009 ---- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011 -*************** -*** 34,40 **** - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c ---- 34,40 ---- - _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) - movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) - scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) -! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG) - pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) - - GFX = src/SDL_gfx/SDL_gfxPrimitives.c -diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c -*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009 ---- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011 -*************** -*** 160,179 **** - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! if (v4l_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } else { -! self->camera_type = CAM_V4L; -! if (v4l_init_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! if (v4l_start_capturing(self) == 0) { -! v4l2_close_device(self); -! return NULL; -! } -! } - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { ---- 160,167 ---- - { - #if defined(__unix__) - if (v4l2_open_device(self) == 0) { -! v4l2_close_device(self); -! return NULL; - } else { - self->camera_type = CAM_V4L2; - if (v4l2_init_device(self) == 0) { -diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h -*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008 ---- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011 -*************** -*** 39,45 **** - - #include <asm/types.h> /* for videodev2.h */ - -- #include <linux/videodev.h> - #include <linux/videodev2.h> - #endif - ---- 39,44 ---- -*************** -*** 51,57 **** - #define RGB_OUT 1 - #define YUV_OUT 2 - #define HSV_OUT 4 -- #define CAM_V4L 1 - #define CAM_V4L2 2 - - struct buffer ---- 50,55 ---- -*************** -*** 111,118 **** - int v4l2_close_device (PyCameraObject* self); - int v4l2_open_device (PyCameraObject* self); - -- /* internal functions specific to v4l */ -- int v4l_open_device (PyCameraObject* self); -- int v4l_init_device(PyCameraObject* self); -- int v4l_start_capturing(PyCameraObject* self); - #endif ---- 109,112 ---- diff --git a/staging/pywebkitgtk/PKGBUILD b/staging/pywebkitgtk/PKGBUILD deleted file mode 100644 index 792ef185c..000000000 --- a/staging/pywebkitgtk/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 147954 2012-01-29 03:55:38Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: kasa <biuta.jr@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=pywebkitgtk -pkgver=1.1.8 -pkgrel=2 -pkgdesc="Python bindings to the WebKit GTK+ port" -arch=('i686' 'x86_64') -url="http://code.google.com/p/pywebkitgtk/" -license=('LGPL') -depends=('libwebkit' 'pygtk') -options=('!libtool' '!makeflags') -source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('158335385354ba38090c9324b37bf225') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/qemu-kvm/65-kvm.rules b/staging/qemu-kvm/65-kvm.rules deleted file mode 100644 index c2f7317aa..000000000 --- a/staging/qemu-kvm/65-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/staging/qemu-kvm/PKGBUILD b/staging/qemu-kvm/PKGBUILD deleted file mode 100644 index f1952ae52..000000000 --- a/staging/qemu-kvm/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 148022 2012-01-30 01:45:27Z eric $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu-kvm -pkgver=1.0 -pkgrel=3 -pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=(i686 x86_64) -license=('GPL2' 'LGPL2.1') -url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse') -makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2') -backup=('etc/qemu/target-x86_64.conf') -install=qemu-kvm.install -conflicts=('qemu') -provides=('qemu') -replaces=('kvm') -source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz - 65-kvm.rules) -options=(!strip) - -build() -{ - cd "${srcdir}/${pkgname}-${pkgver}" - # fix esound building - ./configure --prefix=/usr \ - --python=/usr/bin/python2 \ - --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss,pa \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs - make - - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cd "${srcdir}/" - git clone git://git.seabios.org/seabios.git - cd seabios - find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - make clean - make -} - -package() -{ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" - - # symbolic link for backwards compatibility - ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm" - # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu" - # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm" - # fix man page - mv "${pkgdir}/usr/share/man/man1/qemu.1" \ - "${pkgdir}/usr/share/man/man1/qemu-kvm.1" - # install udev rules - install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/lib/udev/rules.d/65-kvm.rules" - # strip scripts directory - find "${pkgdir}/usr/bin" -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done -} -md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/staging/qemu-kvm/qemu-kvm.install b/staging/qemu-kvm/qemu-kvm.install deleted file mode 100644 index 84aa773b9..000000000 --- a/staging/qemu-kvm/qemu-kvm.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - groupadd kvm -f -g 78 - echo ">>> PLEASE READ FOR KVM USAGE!" - echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" - echo ">>> Add yourself to the group 'kvm'." - echo ">>> Use 'qemu-kvm -enable-kvm' to use KVM." - echo "" -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - groupdel kvm -} diff --git a/staging/qemu/65-kvm.rules b/staging/qemu/65-kvm.rules deleted file mode 100644 index c2f7317aa..000000000 --- a/staging/qemu/65-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/staging/qemu/PKGBUILD b/staging/qemu/PKGBUILD deleted file mode 100644 index 4110f17ae..000000000 --- a/staging/qemu/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 148018 2012-01-30 01:00:56Z eric $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu -pkgver=1.0 -pkgrel=3 -pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -url="http://wiki.qemu.org/Index.html" -makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse') -backup=('etc/qemu/target-x86_64.conf') -install=qemu.install -source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz - 65-kvm.rules) -options=(!strip) - -build() -{ - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/lib64/lib/g' x86_64.ld - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ - --python=/usr/bin/python2 \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs - make - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cd "${srcdir}/" - git clone git://git.seabios.org/seabios.git - cd seabios - find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - make clean - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" - - install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/lib/udev/rules.d/65-kvm.rules" - # strip scripts directory - find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done - -} -md5sums=('a64b36067a191451323b0d34ebb44954' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/staging/qemu/qemu.install b/staging/qemu/qemu.install deleted file mode 100644 index e16ac027c..000000000 --- a/staging/qemu/qemu.install +++ /dev/null @@ -1,24 +0,0 @@ -# kvm: the new package version -post_install() { - # - groupadd kvm -f -g 78 - echo ">>> PLEASE READ FOR KVM USAGE!" - echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" - echo ">>> Add yourself to the group 'kvm'." - echo ">>> Use 'qemu -enable-kvm' to use KVM." - echo "" - if [ "$(vercmp $2 0.11)" -lt 0 ]; then - echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" - echo "is no longer supported and will be removed from the repositories. You" - echo "can safely uninstall it from your system." - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - # - groupdel kvm -} diff --git a/staging/qiv/PKGBUILD b/staging/qiv/PKGBUILD deleted file mode 100644 index 520b5847e..000000000 --- a/staging/qiv/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 147092 2012-01-21 19:18:31Z eric $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Paul Mattal <paul@archlinux.org> - -pkgname=qiv -pkgver=2.2.4 -pkgrel=2 -pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer" -arch=('i686' 'x86_64') -url="http://spiegl.de/qiv/" -license=('GPL2') -depends=('file' 'gtk2' 'imlib2') -source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz) -md5sums=('1425f89c90f9c045858fccf24d894c97') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - install -D -m 0755 qiv "$pkgdir/usr/bin/qiv" - install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1" -} diff --git a/staging/qrencode/PKGBUILD b/staging/qrencode/PKGBUILD deleted file mode 100644 index cfa810614..000000000 --- a/staging/qrencode/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 146830 2012-01-18 19:53:58Z bluewind $ -# Maintainer: Florian Pritz< flo@xinu.at> -# Contributor: Dany Martineau <dany.luc.martineau@gmail.com> - -pkgname=qrencode -pkgver=3.2.0 -pkgrel=2 -pkgdesc="C library for encoding data in a QR Code symbol." -arch=(i686 x86_64) -depends=('libpng>=1.5.0') -makedepends=(sdl) -url="http://megaui.net/fukuchi/works/qrencode/index.en.html" -license=('GPL') -options=(!libtool) -source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7e90615eb314abcd2eb2eab5c8155b97') - -build() { - cd "${srcdir}/$pkgname-$pkgver" -# autoreconf - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - - make prefix="$pkgdir/usr" install -} diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD deleted file mode 100644 index 24ae69a78..000000000 --- a/staging/qt/PKGBUILD +++ /dev/null @@ -1,126 +0,0 @@ -# $Id: PKGBUILD 146853 2012-01-18 20:54:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=qt -pkgname=('qt' 'qt-private-headers') -pkgver=4.8.0 -pkgrel=3 -arch=('i686' 'x86_64') -url='http://qt-project.org/' -license=('GPL3' 'LGPL') -makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' - 'mysql' 'unixodbc' 'cups' 'gtk2') -options=('!libtool') -_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" -source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop') -md5sums=('e8a5fdbeba2927c948d9f477a6abe904' - 'fc211414130ab2764132e7370f8e5caa' - '85179f5e0437514f8639957e1d8baf62' - 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd') - -build() { - cd "${srcdir}"/${_pkgfqn} - - export QT4DIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - - sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf - sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf - - ./configure -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ - -system-sqlite \ - -no-phonon \ - -no-phonon-backend \ - -no-webkit \ - -graphicssystem raster \ - -openssl-linked \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -silent \ - -no-rpath \ - -optimized-qmake \ - -reduce-relocations \ - -dbus-linked \ - -no-openvg - make -} - -package_qt() { - pkgdesc='A cross-platform application and UI framework' - depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') - optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') - install='qt.install' - - cd "${srcdir}"/${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install - - # install missing icons and desktop files - for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -D -m644 ${icon} \ - "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" - done - install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" - install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ - "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" - install -p -D -m644 tools/designer/src/designer/images/designer.png \ - "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" - install -d "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ - "${pkgdir}/usr/share/applications/" - - # install license addition - install -D -m644 LGPL_EXCEPTION.txt \ - ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt - - # Fix wrong path in pkgconfig files - find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - - # Fix wrong path in prl files - find "${pkgdir}/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; -} - -package_qt-private-headers(){ - pkgdesc="Qt private headers for development" - depends=("qt=${pkgver}") - - install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} - install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} - - for i in QtCore QtDeclarative QtGui QtScript; do - cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ - "${pkgdir}"/usr/include/${i}/ - done - - for i in corelib declarative gui script; do - cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ - done -} diff --git a/staging/qt/assistant.desktop b/staging/qt/assistant.desktop deleted file mode 100644 index a9e98c44b..000000000 --- a/staging/qt/assistant.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt Assistant -Comment=Shows Qt documentation and examples -Exec=/usr/bin/assistant -Icon=assistant -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development;Documentation; diff --git a/staging/qt/designer.desktop b/staging/qt/designer.desktop deleted file mode 100644 index 9b7b6e9aa..000000000 --- a/staging/qt/designer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Qt Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt applications -Exec=/usr/bin/designer -Icon=designer -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/staging/qt/linguist.desktop b/staging/qt/linguist.desktop deleted file mode 100644 index 8cbe86599..000000000 --- a/staging/qt/linguist.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt Linguist -Comment=Add translations to Qt applications -Exec=/usr/bin/linguist -Icon=linguist -MimeType=text/vnd.trolltech.linguist;application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/staging/qt/qt.install b/staging/qt/qt.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/staging/qt/qt.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/staging/qt/qtconfig.desktop b/staging/qt/qtconfig.desktop deleted file mode 100644 index 46dcf9e3d..000000000 --- a/staging/qt/qtconfig.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt Config -Comment=Configure Qt behavior, styles, fonts -Exec=/usr/bin/qtconfig -Icon=qtlogo -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; -NoDisplay=true diff --git a/staging/qt3/PKGBUILD b/staging/qt3/PKGBUILD deleted file mode 100644 index 57b052598..000000000 --- a/staging/qt3/PKGBUILD +++ /dev/null @@ -1,133 +0,0 @@ -# $Id: PKGBUILD 146911 2012-01-19 05:18:20Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=qt3 -pkgver=3.3.8 -pkgrel=22 -pkgdesc="The QT3 gui toolkit" -arch=('i686' 'x86_64') -url="http://www.trolltech.com/products/qt/index.html" -license=('GPL') -depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft' - 'libxrandr' 'libmng') -makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3') -optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') -options=('!libtool') -install=qt.install -source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2 - qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 - qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff - mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) -sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' - 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' - '3d19510c46016a1a211d97bf8f82b01498b1b33c' - '9cb2e5bec782069692ee337cfa171539d9d73753' - '116afa0e737bdf27ea27f9b3653aeb56db9ec151' - 'ca5ecb29c7f1c826d48703339a3371038e306bb7' - 'd928ff55adb52c4bab2fb268df022651551cd70c' - 'bb6aad81cce143c23ff7840b1d79f6b2007a0c04' - '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' - '1346320614f6f86fbeb10b9fbad721dea29f5b61' - 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') - -# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ -# other qt-patches come from fedora and gentoo - -build() { - unset QMAKESPEC - export QTDIR="${srcdir}"/qt-x11-free-${pkgver} - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - cd "${srcdir}"/qt-x11-free-${pkgver} - # apply qt patches from kde.org - for i in ../qt-copy-kde-patches/*; do - patch -Np0 -i $i - done - # apply other qt patches and one security fix from debian/gentoo - for i in ../qt-patches/*; do - patch -Np1 -i $i - done - # fix utf8 bug - patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff - # fix asia fonts - patch -p0 -i "${srcdir}"/qt-font-default-subst.diff - # fix segfaults on exit when using mysql DB driver - patch -p0 -i "${srcdir}"/mysql.patch - # fix CJK font/chars select error (FS#11245) - patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff - # fix build problem against new unixODBC - patch -p1 -i "${srcdir}"/qt-odbc.patch - # fix build with gcc 4.6.0 - patch -p1 -i "${srcdir}"/gcc-4.6.patch - - patch -p0 -i "${srcdir}"/qt3-png15.patch - # start compiling qt - sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix - rm -rf doc/html examples tutorial - sed -i "s|sub-tutorial sub-examples||" Makefile - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf - sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix - sed -i "s|read acceptance|acceptance=yes|" configure - - # remove unwanted mkspecs - rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - - if [ "$CARCH" = "x86_64" ]; then - export ARCH="-64" - else unset ARCH - fi - - ./configure -prefix /opt/qt \ - -platform linux-g++$ARCH \ - -system-zlib \ - -qt-gif \ - -release \ - -shared \ - -sm \ - -nis \ - -thread \ - -stl \ - -system-lib{png,jpeg,mng} \ - -no-g++-exceptions \ - -plugin-sql-{mysql,psql,sqlite,odbc} - - # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile - - cd "${srcdir}"/qt-x11-free-${pkgver} - make -C qmake - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro - - cd "${srcdir}"/qt-x11-free-${pkgver} - # fix the broken makefiles - #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - make -} - -package() { - cd "${srcdir}"/qt-x11-free-${pkgver} - make INSTALL_ROOT="${pkgdir}" install - rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} - sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl - install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake - install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh - ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config - rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH - - # install man pages - install -d -m755 "${pkgdir}"/opt/qt/man - cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ - - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf -} diff --git a/staging/qt3/eastern_asian_languagues.diff b/staging/qt3/eastern_asian_languagues.diff deleted file mode 100644 index 7c25eef7d..000000000 --- a/staging/qt3/eastern_asian_languagues.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 -+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 -@@ -966,20 +966,22 @@ - - #ifdef Q_WS_X11 - if (script == QFont::Han) { -- // modify script according to locale -- static QFont::Script defaultHan = QFont::UnknownScript; -- if (defaultHan == QFont::UnknownScript) { -- QCString locale = setlocale(LC_ALL, NULL); -- if (locale.contains("ko")) -- defaultHan = QFont::Han_Korean; -- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -- defaultHan = QFont::Han_TraditionalChinese; -- else if (locale.contains("zh")) -- defaultHan = QFont::Han_SimplifiedChinese; -- else -- defaultHan = QFont::Han_Japanese; -- } -- script = defaultHan; -+ // modify script according to locale -+ static QFont::Script defaultHan; -+ QCString locale = setlocale(LC_ALL, NULL); -+ -+ if (locale.contains("ko")) -+ defaultHan = QFont::Han_Korean; -+ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -+ defaultHan = QFont::Han_TraditionalChinese; -+ else if (locale.contains("zh")) -+ defaultHan = QFont::Han_SimplifiedChinese; -+ else if (locale.contains("ja")) -+ defaultHan = QFont::Han_Japanese; -+ else -+ defaultHan = QFont::Han; // don't change -+ -+ script = defaultHan; - } - #endif - diff --git a/staging/qt3/gcc-4.6.patch b/staging/qt3/gcc-4.6.patch deleted file mode 100644 index bcbffcea6..000000000 --- a/staging/qt3/gcc-4.6.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h ---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 -@@ -49,6 +49,7 @@ - #include "qvaluelist.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <map> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 -@@ -47,6 +47,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <list> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h ---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 -@@ -45,6 +45,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <vector> - #endif diff --git a/staging/qt3/mysql.patch b/staging/qt3/mysql.patch deleted file mode 100644 index 5f61edc67..000000000 --- a/staging/qt3/mysql.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- src/sql/drivers/mysql/qsql_mysql.cpp -+++ src/sql/drivers/mysql/qsql_mysql.cpp -@@ -37,7 +37,6 @@ - #include "qsql_mysql.h" - #include <private/qsqlextension_p.h> - --#include <qapplication.h> - #include <qdatetime.h> - #include <qvaluevector.h> - #include <qsqlrecord.h> -@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() - } - - ///////////////////////////////////////////////////////// --static void qServerEnd() --{ --#ifndef Q_NO_MYSQL_EMBEDDED --# if MYSQL_VERSION_ID >= 40000 -- mysql_server_end(); --# endif // MYSQL_VERSION_ID --#endif // Q_NO_MYSQL_EMBEDDED --} - - static void qServerInit() - { -@@ -366,9 +357,7 @@ static void qServerInit() - qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); - # endif - } -- qAddPostRoutine(qServerEnd); - init = TRUE; -- - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED - } -@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() - QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); - delete ext; - } -+#ifndef Q_NO_MYSQL_EMBEDDED -+# if MYSQL_VERSION_ID > 40000 -+ mysql_server_end(); -+# endif -+#endif - } - - bool QMYSQLDriver::hasFeature( DriverFeature f ) const diff --git a/staging/qt3/qt-copy-kde-patches.tar.bz2 b/staging/qt3/qt-copy-kde-patches.tar.bz2 Binary files differdeleted file mode 100644 index 19d899963..000000000 --- a/staging/qt3/qt-copy-kde-patches.tar.bz2 +++ /dev/null diff --git a/staging/qt3/qt-font-default-subst.diff b/staging/qt3/qt-font-default-subst.diff deleted file mode 100644 index 3e286f74e..000000000 --- a/staging/qt3/qt-font-default-subst.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- src/kernel/qfontdatabase_x11.cpp -+++ src/kernel/qfontdatabase_x11.cpp -@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese){ -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } -@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c - FcPatternPrint(pattern); - #endif - -+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use -+ // FcFontMatch/Sort here we have to do it manually. - FcConfigSubstitute(0, pattern, FcMatchPattern); -+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); -+ - // qDebug("1: pattern contains:"); - // FcPatternPrint(pattern); - -@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c - value.u.s = (const FcChar8 *)cs.data(); - FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); - } --#ifdef FONT_MATCH_DEBUG -- printf("final pattern contains:\n"); -- FcPatternPrint(pattern); --#endif - } - - if (script != QFont::Unicode) { -@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese) { -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } - -+#ifdef FONT_MATCH_DEBUG -+ printf("final pattern contains:\n"); -+ FcPatternPrint(pattern); -+#endif -+ - QFontEngine *fe = 0; - - for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { ---- src/kernel/qfontdatabase.cpp -+++ src/kernel/qfontdatabase.cpp -@@ -554,7 +554,7 @@ static const unsigned short sample_chars - // GeometricSymbols, - { 0x2500, 0x0 }, - // MiscellaneousSymbols, -- { 0x2640, 0x0 }, -+ { 0x2640, 0x2714, 0x0 }, - // EnclosedAndSquare, - { 0x2460, 0x0 }, - // Braille, diff --git a/staging/qt3/qt-odbc.patch b/staging/qt3/qt-odbc.patch deleted file mode 100644 index 6f21e3cf1..000000000 --- a/staging/qt3/qt-odbc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 -+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 -@@ -57,13 +57,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER diff --git a/staging/qt3/qt-patches.tar.bz2 b/staging/qt3/qt-patches.tar.bz2 Binary files differdeleted file mode 100644 index 3f4aee171..000000000 --- a/staging/qt3/qt-patches.tar.bz2 +++ /dev/null diff --git a/staging/qt3/qt.install b/staging/qt3/qt.install deleted file mode 100644 index 6d042daae..000000000 --- a/staging/qt3/qt.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf -} diff --git a/staging/qt3/qt.profile b/staging/qt3/qt.profile deleted file mode 100644 index ed4d232ae..000000000 --- a/staging/qt3/qt.profile +++ /dev/null @@ -1,4 +0,0 @@ -export QTDIR=/opt/qt -export QT_XFT=true -export PATH=$PATH:$QTDIR/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig diff --git a/staging/qt3/qt3-png15.patch b/staging/qt3/qt3-png15.patch deleted file mode 100644 index e64fea36a..000000000 --- a/staging/qt3/qt3-png15.patch +++ /dev/null @@ -1,212 +0,0 @@ -$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ - ---- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 -+++ src/kernel/qpngio.cpp -@@ -43,6 +43,7 @@ - #include "qiodevice.h" - - #include <png.h> -+#include <zlib.h> - - - #ifdef Q_OS_TEMP -@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - 0, 0, 0); - -+ png_colorp info_ptr_palette = NULL; -+ int info_ptr_num_palette = 0; -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); -+ } -+ -+ png_bytep info_ptr_trans_alpha = NULL; -+ int info_ptr_num_trans = 0; -+ png_color_16p info_ptr_trans_color = NULL; -+ -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { -+ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); -+ } -+ -+ - if ( color_type == PNG_COLOR_TYPE_GRAY ) { - // Black & White or 8-bit grayscale -- if ( bit_depth == 1 && info_ptr->channels == 1 ) { -+ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { - png_set_invert_mono( png_ptr ); - png_read_update_info( png_ptr, info_ptr ); - if (!image.create( width, height, 1, 2, QImage::BigEndian )) -@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { -- const int g = info_ptr->trans_values.gray; -+ const int g = info_ptr_trans_color->gray; - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct - } - } else if ( color_type == PNG_COLOR_TYPE_PALETTE - && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) -- && info_ptr->num_palette <= 256 ) -+ && info_ptr_num_palette <= 256 ) - { - // 1-bit and 8-bit color - if ( bit_depth != 1 ) -@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct - png_read_update_info( png_ptr, info_ptr ); - png_get_IHDR(png_ptr, info_ptr, - &width, &height, &bit_depth, &color_type, 0, 0, 0); -- if (!image.create(width, height, bit_depth, info_ptr->num_palette, -+ if (!image.create(width, height, bit_depth, info_ptr_num_palette, - QImage::BigEndian)) - return; - int i = 0; - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { - image.setAlphaBuffer( TRUE ); -- while ( i < info_ptr->num_trans ) { -+ while ( i < info_ptr_num_trans ) { - image.setColor(i, qRgba( -- info_ptr->palette[i].red, -- info_ptr->palette[i].green, -- info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, -+ info_ptr_trans_alpha[i] - ) - ); - i++; - } - } -- while ( i < info_ptr->num_palette ) { -+ while ( i < info_ptr_num_palette ) { - image.setColor(i, qRgba( -- info_ptr->palette[i].red, -- info_ptr->palette[i].green, -- info_ptr->palette[i].blue, -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, - 0xff - ) - ); -@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) - return; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - iio->setStatus(-4); - return; -@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q - return FALSE; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return FALSE; - } -@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q - - png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); - -+#warning XXXtnn not too sure about this -+/* -+according to png.h, channels is only used on read, not writes, so we -+should be able to comment this out. -+ - info_ptr->channels = - (image.depth() == 32) - ? (image.hasAlphaBuffer() ? 4 : 3) - : 1; -+*/ - - png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), - image.depth() == 1 ? 1 : 8 /* per channel */, -@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q - : PNG_COLOR_TYPE_RGB - : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); - -+ png_color_8 sig_bit; -+ sig_bit.red = 8; -+ sig_bit.green = 8; -+ sig_bit.blue = 8; -+ png_set_sBIT(png_ptr, info_ptr, &sig_bit); - -- //png_set_sBIT(png_ptr, info_ptr, 8); -- info_ptr->sig_bit.red = 8; -- info_ptr->sig_bit.green = 8; -- info_ptr->sig_bit.blue = 8; - - if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) - png_set_packswap(png_ptr); -@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q - png_set_PLTE(png_ptr, info_ptr, palette, num_palette); - int* trans = new int[num_palette]; - int num_trans = 0; -+ png_colorp info_ptr_palette = NULL; -+ int tmp; -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); - for (int i=0; i<num_palette; i++) { - QRgb rgb=image.color(i); -- info_ptr->palette[i].red = qRed(rgb); -- info_ptr->palette[i].green = qGreen(rgb); -- info_ptr->palette[i].blue = qBlue(rgb); -+ info_ptr_palette[i].red = qRed(rgb); -+ info_ptr_palette[i].green = qGreen(rgb); -+ info_ptr_palette[i].blue = qBlue(rgb); - if (image.hasAlphaBuffer()) { - trans[i] = rgb >> 24; - if (trans[i] < 255) { -@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q - } - } - } -+ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); - if (num_trans) { - copy_trans = new png_byte[num_trans]; - for (int i=0; i<num_trans; i++) -@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q - } - - if ( image.hasAlphaBuffer() ) { -- info_ptr->sig_bit.alpha = 8; -+ png_color_8p sig_bit; -+ png_get_sBIT(png_ptr, info_ptr, &sig_bit); -+ sig_bit->alpha = 8; -+ png_set_sBIT(png_ptr, info_ptr, sig_bit); - } - - // Swap ARGB to RGBA (normal PNG format) before saving on -@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma - return -1; - } - -- if (setjmp((png_ptr)->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - return -1; -@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma - - if ( !png_ptr ) return 0; - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - state = MovieStart; -@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn - consumer->frameDone(QPoint(offx,offy),r); - consumer->end(); - state = FrameStart; -- unused_data = (int)png->buffer_size; // Since libpng doesn't tell us -+ unused_data = png_process_data_pause(png, 0); - } - - #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/staging/qt3/utf8-bug-qt3.diff b/staging/qt3/utf8-bug-qt3.diff deleted file mode 100644 index 43e84a99f..000000000 --- a/staging/qt3/utf8-bug-qt3.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- src/codecs/qutfcodec.cpp -+++ src/codecs/qutfcodec.cpp -@@ -154,6 +154,7 @@ - - class QUtf8Decoder : public QTextDecoder { - uint uc; -+ uint min_uc; - int need; - bool headerDone; - public: -@@ -167,8 +168,9 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uchar ch; -+ int error = -1; - for (int i=0; i<len; i++) { -- ch = *chars++; -+ ch = chars[i]; - if (need) { - if ( (ch&0xc0) == 0x80 ) { - uc = (uc << 6) | (ch & 0x3f); -@@ -182,6 +184,8 @@ - *qch++ = QChar(high); - *qch++ = QChar(low); - headerDone = TRUE; -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ *qch++ = QChar::replacement; - } else { - if (headerDone || QChar(uc) != QChar::byteOrderMark) - *qch++ = uc; -@@ -190,6 +194,7 @@ - } - } else { - // error -+ i = error; - *qch++ = QChar::replacement; - need = 0; - } -@@ -200,12 +205,21 @@ - } else if ((ch & 0xe0) == 0xc0) { - uc = ch & 0x1f; - need = 1; -+ error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; -+ error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; -+ error = i; -+ min_uc = 0x10000; -+ } else { -+ // error -+ *qch++ = QChar::replacement; - } - } - } ---- src/tools/qstring.cpp -+++ src/tools/qstring.cpp -@@ -5805,6 +5805,7 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uint uc = 0; -+ uint min_uc = 0; - int need = 0; - int error = -1; - uchar ch; -@@ -5822,6 +5823,12 @@ - unsigned short low = uc%0x400 + 0xdc00; - *qch++ = QChar(high); - *qch++ = QChar(low); -+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // overlong seqence, UTF16 surrogate or BOM -+ i = error; -+ qch = addOne(qch, result); -+ *qch++ = QChar(0xdbff); -+ *qch++ = QChar(0xde00+((uchar)utf8[i])); - } else { - *qch++ = uc; - } -@@ -5844,14 +5851,17 @@ - uc = ch & 0x1f; - need = 1; - error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; - error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; - error = i; -+ min_uc = 0x10000; - } else { - // Error - qch = addOne(qch, result); diff --git a/staging/qtiplot/PKGBUILD b/staging/qtiplot/PKGBUILD deleted file mode 100644 index 63ca7eeb9..000000000 --- a/staging/qtiplot/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# $Id: PKGBUILD 148020 2012-01-30 01:36:28Z eric $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: damir <damir.archlinux.org> -# Contributor: Gergely Imreh <imrehg@gmail.com> - -pkgname=qtiplot -pkgver=0.9.8.8 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://soft.proindependent.com/qtiplot.html" -pkgdesc="Data analysis and scientific plotting - free clone of Origin" -depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') -# build against qwtplot3d provided in the package ... -# build against qwt provided in the package ... -# as systemwide one doesn't provide all needed functions -makedepends=('pkg-config' 'boost') -license=('GPL2') -install=${pkgname}.install -source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 - $pkgname.desktop - $pkgname.png - build.conf.archlinux - qwtplot3d_gcc.patch - qtiplot.xml - qtiplot-0.9.8.6-gold.patch - qtiplot-0.9.8.6-kde.patch - qtiplot-0.9.8.6-tamuanova.patch - qwtplot3d-qt-4.8.0.patch - qwtplot3d-libpng15.patch) -sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48' - '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' - '4301cb2a36024a10108b689990d28c4fe5c7416e' - '326ee6bc623a637d058ab7ee9f65fede40a23a09' - '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' - '285f57d865956d93250ec548288c5bface096b6b' - 'b534a609f317cf3117d6495909854cdacea20124' - 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975' - '830b518e3ef63625df84363a8047417124f243b0' - '3d4c471dda29a04d432f8e0a4c5b977068cdae72' - '4a45ee21f028f34da75d83c0d3e1d08c5f928892') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # gentoo fixes - patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch" - patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch" -# patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch" - - # build also static qwtplot3d lib - echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro - - # install build configuration file - install -Dm644 "${srcdir}/build.conf.archlinux" build.conf - - # Make qwt - sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp - patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch" - cd ./3rdparty/qwt - qmake - make - - # Make qwtplot3d - cd ../qwtplot3d - patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch" - patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch" - qmake - make - - # Make qtiplot - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - - # fix stuff - sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro - sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp - sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp - - qmake qtiplot.pro QMAKESPEC=linux-g++ - make QTDIR=/usr/ QMAKESPEC=linux-g++ -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - - INSTALL_ROOT="${pkgdir}" make install - - # make it nice: - install -D -m644 "${srcdir}/${pkgname}.png" \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -D -m644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 "${srcdir}/${pkgname}.xml" \ - "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" -} - - diff --git a/staging/qtiplot/build.conf.archlinux b/staging/qtiplot/build.conf.archlinux deleted file mode 100644 index 7ccded7fa..000000000 --- a/staging/qtiplot/build.conf.archlinux +++ /dev/null @@ -1,32 +0,0 @@ -isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) -} - -SYS_INCLUDEPATH = /usr/include -SYS_LIBS = -L/usr/lib -lGLU - -MUPARSER_LIBS = -lmuparser -GSL_LIBS = -lgsl -lgslcblas -BOOST_INCLUDEPATH = /usr/include/boost -BOOST_LIBS = -lboost_date_time -lboost_thread -QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src -QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a -QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include -QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a -LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 -LIB_ORIGIN_LIBS = -lorigin2 -QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine -TAMUANOVA_LIBS = -ltamuanova -TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova -LIBPNG_LIBS = -lpng - -PYTHON = python2 -LUPDATE = lupdate -LRELEASE = lrelease - -SCRIPTING_LANGS += muParser -SCRIPTING_LANGS += Python - -CONFIG += CustomInstall -DEFINES += SCRIPTING_CONSOLE - diff --git a/staging/qtiplot/qtiplot-0.9.8.6-gold.patch b/staging/qtiplot/qtiplot-0.9.8.6-gold.patch deleted file mode 100644 index 3b6757533..000000000 --- a/staging/qtiplot/qtiplot-0.9.8.6-gold.patch +++ /dev/null @@ -1,15 +0,0 @@ - qtiplot/qtiplot.pro | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 99e0e36..b7cf373 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS - LIBS += $$QWT_LIBS - LIBS += $$QWT3D_LIBS - LIBS += $$GSL_LIBS -+LIBS += -lz - - ############################################################################# - ###################### BASIC PROJECT PROPERTIES ############################# diff --git a/staging/qtiplot/qtiplot-0.9.8.6-kde.patch b/staging/qtiplot/qtiplot-0.9.8.6-kde.patch deleted file mode 100644 index 919ec6cc2..000000000 --- a/staging/qtiplot/qtiplot-0.9.8.6-kde.patch +++ /dev/null @@ -1,15 +0,0 @@ - qtiplot/src/plot2D/Graph.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp -index 626172a..d4eab1b 100755 ---- a/qtiplot/src/plot2D/Graph.cpp -+++ b/qtiplot/src/plot2D/Graph.cpp -@@ -73,6 +73,7 @@ - #include <PatternBox.h> - #include <SymbolBox.h> - -+#include <QPaintEngine> - #include <QApplication> - #include <QBitmap> - #include <QClipboard> diff --git a/staging/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/staging/qtiplot/qtiplot-0.9.8.6-tamuanova.patch deleted file mode 100644 index 1644266d1..000000000 --- a/staging/qtiplot/qtiplot-0.9.8.6-tamuanova.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 95a5f0c..72e99ab 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { - !isEmpty(TAMUANOVA_LIBS) { - DEFINES += HAVE_TAMUANOVA - INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH -- #LIBS += $$TAMUANOVA_LIBS -- -- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c -+ LIBS += $$TAMUANOVA_LIBS - } - - ############################################################### - - # At the very end: add global include- and lib path --#unix:INCLUDEPATH += $$SYS_INCLUDEPATH --#unix:LIBS += $$SYS_LIBS -+unix:INCLUDEPATH += $$SYS_INCLUDEPATH -+unix:LIBS += $$SYS_LIBS - - ############################################################### - ############### Building QtiPlot as a browser plugin ########## diff --git a/staging/qtiplot/qtiplot.desktop b/staging/qtiplot/qtiplot.desktop deleted file mode 100644 index ab64b3852..000000000 --- a/staging/qtiplot/qtiplot.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Exec=qtiplot -Comment=An application for plotting and analysis of data sets and functions -Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen -Terminal=false -Name=QtiPlot -Protocols=file -Icon=/usr/share/pixmaps/qtiplot.png -# Categories=QT;KDE;Science;Utility;X-KDE-More -# Categories=Qt;KDE;Math;Education -Categories=Science;X-Plotting; diff --git a/staging/qtiplot/qtiplot.install b/staging/qtiplot/qtiplot.install deleted file mode 100644 index 66631520d..000000000 --- a/staging/qtiplot/qtiplot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove () { - post_install -} - diff --git a/staging/qtiplot/qtiplot.png b/staging/qtiplot/qtiplot.png Binary files differdeleted file mode 100644 index 5b4b87b21..000000000 --- a/staging/qtiplot/qtiplot.png +++ /dev/null diff --git a/staging/qtiplot/qtiplot.xml b/staging/qtiplot/qtiplot.xml deleted file mode 100644 index 7ad4c4aa0..000000000 --- a/staging/qtiplot/qtiplot.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-qtiplot-project"> - <sub-class-of type="text/plain"/> - <comment>QtiPlot project file</comment> - <glob pattern="*.qti" /> - </mime-type> - <mime-type type="application/x-qtiplot-project-compressed"> - <comment>Compressed QtiPlot project file</comment> - <glob pattern="*.qti.gz" /> - </mime-type> - <mime-type type="application/x-qtiplot-project-backup"> - <sub-class-of type="text/plain"/> - <comment>QtiPlot project file backup</comment> - <glob pattern="*.qti~" /> - </mime-type> -</mime-info> diff --git a/staging/qtiplot/qwtplot3d-libpng15.patch b/staging/qtiplot/qwtplot3d-libpng15.patch deleted file mode 100644 index 828f0c6d8..000000000 --- a/staging/qtiplot/qwtplot3d-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500 -+++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500 -@@ -47,6 +47,7 @@ - #endif - - #if defined(GL2PS_HAVE_LIBPNG) -+#include <zlib.h> - #include <png.h> - #endif - diff --git a/staging/qtiplot/qwtplot3d-qt-4.8.0.patch b/staging/qtiplot/qwtplot3d-qt-4.8.0.patch deleted file mode 100644 index 9d30f6b7b..000000000 --- a/staging/qtiplot/qwtplot3d-qt-4.8.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h ---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:42:01.000000000 -0500 -+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:58:30.000000000 -0500 -@@ -2,12 +2,7 @@ - #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code - - #include <time.h> -- --#if QT_VERSION < 0x040000 --#include <qgl.h> --#else --#include <QtOpenGL/qgl.h> --#endif -+#include <QtOpenGL> - - #include "qwt3d_types.h" - #include "qwt3d_io.h" -diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h ---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:42:01.000000000 -0500 -+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:57:21.000000000 -0500 -@@ -2,11 +2,8 @@ - #define __openglhelper_2003_06_06_15_49__ - - #include "qglobal.h" --#if QT_VERSION < 0x040000 --#include <qgl.h> --#else --#include <QtOpenGL/qgl.h> --#endif -+#include <QtOpenGL> -+#include <GL/glu.h> - - namespace Qwt3D - { diff --git a/staging/qtiplot/qwtplot3d_gcc.patch b/staging/qtiplot/qwtplot3d_gcc.patch deleted file mode 100644 index 06aeb50f5..000000000 --- a/staging/qtiplot/qwtplot3d_gcc.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700 -+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700 -@@ -1,5 +1,6 @@ - #include "qwt3d_surfaceplot.h" - #include "qwt3d_function.h" -+#include <cstdio> - - using namespace Qwt3D; - diff --git a/staging/qtiplot/sip.patch b/staging/qtiplot/sip.patch deleted file mode 100644 index 146f4c277..000000000 --- a/staging/qtiplot/sip.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- qtiplot/src/scripting/scripting.pri.bak 2009-09-09 07:18:51.000000000 +0800 -+++ qtiplot/src/scripting/scripting.pri 2009-11-08 12:45:03.000000000 +0800 -@@ -80,7 +80,9 @@ - $${SIP_DIR}/sipqtiPythonScript.cpp\
- $${SIP_DIR}/sipqtiPythonScripting.cpp\
- $${SIP_DIR}/sipqtiFolder.cpp\
-- $${SIP_DIR}/sipqtiQList.cpp\
-+ $${SIP_DIR}/sipqtiQList0101Folder.cpp \
-+ $${SIP_DIR}/sipqtiQList0101Graph.cpp \
-+ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp \
- $${SIP_DIR}/sipqtiFit.cpp \
- $${SIP_DIR}/sipqtiExponentialFit.cpp \
- $${SIP_DIR}/sipqtiTwoExpFit.cpp \
diff --git a/staging/r/PKGBUILD b/staging/r/PKGBUILD deleted file mode 100644 index 835723982..000000000 --- a/staging/r/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 147684 2012-01-27 00:28:38Z eric $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: K. Piche <kpiche@rogers.com> - -pkgname=r -pkgver=2.14.0 -pkgrel=2 -pkgdesc="Language and environment for statistical computing and graphics" -arch=('i686' 'x86_64') -license=('GPL') -url=('http://www.r-project.org/') -depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' - 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'tk' 'libxt' 'libxmu' 'pango' 'xz') -makedepends=('openjdk6' 'gcc-fortran') -backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') -options=('!makeflags') -source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" - 'r.desktop' - 'r.png') -install=r.install -sha1sums=('0f46bf75a7c150350b1142c29a98e7994d2b4bef' - '13aa29219bcaa102e575de8c1c8e0833d233e836' - 'a69a07ec363440efc18ce0a7f2af103375dea978') - -build() { - cd "${srcdir}/R-${pkgver}" - sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --sysconfdir=/etc/R \ - --datarootdir=/usr/share \ - rsharedir=/usr/share/R/ \ - rincludedir=/usr/include/R/ \ - rdocdir=/usr/share/doc/R/ \ - --with-x \ - --enable-R-shlib \ - --with-lapack \ - --with-blas \ - F77=gfortran \ - LIBnn=lib - make -} - -package() { - cd "${srcdir}/R-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install - - # Fixup R wrapper scripts. - sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R" - rm "${pkgdir}/usr/lib/R/bin/R" - cd "${pkgdir}/usr/lib/R/bin" - ln -s ../../../bin/R - - # install some freedesktop.org compatibility - install -Dm644 "${srcdir}/r.desktop" \ - "${pkgdir}/usr/share/applications/r.desktop" - install -Dm644 "${srcdir}/r.png" \ - "${pkgdir}/usr/share/pixmaps/r.png" - - # move the config directory to /etc and create symlinks - install -d "${pkgdir}/etc/R" - cd "${pkgdir}/usr/lib/R/etc" - for i in *; do - mv -f ${i} "${pkgdir}/etc/R" - ln -s /etc/R/${i} ${i} - done -} diff --git a/staging/r/r.desktop b/staging/r/r.desktop deleted file mode 100644 index 68b49c447..000000000 --- a/staging/r/r.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=R -GenericName=environment for statistical computing -Comment=language and environment for statistical computing and graphics -Exec=R -Icon=/usr/share/pixmaps/r.png -DocPath=/usr/lib/R/doc/html/index.html -StartupNotify=true -Terminal=true -Type=Application -Categories=Education;Science;Math; diff --git a/staging/r/r.install b/staging/r/r.install deleted file mode 100644 index d3289ab64..000000000 --- a/staging/r/r.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/staging/r/r.png b/staging/r/r.png Binary files differdeleted file mode 100644 index 1303ccdb9..000000000 --- a/staging/r/r.png +++ /dev/null diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD deleted file mode 100644 index cac90d2da..000000000 --- a/staging/redland/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 145821 2012-01-02 11:29:29Z andrea $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Francois Charette <francois.archlinux.org> - -pkgbase=redland -epoch=1 -pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.15 -pkgrel=3 -url="http://librdf.org/" -license=("GPL") -arch=('i686' 'x86_64') -makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') -options=('!libtool') -source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} - rpath.diff) -sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af' - '3aeef38a7247ae33db6a0a19511ef4132240164b' - 'f5db05c925b6bcd6402d5abd75c648b137f069c7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-release \ - --disable-static \ - --with-raptor=system \ - --with-rasqal=system \ - --with-sqlite=3 - - # nuke rpath - patch -Np0 -i "${srcdir}/rpath.diff" - - make -} - -package_redland() { - pkgdesc="Library that provides a high-level interface to RDF data" - depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/usr/lib/redland" -} - -package_redland-storage-mysql() { - pkgdesc="MySQL storage support for Redland" - depends=('redland' 'libmysqlclient') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -dm755 "${pkgdir}/usr/lib/redland" - install -m755 src/.libs/librdf_storage_mysql.so "${pkgdir}/usr/lib/redland/librdf_storage_mysql.so" -} - -package_redland-storage-postgresql() { - pkgdesc="PostgreSQL storage support for Redland" - depends=('redland' 'postgresql-libs') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -dm755 "${pkgdir}/usr/lib/redland" - install -m755 src/.libs/librdf_storage_postgresql.so "${pkgdir}/usr/lib/redland/" -} - -package_redland-storage-virtuoso() { - pkgdesc="Virtuoso storage support for Redland" - depends=('redland' 'unixodbc' 'db') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -dm755 "${pkgdir}/usr/lib/redland" - install -m755 src/.libs/librdf_storage_virtuoso.so "${pkgdir}/usr/lib/redland/" -} - -package_redland-storage-sqlite() { - pkgdesc="SQLite storage support for Redland" - depends=('redland' 'sqlite3' 'db') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -dm755 "${pkgdir}/usr/lib/redland" - install -m755 src/.libs/librdf_storage_sqlite.so "${pkgdir}/usr/lib/redland/" -} diff --git a/staging/redland/rpath.diff b/staging/redland/rpath.diff deleted file mode 100644 index 831bc80ed..000000000 --- a/staging/redland/rpath.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- libtool 2011-02-20 10:46:47.000000000 +0100 -+++ libtool.new 2011-02-20 10:52:58.285764909 +0100 -@@ -324,7 +324,7 @@ - - # Flag to hardcode $libdir into a binary during linking. - # This must work even if $libdir does not exist --hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" -+hardcode_libdir_flag_spec=" " - - # If ld is used when linking, flag to hardcode $libdir into a binary - # during linking. This must work even if $libdir does not exist. diff --git a/staging/rrdtool/PKGBUILD b/staging/rrdtool/PKGBUILD deleted file mode 100644 index ec9476a0b..000000000 --- a/staging/rrdtool/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 146899 2012-01-19 04:20:31Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=rrdtool -pkgver=1.4.5 -pkgrel=5 -pkgdesc="Data logging and graphing application" -arch=('i686' 'x86_64') -url="http://www.rrdtool.org" -license=('GPL' 'custom') -depends=('libxml2' 'pango' 'ttf-dejavu') -makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') -optdepends=('tcl: to use corresponding binding' \ - 'python2: to use corresponding binding' \ - 'ruby: to use corresponding binding' \ - 'lua: to use corresponding binding') -options=('!libtool' '!emptydirs' '!makeflags') -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL - PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ - --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ - --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/ruby/PKGBUILD b/staging/ruby/PKGBUILD deleted file mode 100644 index 702406e58..000000000 --- a/staging/ruby/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 145849 2012-01-03 02:35:43Z eric $ -# Maintainer: -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: Jeramy Rutley <jrutley@gmail.com> - -pkgbase=ruby -pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p0 -pkgrel=3 -pkgdesc="An object-oriented language for quick and easy programming" -arch=('i686' 'x86_64') -url="http://www.ruby-lang.org/en/" -license=('BSD' 'custom') -makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') -options=('!emptydirs' '!makeflags') -source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) -sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-shared --enable-pthread --disable-rpath - make -} - -package_ruby() { - depends=('openssl' 'libffi' 'libyaml') - provides=('rubygems' 'rake') - conflicts=('rake') - optdepends=('tk: for Ruby/TK') - - cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - make DESTDIR="${pkgdir}" install-nodoc - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" -} - -package_ruby-docs() { - pkgdesc="Documentation files for ruby" - - cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - make DESTDIR="${pkgdir}" install-doc install-capi - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" -} diff --git a/staging/sane/PKGBUILD b/staging/sane/PKGBUILD deleted file mode 100644 index a5ea125be..000000000 --- a/staging/sane/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 147246 2012-01-25 02:31:45Z eric $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Simo L. <neotuli@yahoo.com> -# Contributor: eric <eric@archlinux.org> - -pkgname=sane -pkgver=1.0.22 -pkgrel=5 -pkgdesc="Scanner Access Now Easy" -url="http://www.sane-project.org/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') -makedepends=('texlive-latexextra') -install=$pkgname.install -backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) -source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz - 'sane.xinetd' - 'libv4l-0.8.3.patch' - 'xerox_mfp_fix_usb_devices.patch') -md5sums=('fadf56a60f4776bfb24491f66b617cf5' - 'da946cc36fb83612162cf9505986d4b2' - 'e645a8921cff9f18ffbdabb2ed885060' - 'cfef73e7db7c28308914d3db6767d852') -options=(!libtool) - -build() { - cd "${srcdir}/${pkgname}-backends-${pkgver}" - - patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch - # fix https://bugs.archlinux.org/task/26114 - patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-docdir=/usr/share/doc/sane \ - --enable-avahi \ - --disable-locking - make -} - -package () { - cd "${srcdir}/${pkgname}-backends-${pkgver}" - make DESTDIR="${pkgdir}" install - # fix hp officejets - echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" - # install udev files - install -D -m0644 tools/udev/libsane.rules \ - "${pkgdir}/lib/udev/rules.d/53-sane.rules" - # fix udev rules - sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules" - - # install xinetd file - install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" -} diff --git a/staging/sane/libv4l-0.8.3.patch b/staging/sane/libv4l-0.8.3.patch deleted file mode 100644 index 4e240e0cf..000000000 --- a/staging/sane/libv4l-0.8.3.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Mon, 14 Mar 2011 13:35:05 +0100 -Subject: [PATCH] patch: v4l - -Squashed commit of the following: - -commit 23381932c76846191b42a48e505b37cd74711265 -Author: Julien BLACHE <jb@jblache.org> -Date: Wed Feb 16 19:37:43 2011 +0100 - - Fix v4l build with libv4l 0.8.3+ - - (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) - - Conflicts: - - ChangeLog - - Signed-off-by: Nils Philippsen <nils@redhat.com> ---- - backend/v4l.c | 3 +-- - backend/v4l.h | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backend/v4l.c b/backend/v4l.c -index 6510ef0..38595ed 100644 ---- a/backend/v4l.c -+++ b/backend/v4l.c -@@ -84,9 +84,8 @@ - #include "../include/sane/sanei_config.h" - #define V4L_CONFIG_FILE "v4l.conf" - --#include "v4l.h" -- - #include <libv4l1.h> -+#include "v4l.h" - - static const SANE_Device **devlist = NULL; - static int num_devices; -diff --git a/backend/v4l.h b/backend/v4l.h -index 588b96e..6aee586 100644 ---- a/backend/v4l.h -+++ b/backend/v4l.h -@@ -29,6 +29,7 @@ - #ifndef v4l_h - #define v4l_h - -+#ifndef __LINUX_VIDEODEV_H - /* Kernel interface */ - /* Only the stuff we need. For more features, more defines are needed */ - -@@ -165,7 +166,7 @@ struct video_channel - - - /* end of kernel interface */ -- -+#endif /* !__LINUX_VIDEODEV_H */ - - #include <../include/sane/sane.h> - --- -1.7.4 - diff --git a/staging/sane/sane.install b/staging/sane/sane.install deleted file mode 100644 index 5ec361eea..000000000 --- a/staging/sane/sane.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'scanner' to use scanner devices. -THEEND -} diff --git a/staging/sane/sane.xinetd b/staging/sane/sane.xinetd deleted file mode 100644 index b035664b4..000000000 --- a/staging/sane/sane.xinetd +++ /dev/null @@ -1,11 +0,0 @@ -service sane-port -{ - port = 6566 - socket_type = stream - wait = no - user = root - group = scanner - server = /usr/sbin/saned - # disabled by default! - disable = yes - } diff --git a/staging/sane/xerox_mfp_fix_usb_devices.patch b/staging/sane/xerox_mfp_fix_usb_devices.patch deleted file mode 100644 index 5ed29b974..000000000 --- a/staging/sane/xerox_mfp_fix_usb_devices.patch +++ /dev/null @@ -1,67 +0,0 @@ -commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7 -Author: Alex Belkin <abc@telekom.ru> -Date: Tue Mar 8 17:57:19 2011 +0300 - - keep usb device by default (correct for bug introduced by tcp sub-backend - -diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c -index e08b50f..d4672a7 100644 ---- a/backend/xerox_mfp.c -+++ b/backend/xerox_mfp.c -@@ -37,10 +37,10 @@ - static const SANE_Device **devlist = NULL; /* sane_get_devices array */ - static struct device *devices_head = NULL; /* sane_get_devices list */ - --transport available_transports[] = { -+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX }; -+transport available_transports[TRANSPORTS_MAX] = { - { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device }, - { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device }, -- { 0 } - }; - - static int resolv_state(int state) -@@ -824,7 +824,13 @@ free_devices (void) - devices_head = NULL; - } - --/* SANE API ignores return code of this callback */ -+static transport *tr_from_devname(SANE_String_Const devname) -+{ -+ if (strncmp("tcp", devname, 3) == 0) -+ return &available_transports[TRANSPORT_TCP]; -+ return &available_transports[TRANSPORT_USB]; -+} -+ - static SANE_Status - list_one_device (SANE_String_Const devname) - { -@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname) - return SANE_STATUS_GOOD; - } - -- for (tr = available_transports; tr->ttype; tr++) { -- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) -- break; -- } -- if (!tr->ttype) -- return SANE_STATUS_INVAL; -+ tr = tr_from_devname(devname); - - dev = calloc (1, sizeof (struct device)); - if (dev == NULL) -@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname) - static SANE_Status - list_conf_devices (UNUSED (SANEI_Config * config), const char *devname) - { -- transport *tr; -- -- for (tr = available_transports; tr->ttype; tr++) { -- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) -- return tr->configure_device(devname, list_one_device); -- } -- return SANE_STATUS_INVAL; -+ return tr_from_devname(devname)->configure_device(devname, list_one_device); - } - - SANE_Status diff --git a/staging/scim-anthy/PKGBUILD b/staging/scim-anthy/PKGBUILD deleted file mode 100644 index f34466307..000000000 --- a/staging/scim-anthy/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 146909 2012-01-19 05:06:58Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=scim-anthy -pkgver=1.2.7 -pkgrel=3 -_filecode=37309 -pkgdesc='Japanese input method module for SCIM' -arch=('i686' 'x86_64') -url='http://sourceforge.jp/projects/scim-imengine/' -license=('GPL') -depends=('scim' 'anthy') -options=('!libtool') -source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/scim-chewing/PKGBUILD b/staging/scim-chewing/PKGBUILD deleted file mode 100644 index 0d2c298af..000000000 --- a/staging/scim-chewing/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 146907 2012-01-19 05:02:07Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: whisky <archlinux.cle(at)gmail.com> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=scim-chewing -pkgver=0.3.4 -pkgrel=2 -pkgdesc='Traditional Chinese input method module for SCIM' -arch=('i686' 'x86_64') -url='http://chewing.csie.net/' -license=('GPL') -depends=('scim' 'libchewing') -makedepends=('intltool') -options=('!libtool') -source=("http://chewing.csie.net/download/scim/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/scim-tables/PKGBUILD b/staging/scim-tables/PKGBUILD deleted file mode 100644 index 06f296f43..000000000 --- a/staging/scim-tables/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 146905 2012-01-19 04:58:35Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: Gan Lu <rhythm.gan@gmail.com> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=scim-tables -pkgver=0.5.10 -pkgrel=2 -pkgdesc='Generic table input method module for SCIM' -url='http://www.scim-im.org/' -arch=('i686' 'x86_64') -license=('GPL') -depends=('scim') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") -sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/scribus/PKGBUILD b/staging/scribus/PKGBUILD deleted file mode 100644 index 244d83f32..000000000 --- a/staging/scribus/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 147755 2012-01-28 03:27:34Z eric $ -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Ben <ben@benmazer.net> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=scribus -pkgver=1.4.0 -pkgrel=2 -pkgdesc="A desktop publishing program" -arch=('i686' 'x86_64') -url="http://www.scribus.net" -license=('GPL') -install=scribus.install -depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \ - 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \ - 'desktop-file-utils' 'shared-mime-info') -makedepends=('cmake') -options=(!libtool) -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('ae19e62399941fb8e868d8e762caf494') -sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809') - -build() { - cd "${srcdir}" - sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/* - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DWANT_CAIRO=1 \ - -DLIB_SUFFIX="" - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install - - # fix icon path in .desktop file - sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \ - "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" - - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \ - "${pkgdir}/usr/share/applications/scribus.desktop" -} diff --git a/staging/scribus/scribus.install b/staging/scribus/scribus.install deleted file mode 100644 index 0598e46ed..000000000 --- a/staging/scribus/scribus.install +++ /dev/null @@ -1,13 +0,0 @@ - -post_install() { - echo "update desktop mime database..." - update-mime-database usr/share/mime > /dev/null 2>&1 - update-desktop-database -q > /dev/null 2>&1 -} -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/sdl_image/PKGBUILD b/staging/sdl_image/PKGBUILD deleted file mode 100644 index b42e26880..000000000 --- a/staging/sdl_image/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 147224 2012-01-24 20:21:56Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sdl_image -pkgver=1.2.12 -pkgrel=2 -pkgdesc="A simple library to load images of various formats as SDL surfaces" -arch=('i686' 'x86_64') -license=('custom') -depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') -options=('!libtool') -url="http://www.libsdl.org/projects/SDL_image/" -source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz) -md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') - -build() { - cd "$srcdir/SDL_image-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/SDL_image-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/skanlite/PKGBUILD b/staging/skanlite/PKGBUILD deleted file mode 100644 index 2690b7308..000000000 --- a/staging/skanlite/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 147182 2012-01-24 01:29:19Z foutrelis $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=skanlite -pkgver=0.8 -pkgrel=2 -pkgdesc="Image Scanning Application for KDE" -arch=('i686' 'x86_64') -url='http://kde-apps.org/content/show.php?content=109803' -license=('GPL') -depends=('kdebase-runtime' 'libksane') -makedepends=('pkgconfig' 'cmake' 'automoc4') -source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2") -md5sums=('baa43dbc78be696e121969b0a3d88929') - -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/staging/slim/PKGBUILD b/staging/slim/PKGBUILD deleted file mode 100644 index f7f5406c1..000000000 --- a/staging/slim/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 147688 2012-01-27 02:04:48Z eric $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Hugo Ideler <hugoideler@dse.nl> - -pkgname=slim -pkgver=1.3.2 -pkgrel=7 -pkgdesc='Desktop-independent graphical login manager for X11' -arch=('i686' 'x86_64') -url='http://slim.berlios.de/' -license=('GPL2') -depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft') -backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'pam.d' - 'logrotate' - 'ptr_pam.patch' - 'no-host.patch' - 'restart.patch' - 'sigterm.patch' - 'session-name.patch' - 'tty-slowness.patch' - 'slim-1.3.2-libpng15.patch') -sha1sums=('e421d5487732c8317f8f591906661e014b036358' - '6fe0ba83509af634bce47be34e30995965bffc79' - 'a0e991ef0ac5120465a3be014a26e70ba073b6ae' - 'b969cc902c1d9915a5609141a652c77b2732407b' - '640668c984a13593a1bfba8d3b503c005d5f401e' - 'b86eddd083fb9f6259e46c735f55ebe76c655bd3' - '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435' - '0b35048723c527fb824c5e0f9b9064f751871785' - 'fdd35562ce010babaeb793f92f9906fdcdaf3f9f' - '213fefe8533c845ea8c40585b6a8097820d5e5d2' - '3cd674e548f4e0aadbbd32a67b4efd1ed263afef') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's/png12/png15/g' Makefile - patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM - patch -p1 -i ../no-host.patch # cf patch: do not set PAM host - patch -p1 -i ../restart.patch # cf patch: restart X server if killed - patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd - patch -p1 -i ../session-name.patch # FS#26693: fix default session name - patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start - patch -p0 -i ../slim-1.3.2-libpng15.patch - - make USE_PAM=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" MANDIR=/usr/share/man install - - install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim - install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim - install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim - - # Provide sane defaults - sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf - sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf -} diff --git a/staging/slim/install b/staging/slim/install deleted file mode 100644 index 65aa77d72..000000000 --- a/staging/slim/install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - cat <<EOF - -==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab. - -EOF -} diff --git a/staging/slim/logrotate b/staging/slim/logrotate deleted file mode 100644 index 26ec3b0f4..000000000 --- a/staging/slim/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/staging/slim/no-host.patch b/staging/slim/no-host.patch deleted file mode 100644 index c40f25bca..000000000 --- a/staging/slim/no-host.patch +++ /dev/null @@ -1,29 +0,0 @@ -Datum: Sun, 30 Jan 2011 12:49:00 +0200 -Von: Samuli Suominen <ssuominen@gentoo.org> -An: jgc@archlinux.org, andyrtr@archlinux.org, thayer@archlinux.org -Betreff: SLIM and ConsoleKit 0.4.2 (and up) - -People have been coming to #xfce after Arch's ConsoleKit 0.4.3 upgrade -to ask for help why Suspend / Hibernate / and such doesn't work. - -It's because SLIM is using pam_ck_connector.so and SLIM sets Host to localhost -and makes pam_ck_connector.so believe it's actually a *remote host* called -localhost and will refuse access. - -http://bugs.gentoo.org/346037 -https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663 -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch?view=log - - -diff -aur old/app.cpp new/app.cpp ---- old/app.cpp 2011-01-30 12:39:34.033337944 +0100 -+++ new/app.cpp 2011-01-30 12:40:25.843337943 +0100 -@@ -228,8 +228,6 @@ - pam.start("slim"); - pam.set_item(PAM::Authenticator::TTY, DisplayName); - pam.set_item(PAM::Authenticator::Requestor, "root"); -- pam.set_item(PAM::Authenticator::Host, "localhost"); -- - } - catch(PAM::Exception& e){ - cerr << APPNAME << ": " << e << endl; diff --git a/staging/slim/pam.d b/staging/slim/pam.d deleted file mode 100644 index 78a981f74..000000000 --- a/staging/slim/pam.d +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_loginuid.so -session optional pam_ck_connector.so diff --git a/staging/slim/ptr_pam.patch b/staging/slim/ptr_pam.patch deleted file mode 100644 index 3a3fbcdb7..000000000 --- a/staging/slim/ptr_pam.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -aur old/app.cpp new/app.cpp ---- old/app.cpp 2010-07-08 07:04:10.000000000 +0200 -+++ new/app.cpp 2011-05-01 18:30:52.933844872 +0200 -@@ -43,8 +43,8 @@ - Panel* panel = *static_cast<Panel**>(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; i<num_msg; i++){ -- resp[i]->resp=0; -- resp[i]->resp_retcode=0; -+ (*resp)[i].resp=0; -+ (*resp)[i].resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username -@@ -53,13 +53,13 @@ - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -- resp[i]->resp=strdup("root"); -+ (*resp)[i].resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -- resp[i]->resp=strdup(panel->GetName().c_str()); -+ (*resp)[i].resp=strdup(panel->GetName().c_str()); - break; - } - break; -@@ -75,7 +75,7 @@ - - default: - panel->EventHandler(Panel::Get_Passwd); -- resp[i]->resp=strdup(panel->GetPasswd().c_str()); -+ (*resp)[i].resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; -@@ -91,9 +91,9 @@ - } - if (result!=PAM_SUCCESS){ - for (int i=0; i<num_msg; i++){ -- if (resp[i]->resp==0) continue; -- free(resp[i]->resp); -- resp[i]->resp=0; -+ if ((*resp)[i].resp==0) continue; -+ free((*resp)[i].resp); -+ (*resp)[i].resp=0; - }; - free(*resp); - *resp=0; diff --git a/staging/slim/rc.d b/staging/slim/rc.d deleted file mode 100755 index b0be7ffc5..000000000 --- a/staging/slim/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/slim` -case "$1" in - start) - stat_busy "Starting Simple Login Manager" - [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon slim - stat_done - fi - ;; - stop) - stat_busy "Stopping Simple Login Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon slim - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/slim/restart.patch b/staging/slim/restart.patch deleted file mode 100644 index 4e5049000..000000000 --- a/staging/slim/restart.patch +++ /dev/null @@ -1,144 +0,0 @@ -http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663 - - -diff -aur slim-1.3.2.b/app.cpp slim-1.3.2.c/app.cpp ---- slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 -+++ slim-1.3.2.c/app.cpp 2010-08-21 15:11:03.946389843 +0200 -@@ -104,6 +104,11 @@ - - extern App* LoginApp; - -+int xioerror(Display *disp) { -+ LoginApp->RestartServer(); -+ return 0; -+} -+ - void CatchSignal(int sig) { - cerr << APPNAME << ": unexpected signal " << sig << endl; - -@@ -114,19 +119,6 @@ - exit(ERR_EXIT); - } - -- --void AlarmSignal(int sig) { -- int pid = LoginApp->GetServerPID(); -- if(waitpid(pid, NULL, WNOHANG) == pid) { -- LoginApp->StopServer(); -- LoginApp->RemoveLock(); -- exit(OK_EXIT); -- } -- signal(sig, AlarmSignal); -- alarm(2); --} -- -- - void User1Signal(int sig) { - signal(sig, User1Signal); - } -@@ -277,7 +269,6 @@ - signal(SIGHUP, CatchSignal); - signal(SIGPIPE, CatchSignal); - signal(SIGUSR1, User1Signal); -- signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { -@@ -298,7 +289,6 @@ - - CreateServerAuth(); - StartServer(); -- alarm(2); - #endif - - } -@@ -614,6 +604,8 @@ - int status; - while (wpid != pid) { - wpid = wait(&status); -+ if (wpid == ServerPID) -+ xioerror(Dpy); // Server died, simulate IO error - } - if (WIFEXITED(status) && WEXITSTATUS(status)) { - LoginPanel->Message("Failed to execute login command"); -@@ -659,9 +651,6 @@ - - - void App::Reboot() { -- // Stop alarm clock -- alarm(0); -- - #ifdef USE_PAM - try{ - pam.end(); -@@ -684,9 +673,6 @@ - - - void App::Halt() { -- // Stop alarm clock -- alarm(0); -- - #ifdef USE_PAM - try{ - pam.end(); -@@ -772,6 +758,7 @@ - - StopServer(); - RemoveLock(); -+ while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens - Run(); - } - -@@ -842,6 +829,7 @@ - - for(cycles = 0; cycles < ncycles; cycles++) { - if((Dpy = XOpenDisplay(DisplayName))) { -+ XSetIOErrorHandler(xioerror); - return 1; - } else { - if(!ServerTimeout(1, (char *) "X server to begin accepting connections")) -@@ -926,9 +914,6 @@ - ServerPID = -1; - break; - } -- alarm(15); -- pause(); -- alarm(0); - - // Wait for server to start up - if(WaitForServer() == 0) { -@@ -963,15 +948,12 @@ - - - void App::StopServer() { -- // Stop alars clock and ignore signals -- alarm(0); - signal(SIGQUIT, SIG_IGN); - signal(SIGINT, SIG_IGN); - signal(SIGHUP, SIG_IGN); - signal(SIGPIPE, SIG_IGN); - signal(SIGTERM, SIG_DFL); - signal(SIGKILL, SIG_DFL); -- signal(SIGALRM, SIG_DFL); - - // Catch X error - XSetIOErrorHandler(IgnoreXIO); -diff -aur slim-1.3.2.b/app.h slim-1.3.2.c/app.h ---- slim-1.3.2.b/app.h 2010-08-21 15:10:40.499582804 +0200 -+++ slim-1.3.2.c/app.h 2010-08-21 15:11:03.946389843 +0200 -@@ -34,6 +34,7 @@ - ~App(); - void Run(); - int GetServerPID(); -+ void RestartServer(); - void StopServer(); - - bool serverStarted; -@@ -49,7 +50,6 @@ - void Console(); - void Exit(); - void KillAllClients(Bool top); -- void RestartServer(); - void ReadConfig(); - void OpenLog(); - void CloseLog(); diff --git a/staging/slim/session-name.patch b/staging/slim/session-name.patch deleted file mode 100644 index 8211c4f72..000000000 --- a/staging/slim/session-name.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp ---- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000 -+++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000 -@@ -23,7 +23,7 @@ - Root = root; - cfg = config; - -- session = ""; -+ session = cfg->nextSession(session); - - // Init GC - XGCValues gcv; -@@ -188,7 +188,7 @@ - } - - void Panel::ClearPanel() { -- session = ""; -+ session = cfg->nextSession(session); - Reset(); - XClearWindow(Dpy, Root); - XClearWindow(Dpy, Win); diff --git a/staging/slim/sigterm.patch b/staging/slim/sigterm.patch deleted file mode 100644 index fbaeb7116..000000000 --- a/staging/slim/sigterm.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -aur old/panel.cpp new/panel.cpp ---- old/panel.cpp 2011-04-29 15:15:57.210134850 +0200 -+++ new/panel.cpp 2011-04-29 15:16:17.260285407 +0200 -@@ -10,6 +10,7 @@ - */ - - #include <sstream> -+#include <poll.h> - #include "panel.h" - - using namespace std; -@@ -288,16 +289,24 @@ - field=curfield; - bool loop = true; - OnExpose(); -+ -+ struct pollfd x11_pfd = {0}; -+ x11_pfd.fd = ConnectionNumber(Dpy); -+ x11_pfd.events = POLLIN; - while(loop) { -- XNextEvent(Dpy, &event); -- switch(event.type) { -- case Expose: -- OnExpose(); -- break; -- -- case KeyPress: -- loop=OnKeyPress(event); -- break; -+ if(XPending(Dpy) || poll(&x11_pfd, 1, -1) > 0) { -+ while(XPending(Dpy)) { -+ XNextEvent(Dpy, &event); -+ switch(event.type) { -+ case Expose: -+ OnExpose(); -+ break; -+ -+ case KeyPress: -+ loop=OnKeyPress(event); -+ break; -+ } -+ } - } - } - diff --git a/staging/slim/slim-1.3.2-libpng15.patch b/staging/slim/slim-1.3.2-libpng15.patch deleted file mode 100644 index 720608567..000000000 --- a/staging/slim/slim-1.3.2-libpng15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- png.c -+++ png.c -@@ -57,7 +57,7 @@ - return(0); - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); - fclose(infile); diff --git a/staging/slim/tty-slowness.patch b/staging/slim/tty-slowness.patch deleted file mode 100644 index c590fbed8..000000000 --- a/staging/slim/tty-slowness.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp ---- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200 -+++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 -@@ -280,21 +280,22 @@ - signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG -- OpenLog(); -- - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { - daemonmode = true; - } - - // Daemonize - if (daemonmode) { -- if (daemon(0, 1) == -1) { -+ if (daemon(0, 0) == -1) { - cerr << APPNAME << ": " << strerror(errno) << endl; - exit(ERR_EXIT); - } -- UpdatePid(); - } - -+ OpenLog(); -+ -+ if (daemonmode) UpdatePid(); -+ - CreateServerAuth(); - StartServer(); - alarm(2); diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD deleted file mode 100644 index 4ac83085c..000000000 --- a/staging/sox/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 146873 2012-01-19 01:56:50Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=sox -pkgver=14.3.2 -pkgrel=5 -pkgdesc="The Swiss Army knife of sound processing tools" -arch=('i686' 'x86_64') -url="http://sox.sourceforge.net/" -license=('GPL' 'LGPL') -depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') -makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') -optdepends=('libao: for ao plugin' - 'ffmpeg: for ffmpeg plugin' - 'libmad: for mp3 plugin' - 'libid3tag: for mp3 plugin' - 'wavpack: for wavpack plugin' - 'libpulse: for pulse plugin') -options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox-14.3.2-ffmpeg.patch) -sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' - '86caa6aa86a0bf7a048522114d4efd11acbbda70') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" - sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-dyn-default --with-distro="Arch Linux" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/sox/sox-14.3.2-ffmpeg.patch b/staging/sox/sox-14.3.2-ffmpeg.patch deleted file mode 100644 index 5289b9b47..000000000 --- a/staging/sox/sox-14.3.2-ffmpeg.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: sox-14.3.2/src/ffmpeg.c -=================================================================== ---- sox-14.3.2.orig/src/ffmpeg.c -+++ sox-14.3.2/src/ffmpeg.c -@@ -91,7 +91,7 @@ static int stream_component_open(priv_t - - if (!codec || avcodec_open(enc, codec) < 0) - return -1; -- if (enc->codec_type != CODEC_TYPE_AUDIO) { -+ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { - lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); - return -1; - } -@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) - /* Find audio stream (FIXME: allow different stream to be selected) */ - for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { - AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; -- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { -+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { - ffmpeg->audio_index = i; - break; - } -@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo - - c = st->codec; - c->codec_id = codec_id; -- c->codec_type = CODEC_TYPE_AUDIO; -+ c->codec_type = AVMEDIA_TYPE_AUDIO; - - /* put sample parameters */ - c->bit_rate = 256000; /* FIXME: allow specification */ -@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t - av_init_packet(&pkt); - pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); - pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index = ffmpeg->audio_st->index; - pkt.data = ffmpeg->audio_buf_aligned; - diff --git a/staging/streamtuner/PKGBUILD b/staging/streamtuner/PKGBUILD deleted file mode 100644 index d25ae0451..000000000 --- a/staging/streamtuner/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 147014 2012-01-20 18:50:13Z andyrtr $ -# Contributor: Greg Grabinski <greg@grabinski.ch> -# Maintainer: ndreas Radke <andyrtr@archlinux.org> - -pkgname=streamtuner -pkgver=0.99.99 -pkgrel=12 -pkgdesc="A stream directory browser" -arch=('i686' 'x86_64') -url="http://www.nongnu.org/streamtuner/" -license=('custom') -depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2') -conflicts=('streamtuner-live365') -replaces=('streamtuner-live365') -source=(http://savannah.nongnu.org/download/streamtuner/$pkgname-$pkgver.tar.gz \ - http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-live365.diff \ - http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff - streamtuner-0.99.99-shoutcast.diff - shoutcast-redesign-patch.diff) -options=('!libtool' '!emptydirs') -md5sums=('2027b7c34e85b594524b0b4351c14362' - '8aa1994a849b05d2b8fffbda702b8a25' - '7aff45a41c60358cb2332c7ce644f661' - '1eab6edce130e1a1e5f208cd3ed6766a' - '8a3a17a1719a79353d6ad7ac8564947b') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff - patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff - # fix http://bugs.archlinux.org/task/10308 - patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff - # fix http://bugs.archlinux.org/task/11463 - patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff - - # python2 fixes - sed -i "s:^for ac_prog in python:for ac_prog in python2:" ${srcdir}/${pkgname}-${pkgver}/configure - - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr install - - #Add license file - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/staging/streamtuner/shoutcast-redesign-patch.diff b/staging/streamtuner/shoutcast-redesign-patch.diff deleted file mode 100644 index 644e2273e..000000000 --- a/staging/streamtuner/shoutcast-redesign-patch.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c ---- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c 2008-09-12 18:04:00.229785732 -0400 -+++ streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c 2008-09-12 18:05:56.716440720 -0400 -@@ -37,7 +37,7 @@ - - /*** cpp *********************************************************************/ - --#define SHOUTCAST_ROOT "http://www.shoutcast.com/" -+#define SHOUTCAST_ROOT "http://classic.shoutcast.com/" - - #define MAX_STREAMS_PER_PAGE 100 /* enforced by SHOUTcast */ - diff --git a/staging/streamtuner/streamtuner-0.99.99-shoutcast.diff b/staging/streamtuner/streamtuner-0.99.99-shoutcast.diff deleted file mode 100644 index e7fcbca94..000000000 --- a/staging/streamtuner/streamtuner-0.99.99-shoutcast.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- src/plugins/shoutcast/shoutcast.c.orig 2004-12-19 15:21:00.000000000 +0000 -+++ src/plugins/shoutcast/shoutcast.c 2008-03-16 10:39:24.000000000 +0000 -@@ -94,6 +94,8 @@ - - GNode *parent_node; - SHOUTcastStream *stream; -+ -+ int parse_genres; - } ReloadInfo; - - /*** variable declarations ***************************************************/ -@@ -518,6 +520,7 @@ - info.npages = 0; - info.parent_node = NULL; - info.stream = NULL; -+ info.parse_genres = 0; - - status = st_transfer_session_get_by_line(session, - url, -@@ -565,10 +568,16 @@ - info->stream = stream_new_cb(NULL); - info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1); - } -- else if (info->page < 2 -- && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\"")) -- || (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\""))) -- && (s2 = strstr(s1, "\">")))) -+ else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">"))) -+ { -+ info->parse_genres = 1; -+ } -+ else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>"))) -+ { -+ info->parse_genres = 0; -+ } -+ else if (info->page < 2 && info->parse_genres == 1 -+ && ((s1 = st_strstr_span(line, "<OPTION VALUE=\"")) && (s2 = strstr(s1, "\">")))) - { - STCategory *category; - GNode *node; - diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD deleted file mode 100644 index d4bad140e..000000000 --- a/staging/subversion/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 145884 2012-01-03 18:48:03Z stephane $ -# Maintainer: Paul Mattal <paul@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=subversion -pkgver=1.7.2 -pkgrel=2 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite3' 'file') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool') -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve svn svnserve.conf subversion.rpath.fix.patch) -sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb' - '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python2 - - patch -p0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet - - make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all - make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH - make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ - swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl # install-swig-rb - - install -d "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -rf "${pkgdir}"/usr/lib/perl5/core_perl - - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - - # bash completion - install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/etc/bash_completion.d/subversion -} diff --git a/staging/subversion/subversion.rpath.fix.patch b/staging/subversion/subversion.rpath.fix.patch deleted file mode 100644 index ba6ee9e4e..000000000 --- a/staging/subversion/subversion.rpath.fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile diff --git a/staging/subversion/svn b/staging/subversion/svn deleted file mode 100644 index 8988aaf63..000000000 --- a/staging/subversion/svn +++ /dev/null @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} diff --git a/staging/subversion/svnserve b/staging/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/staging/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/staging/subversion/svnserve.conf b/staging/subversion/svnserve.conf deleted file mode 100644 index 37fb7ea10..000000000 --- a/staging/subversion/svnserve.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" diff --git a/staging/totem-plparser/PKGBUILD b/staging/totem-plparser/PKGBUILD deleted file mode 100644 index 8cb03d620..000000000 --- a/staging/totem-plparser/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 146580 2012-01-13 20:34:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=totem-plparser -pkgver=2.32.6 -pkgrel=3 -url="http://www.hadess.net/totem.php3" -pkgdesc="Totem playlist parser library" -license=('LGPL') -arch=(i686 x86_64) -depends=('gmime' 'libsoup-gnome' 'libarchive') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-$pkgver.tar.xz) -sha256sums=('8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874') - -build() { - cd "$srcdir/totem-pl-parser-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static - make -} - -package(){ - cd "$srcdir/totem-pl-parser-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD deleted file mode 100644 index 6de2cd899..000000000 --- a/staging/tracker/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 147228 2012-01-24 20:33:45Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Alexander Fehr <pizzapunk gmail com> - -pkgbase=tracker -pkgname=(tracker libtracker-sparql) -pkgver=0.12.9 -_tver=${pkgver%.*} -pkgrel=2 -pkgdesc="All-in-one indexer, search tool and metadata database" -arch=('i686' 'x86_64') -license=('GPL') -makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' - 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' - 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' - 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' - 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') -url="http://www.gnome.org" -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c') - -build() { - cd "$srcdir/$pkgbase-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/tracker \ - --disable-unit-tests \ - --enable-libflac \ - --enable-libvorbis - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_tracker() { - depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' - 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' - 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') - optdepends=('giflib: extractor for GIF data' - 'gstreamer0.10-base: video extractor' - 'totem-plparser: playlist support' - 'nautilus: nautilus-extension' - 'libvorbis: Vorbis metadata extractor' - 'flac: FLAC metadata extractor' - 'taglib: writeback for audio files' - 'gnome-panel: tracker-search-bar') - groups=('gnome-extra') - install=tracker.install - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - -### Split libtracker-sparql - - mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver - mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} - mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} - - mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" - - mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ - "$srcdir/sparql/usr/lib/tracker-$_tver" - - mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ - "$srcdir/sparql/usr/share/vala/vapi" - - mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql - mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib - mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc - mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir -} - -package_libtracker-sparql() { - pkgdesc="$pkgdesc (SPARQL library)" - depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') - - mv "$srcdir"/sparql/* "$pkgdir" -} diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install deleted file mode 100644 index 95114273e..000000000 --- a/staging/tracker/tracker.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD deleted file mode 100644 index e491cdff1..000000000 --- a/staging/transcode/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 147748 2012-01-27 20:04:27Z ibiru $ -# Maintainer: -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: roberto <roberto@archlinux.org> - -pkgname=transcode -_sripver=0.3-4 -pkgver=1.1.7 -pkgrel=4 -pkgdesc="A video/DVD ripper and encoder for the terminal/console" -arch=('i686' 'x86_64') -url="http://tcforge.berlios.de/" -license=('GPL') -depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') -makedepends=('nasm') -options=('!libtool') -source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 - http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch - ffmpeg-0.10.patch) -sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' - 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' - 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae' - '3c03111cfae88db918afff3837cec7db32ace3cc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch" - ./configure --prefix=/usr \ - --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ - --enable-lame --enable-ogg --enable-vorbis --enable-theora \ - --enable-libdv --enable-libxml2 --enable-v4l \ - --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ - --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ - --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert - make - - cd "${srcdir}/subtitleripper" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" - sed -e 's|^\(.*lppm.*\)$|#\1|' \ - -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ - -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ - -i Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - cd "${srcdir}/subtitleripper" - install -m 755 pgm2txt "${pkgdir}/usr/bin/" - install -m 755 srttool "${pkgdir}/usr/bin/" - install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" - install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/" - install -m 755 vobsub2pgm "${pkgdir}/usr/bin/" -} diff --git a/staging/transcode/ffmpeg-0.10.patch b/staging/transcode/ffmpeg-0.10.patch deleted file mode 100644 index 5965c180c..000000000 --- a/staging/transcode/ffmpeg-0.10.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c ---- transcode-1.1.7.orig/filter/filter_pp.c 2012-01-27 19:55:13.706613234 +0000 -+++ transcode-1.1.7/filter/filter_pp.c 2012-01-27 19:56:04.719541629 +0000 -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - diff --git a/staging/transcode/subtitleripper-0.3.4-linkingorder.patch b/staging/transcode/subtitleripper-0.3.4-linkingorder.patch deleted file mode 100644 index 7efe22346..000000000 --- a/staging/transcode/subtitleripper-0.3.4-linkingorder.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch deleted file mode 100644 index 2af11d257..000000000 --- a/staging/transcode/subtitleripper-0.3.4-respect-ldflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/staging/transfig/LICENSE b/staging/transfig/LICENSE deleted file mode 100644 index b944bb992..000000000 --- a/staging/transfig/LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -/* - * TransFig: Facility for Translating Fig code - * Copyright (c) 1991 by Micah Beck - * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul - * - * Any party obtaining a copy of these files is granted, free of charge, a - * full and unrestricted irrevocable, world-wide, paid up, royalty-free, - * nonexclusive right and license to deal in this software and - * documentation files (the "Software"), including without limitation the - * rights to use, copy, modify, merge, publish and/or distribute copies of - * the Software, and to permit persons who receive copies from any such - * party to do so, with the only requirement being that this copyright - * notice remain intact. - * - */ - -THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, -INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. diff --git a/staging/transfig/PKGBUILD b/staging/transfig/PKGBUILD deleted file mode 100644 index 5c03217ca..000000000 --- a/staging/transfig/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 146871 2012-01-19 01:34:27Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=transfig -pkgver=3.2.5d -pkgrel=1 -pkgdesc="Format conversion utility that can be used with xfig" -arch=('i686' 'x86_64') -url="http://www.xfig.org" -license=('custom') -depends=('libpng' 'libxpm') -makedepends=('imake') -source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \ - transfig-3.2.5d-libpng-1.5.patch) -sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc' - 'b8b712871615308b8b6add92f86d218437d652f2' - '9f9f332b0b31e58e59542bc1568df9617b71710a') - -build() { - cd "${srcdir}/${pkgname}.${pkgver}" - sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile - sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile - patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch - - xmkmf - make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles - make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig -} - -package() { - cd "${srcdir}/${pkgname}.${pkgver}" - - make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \ - FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \ - install install.man - install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/transfig/transfig-3.2.5d-libpng-1.5.patch b/staging/transfig/transfig-3.2.5d-libpng-1.5.patch deleted file mode 100644 index e6f15e43e..000000000 --- a/staging/transfig/transfig-3.2.5d-libpng-1.5.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=356751 - -Index: transfig.3.2.5d/fig2dev/dev/readpng.c -=================================================================== ---- transfig.3.2.5d.orig/fig2dev/dev/readpng.c -+++ transfig.3.2.5d/fig2dev/dev/readpng.c -@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly) - } - - /* set long jump here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return 0; -@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly) - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, - &interlace_type, &compression_type, &filter_type); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); -- else -- png_set_gamma(png_ptr, 2.2, 0.45); -+ png_fixed_point gamma = 0.45; -+ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); -+ png_set_gamma(png_ptr, 2.2, gamma); - -- if (info_ptr->valid & PNG_INFO_bKGD) -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { - /* set the background to the one supplied */ -- png_set_background(png_ptr, &info_ptr->background, -+ png_color_16p background; -+ png_get_bKGD(png_ptr,info_ptr,&background); -+ png_set_background(png_ptr, background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); -+ } - else { - /* blend the canvas background using the alpha channel */ - if (bgspec) { diff --git a/staging/tumbler/PKGBUILD b/staging/tumbler/PKGBUILD deleted file mode 100644 index 01b53bbc8..000000000 --- a/staging/tumbler/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 146989 2012-01-19 22:34:27Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Jan Jezek <honzin.jezek@gmail.com> - -pkgname=tumbler -pkgver=0.1.23 -pkgrel=4 -pkgdesc="D-Bus service for applications to request thumbnails" -arch=('i686' 'x86_64') -url="http://git.xfce.org/xfce/tumbler/" -license=('GPL2' 'LGPL') -groups=('xfce4') -depends=('dbus-glib' 'gdk-pixbuf2') -makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib' - 'libgsf' 'libopenraw' 'freetype2') -optdepends=('ffmpegthumbnailer: for video thumbnails' - 'gstreamer0.10: for video thumbnails' - 'poppler-glib: for PDF thumbnails' - 'libgsf: for ODF thumbnails' - 'libopenraw: for RAW thumbnails' - 'freetype2: for font thumbnails') -options=('!libtool') -source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --disable-static \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/tuxpuck/PKGBUILD b/staging/tuxpuck/PKGBUILD deleted file mode 100644 index 19f50020a..000000000 --- a/staging/tuxpuck/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 147018 2012-01-20 19:49:39Z giovanni $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=tuxpuck -pkgver=0.8.2 -pkgrel=5 -pkgdesc="Airhockey with tux" -arch=('i686' 'x86_64') -url="http://home.no.net/munsuun/tuxpuck/" -license=('GPL2') -depends=('libjpeg' 'sdl' 'libpng' 'libvorbis') -makedepends=('freetype2') -options=('!makeflags') -source=("http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz" - 'tuxpuck-0.8.2-ldflags.patch' - 'tuxpuck-0.8.2-libpng15.patch') -md5sums=('fc839abc2b1f3eafae397e1ed6487079' - 'cb914d211bf3f519b7700fda180612b0' - 'a4da530d670a0c30ac0840aab1db0dca') - -build() { - cd $srcdir/$pkgname-$pkgver - - sed -i 's|usr/man|usr/share/man|' Makefile - sed -i -e 's/-Werror//' \ - -e '/^CC/d' \ - Makefile \ - utils/Makefile \ - data/Makefile - - patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-ldflags.patch" - patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-libpng15.patch" - - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install -} diff --git a/staging/tuxpuck/tuxpuck-0.8.2-ldflags.patch b/staging/tuxpuck/tuxpuck-0.8.2-ldflags.patch deleted file mode 100644 index 28fcef48a..000000000 --- a/staging/tuxpuck/tuxpuck-0.8.2-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.old 2010-10-05 10:34:57.000000000 +0200 -+++ Makefile 2010-10-05 10:35:28.000000000 +0200 -@@ -20,7 +20,7 @@ - - $(NAME) : $(OBJS) - cd data; $(MAKE) -- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \ - -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME) - - w32icon.o : data/icons/tuxpuck.ico diff --git a/staging/tuxpuck/tuxpuck-0.8.2-libpng15.patch b/staging/tuxpuck/tuxpuck-0.8.2-libpng15.patch deleted file mode 100644 index ca9539f39..000000000 --- a/staging/tuxpuck/tuxpuck-0.8.2-libpng15.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- png.c.old 2011-09-14 16:25:54.415338149 +0200 -+++ png.c 2011-09-14 17:41:02.190803110 +0200 -@@ -38,6 +38,8 @@ - png_color_16 *transv; - SDL_RWops *src = NULL; - Uint32 size; -+ int num_palette; -+ png_colorp png_palette; - - memcpy(&size, data, sizeof(Uint32)); - if (memcounter) -@@ -74,7 +76,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - SDL_SetError("Error reading the PNG file."); - goto done; - } -@@ -142,9 +144,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -152,7 +154,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth * info_ptr->channels, Rmask, Gmask, -+ bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask, - Bmask, Amask); - if (surface == NULL) { - SDL_SetError("Out of memory"); -@@ -197,12 +199,15 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0) { -- palette->ncolors = info_ptr->num_palette; -- for (i = 0; i < info_ptr->num_palette; ++i) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else { -+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); -+ if (num_palette > 0) { -+ palette->ncolors = num_palette; -+ for (i = 0; i < num_palette; ++i) { -+ palette->colors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; -+ } - } - } - } diff --git a/staging/unison/PKGBUILD b/staging/unison/PKGBUILD deleted file mode 100644 index 83c4cc1c5..000000000 --- a/staging/unison/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 147256 2012-01-25 05:10:29Z eric $ -#Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=unison -pkgver=2.40.63 -pkgrel=3 -pkgdesc="Unison is a file-synchronization tool" -arch=(i686 x86_64) -license=('GPL2') -url="http://www.cis.upenn.edu/~bcpierce/unison" -depends=('glibc') -makedepends=('ocaml' 'lablgtk2' 'imagemagick') -optdepends=('gtk2: for gtk2 support') -source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz - $pkgname.desktop) -md5sums=('3281207850cf6f0a17fe73f371893bd3' - '2daecba7705455a8e4b769e48b059872') -options=(!makeflags) - -build() { - cd "$srcdir/$pkgname-$pkgver" - CFLAGS="" - make clean - make mkProjectInfo - make UISTYLE=text DEBUGGING=false THREADS=true - mv unison unison-text - - # clean the builddir and rebuild with gtk support - # broken at the moment! - # make clean - # make mkProjectInfo - # make UISTYLE=gtk DEBUGGING=false THREADS=true - # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk - # clean the builddir and rebuild with gtk2 support - make clean - make mkProjectInfo - make UISTYLE=gtk2 DEBUGGING=false THREADS=true -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - install -Dm755 unison-text "$pkgdir"/usr/bin/unison - install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2 - # install a .desktop file; create a compliant icon from ico file and install the png - install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop - convert win32rc/U.ico unison.png - install -Dm644 ${pkgname}-1.png "$pkgdir"/usr/share/pixmaps/$pkgname.png - # make symlink for .desktop file - cd "$pkgdir"/usr/bin - ln -s unison-gtk2 unison-x11 -} diff --git a/staging/unison/unison-ssh-ocaml.patch b/staging/unison/unison-ssh-ocaml.patch deleted file mode 100644 index 1b9c66c7f..000000000 --- a/staging/unison/unison-ssh-ocaml.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: src/terminal.ml -=================================================================== ---- src/terminal.ml (révision 463) -+++ src/terminal.ml (copie de travail) -@@ -191,7 +191,6 @@ - exit 127 - end - | childPid -> -- Unix.close slaveFd; - (Some masterFd, childPid) - end - -Index: src/update.mli -=================================================================== ---- src/update.mli (révision 463) -+++ src/update.mli (copie de travail) -@@ -1,7 +1,7 @@ - (* Unison file synchronizer: src/update.mli *) - (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) - --module NameMap : Map.S with type key = Name.t -+module NameMap : MyMap.S with type key = Name.t - - type archive = - ArchiveDir of Props.t * archive NameMap.t diff --git a/staging/unison/unison.desktop b/staging/unison/unison.desktop deleted file mode 100644 index 3a7e1d762..000000000 --- a/staging/unison/unison.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=unison -Name[de]=unison -Comment=File synchronisation tool for X11 -Comment[de]=Datei Abgleicher und Synchronisierer -TryExec=unison-x11 -Exec=unison-x11 -Terminal=false -Type=Application -Categories=GTK;Application;Network; -Icon=unison.png -StartupNotify=true diff --git a/staging/unison/unison.install b/staging/unison/unison.install deleted file mode 100644 index a3790ab7d..000000000 --- a/staging/unison/unison.install +++ /dev/null @@ -1,28 +0,0 @@ -# arg 1: the new package version -post_install() { - echo "NOTE:" - echo " For gtk1 frontend please add 'gtk' package." - echo " For gtk2 frontend please add 'gtk2' package." - echo " Default X11 frontend is set to gtk2. " - echo "" - echo " If you want to default to gtk1 unison:" - echo " 'rm /usr/bin/unison-x11'" - echo " 'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'" - echo "" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} diff --git a/staging/vice/PKGBUILD b/staging/vice/PKGBUILD deleted file mode 100644 index 92a531c26..000000000 --- a/staging/vice/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 146938 2012-01-19 12:54:40Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=vice -pkgver=2.3 -pkgrel=5 -pkgdesc="A Versatile Commodore Emulator" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.viceteam.org/" -depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' - 'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm') -makedepends=('xorg-font-utils') -options=('!makeflags') -source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz" - 'vice-2.3-x11video.patch') -md5sums=('b48d137874daad50c087a0686cbdde34' - '088292ce9efe785edfb2b0c7c670785e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch - ./configure --prefix=/usr \ - --with-alsa \ - --enable-fullscreen - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/vice/vice-2.3-x11video.patch b/staging/vice/vice-2.3-x11video.patch deleted file mode 100644 index d698638c6..000000000 --- a/staging/vice/vice-2.3-x11video.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/arch/unix/x11/xaw/x11video.c 2011-01-18 23:59:00.000000000 +0100 -+++ b/src/arch/unix/x11/xaw/x11video.c 2011-02-27 18:40:52.000000000 +0100 -@@ -60,6 +60,8 @@ - #include <X11/Xutil.h> - #include <X11/Intrinsic.h> - #include <X11/cursorfont.h> -+#include <X11/Xmd.h> -+#include <X11/extensions/shmproto.h> - - #include <stdio.h> - #include <stdlib.h> diff --git a/staging/vigra/PKGBUILD b/staging/vigra/PKGBUILD deleted file mode 100644 index ebc7f60a6..000000000 --- a/staging/vigra/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 147002 2012-01-20 14:21:18Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> - -pkgbase=vigra -pkgname=('vigra' 'vigra-doc') -pkgver=1.8.0 -pkgrel=3 -arch=('i686' 'x86_64') -url="http://hci.iwr.uni-heidelberg.de/vigra/" -license=('custom:MIT') -makedepends=(# runtime deps - 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' - # additional makedeps - 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') -options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz - vigra-1.7.1.gcc460.patch) -md5sums=('15c5544448e529ee60020758ab6be264' - '25ef8bc26bc38ee67e5b512d2acd0166') -sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2' - '1de6381a74dd136ea25df5a27f249187b0dbd17e') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DWITH_VIGRANUMPY=1 \ - -DDOCINSTALL=share/doc - make -} - -check() { - cd "${srcdir}"/${pkgname}-${pkgver} - make -k check || /bin/true # i686 fails -} - -package_vigra() { - pkgdesc="Computer vision library" - depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') - optdepends=('python2: for python bindings' - 'boost-libs: for python bindings') - - cd "${srcdir}"/${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install - # license - install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - # remove doc - rm -rf "${pkgdir}"/usr/share/doc - - #fix shebang for python2 - sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config -} - -package_vigra-doc() { - pkgdesc="Computer vision library - documentation and examples" - #depends=('vigra') - #arch=('any') - - cd "${srcdir}"/${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install - # cleanup - rm -rf "${pkgdir}"/usr/{bin,include,lib} - - # license - install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/staging/vigra/vigra-1.7.1.gcc460.patch b/staging/vigra/vigra-1.7.1.gcc460.patch deleted file mode 100644 index 46f194dbc..000000000 --- a/staging/vigra/vigra-1.7.1.gcc460.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx ---- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 -@@ -43,6 +43,7 @@ - #include <set> - #include <list> - #include <numeric> -+#include <stddef.h> - #include "mathutil.hxx" - #include "array_vector.hxx" - #include "sized_int.hxx" -diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx ---- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 -@@ -57,6 +57,7 @@ - #include <fstream> - #include <cstring> - #include <vector> -+#include <stddef.h> - #include "vigra/multi_array.hxx" - - namespace vigra { -diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx ---- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include <sys/types.h> -+#include <stddef.h> - #include "tinyvector.hxx" - #include "iteratortags.hxx" - diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD deleted file mode 100644 index 5da7ffc4f..000000000 --- a/staging/vlc/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 147741 2012-01-27 19:40:23Z ibiru $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> - -pkgname=vlc -pkgver=1.1.13 -pkgrel=4 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('GPL') -depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'xcb-util-keysyms' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') -makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' - 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' - 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' - 'lirc-utils' 'gnutls' 'libcaca') -optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'libpulse: PulseAudio support' - 'vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards') -conflicts=('vlc-plugin') -replaces=('vlc-plugin') -backup=('usr/share/vlc/http/.hosts' - 'usr/share/vlc/http/dialogs/.hosts' - 'usr/share/vlc/lua/http/.hosts' - 'usr/share/vlc/lua/http/dialogs/.hosts') -options=('!libtool') -install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9678fb7a04808b6e0de63746d35e4bb1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-faad \ - --enable-v4l \ - --enable-snapshot \ - --enable-dbus-control \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --with-live555-tree=/usr/lib/live \ - --enable-upnp \ - --enable-realrtsp - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}/" install - - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" - done -} diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install deleted file mode 100644 index dc4961cae..000000000 --- a/staging/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/staging/wesnoth/PKGBUILD b/staging/wesnoth/PKGBUILD deleted file mode 100644 index 325ed58e7..000000000 --- a/staging/wesnoth/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 147232 2012-01-24 22:47:27Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Jacobo Arvelo <unix4all@ya.com> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=wesnoth -pkgver=1.8.6 -pkgrel=4 -pkgdesc="A turn-based strategy game on a fantasy world" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.wesnoth.org/" -depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2') -makedepends=('boost') -install=wesnoth.install -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - wesnoth-libpng-1.4.0.patch - wesnoth-1.8.6-boost-foreach.patch - wesnoth.tmpfiles.conf) -md5sums=('f1c3179869b01b61e253e74aeb241034' - '3b0d2edcb45e8ecc8c790f92bdcb0087' - 'dc414ab7e1334941548e9db6db9c2460' - 'b8122f5054e3895c9c054e87460869dc') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch" - patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch" - ./autogen.sh - ./configure --prefix=/usr --localstatedir=/var --enable-tools \ - --enable-editor --enable-server --with-fifodir=/run/wesnothd - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install-exec - install -dm755 "$pkgdir/usr/lib/tmpfiles.d/" - install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" - - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager" - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent" - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope" - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint" -} diff --git a/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch deleted file mode 100644 index 5aee3118c..000000000 --- a/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 -+++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 -@@ -238,6 +238,17 @@ void ttree_view_node::clear() - - struct ttree_view_node_implementation - { -+ template<class W, class It> -+ static W* find_at_aux(It begin, It end, -+ const tpoint& coordinate, const bool must_be_active) { -+ for (It it = begin; it != end; ++it) { -+ if(W* widget = it->find_at(coordinate, must_be_active)) { -+ return widget; -+ } -+ } -+ return NULL; -+ } -+ - template<class W> - static W* find_at( - typename tconst_duplicator<W, ttree_view_node>::type& -@@ -255,13 +266,9 @@ struct ttree_view_node_implementation - } - - typedef typename tconst_duplicator<W, ttree_view_node>::type thack; -- foreach(thack& node, tree_view_node.children_) { -- if(W* widget = node.find_at(coordinate, must_be_active)) { -- return widget; -- } -- } -- -- return NULL; -+ return find_at_aux<W>(tree_view_node.children_.begin(), -+ tree_view_node.children_.end(), -+ coordinate, must_be_active); - } - }; - -@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size - return size; - } - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; -@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz - size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; - } - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; -@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s - - DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; diff --git a/staging/wesnoth/wesnoth-libpng-1.4.0.patch b/staging/wesnoth/wesnoth-libpng-1.4.0.patch deleted file mode 100644 index 338f467af..000000000 --- a/staging/wesnoth/wesnoth-libpng-1.4.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp ---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 -+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 -@@ -174,8 +174,8 @@ - //TODO: review whether providing NULL error handlers is something - //sensible - png_struct* png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), -+ NULL, NULL); - if(!png_ptr) - throw exploder_failure("Unable to initialize the png write structure"); - ---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 -+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 -@@ -15,6 +15,7 @@ - #include "exploder_utils.hpp" - #include "game_config.hpp" - #include "serialization/string_utils.hpp" -+#include <zlib.h> - #include <png.h> - - exploder_point::exploder_point(const std::string &s) diff --git a/staging/wesnoth/wesnoth.install b/staging/wesnoth/wesnoth.install deleted file mode 100644 index 4f1e419ae..000000000 --- a/staging/wesnoth/wesnoth.install +++ /dev/null @@ -1,9 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOF -Note: -==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" -==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth -==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. -EOF -} diff --git a/staging/wesnoth/wesnoth.tmpfiles.conf b/staging/wesnoth/wesnoth.tmpfiles.conf deleted file mode 100644 index 3ec0f6013..000000000 --- a/staging/wesnoth/wesnoth.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -D /run/wesnothd 0700 root root - diff --git a/staging/windowmaker-crm-git/PKGBUILD b/staging/windowmaker-crm-git/PKGBUILD deleted file mode 100644 index c8ab1a721..000000000 --- a/staging/windowmaker-crm-git/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 146857 2012-01-18 21:05:19Z daniel $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgname=windowmaker-crm-git -pkgver=20120109 -pkgrel=2 -pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra" -arch=(i686 x86_64) -url="http://www.windowmaker.org" -license=('GPL' 'custom') -depends=('libxinerama' 'libxrandr' 'libpng' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu') -options=('!libtool') -provides=('windowmaker') -conflicts=('windowmaker') -source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('abe70f9cc7606c73a9bbe498cacf925a' - '2fba97bebfd691836b92b8f0db79ff13') - -build() { - cd $srcdir/windowmaker-$pkgver - [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ - --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ - --enable-usermenu --enable-modelock --enable-xrandr - make -} - -package() { - cd $srcdir/windowmaker-$pkgver - - make DESTDIR=$pkgdir install - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL - install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop - -} diff --git a/staging/windowmaker-crm-git/libpng-1.4.patch b/staging/windowmaker-crm-git/libpng-1.4.patch deleted file mode 100644 index 5dbe5fd25..000000000 --- a/staging/windowmaker-crm-git/libpng-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur windowmaker-20091221-orig/wrlib/load.c windowmaker-20091221/wrlib/load.c ---- windowmaker-20091221-orig/wrlib/load.c 2010-01-21 17:01:10.000000000 -0500 -+++ windowmaker-20091221/wrlib/load.c 2010-01-21 17:02:38.000000000 -0500 -@@ -327,7 +327,7 @@ - - #ifdef USE_PNG - /* check for PNG */ -- if (png_check_sig(buffer, 8)) -+ if (!png_sig_cmp(buffer, 0, 8)) - return IM_PNG; - #endif - diff --git a/staging/windowmaker-crm-git/wmaker.desktop b/staging/windowmaker-crm-git/wmaker.desktop deleted file mode 100644 index f819c7577..000000000 --- a/staging/windowmaker-crm-git/wmaker.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=windowmaker -Exec=/usr/bin/wmaker -Type=Application diff --git a/staging/windowmaker/PKGBUILD b/staging/windowmaker/PKGBUILD deleted file mode 100644 index 7d885b745..000000000 --- a/staging/windowmaker/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 146855 2012-01-18 21:00:09Z daniel $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> -pkgname=windowmaker -pkgver=0.95.0 -pkgrel=2 -pkgdesc="An X11 window manager with a NEXTSTEP look and feel" -arch=(i686 x86_64) -url="http://www.windowmaker.org/" -license=('GPL' 'custom') -depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') -options=('!libtool') -source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('2d89834b4019e0a08641709ea7235db2' - '2fba97bebfd691836b92b8f0db79ff13') - -build() { - cd $srcdir/windowmaker-$pkgver - [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ - --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ - --enable-usermenu --enable-modelock --enable-xrandr - make -} - -package() { - cd $srcdir/windowmaker-$pkgver - - make DESTDIR=$pkgdir install - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL - install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop -} - diff --git a/staging/windowmaker/libpng-1.4.patch b/staging/windowmaker/libpng-1.4.patch deleted file mode 100644 index 419e8faca..000000000 --- a/staging/windowmaker/libpng-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c ---- WindowMaker-0.92.0-orig/wrlib/load.c 2010-01-21 16:10:39.000000000 -0500 -+++ WindowMaker-0.92.0/wrlib/load.c 2010-01-21 16:13:15.000000000 -0500 -@@ -348,7 +348,7 @@ - - #ifdef USE_PNG - /* check for PNG */ -- if (png_check_sig(buffer, 8)) -+ if (!png_sig_cmp(buffer, 0, 8)) - return IM_PNG; - #endif - diff --git a/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2 b/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2 Binary files differdeleted file mode 100644 index fae12a98d..000000000 --- a/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2 +++ /dev/null diff --git a/staging/windowmaker/wmaker.desktop b/staging/windowmaker/wmaker.desktop deleted file mode 100644 index f819c7577..000000000 --- a/staging/windowmaker/wmaker.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=windowmaker -Exec=/usr/bin/wmaker -Type=Application diff --git a/staging/wv/PKGBUILD b/staging/wv/PKGBUILD deleted file mode 100644 index 03e85ef24..000000000 --- a/staging/wv/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 146944 2012-01-19 13:58:47Z giovanni $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> -pkgname=wv -pkgver=1.2.9 -pkgrel=1 -pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/wvware" -license=('GPL') -depends=('libgsf' 'libpng' 'sh') -makedepends=('pkg-config') -options=('!libtool') -source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('dbccf2e9f747e50c913b7e3d126b73f7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/wv/fix-soname.patch b/staging/wv/fix-soname.patch deleted file mode 100644 index 81dff86e6..000000000 --- a/staging/wv/fix-soname.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure ---- wv-1.2.7.orig//configure 2009-09-21 12:22:46.000000000 +0200 -+++ wv-1.2.7//configure 2010-06-08 12:00:27.948857203 +0200 -@@ -2082,8 +2082,8 @@ - WV_MAJOR_VERSION=1 - WV_MINOR_VERSION=2 - WV_MICRO_VERSION=7 --WV_INTERFACE_AGE=3 --WV_BINARY_AGE=3 -+WV_INTERFACE_AGE=4 -+WV_BINARY_AGE=4 - WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION - - diff --git a/staging/wxgtk/PKGBUILD b/staging/wxgtk/PKGBUILD deleted file mode 100644 index cc950e017..000000000 --- a/staging/wxgtk/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 146863 2012-01-18 23:43:49Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=wxgtk -pkgver=2.8.12.1 -pkgrel=3 -pkgdesc="GTK+ implementation of wxWidgets API for GUI" -arch=('i686' 'x86_64') -url="http://wxwidgets.org" -license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa') -#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') - -build() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo - cd contrib/src - make -} - -package() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" - make DESTDIR="${pkgdir}" install - cd contrib/src - make DESTDIR="${pkgdir}" install - install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xaos/PKGBUILD b/staging/xaos/PKGBUILD deleted file mode 100644 index 1240d0b00..000000000 --- a/staging/xaos/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 146867 2012-01-19 00:03:29Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=xaos -pkgver=3.5 -pkgrel=5 -pkgdesc="A fast portable real-time interactive fractal zoomer" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/xaos/" -license=('GPL') -depends=('gsl' 'libpng' 'aalib') -options=('!makeflags') -install=xaos.install -source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch) -sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801' - '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../xaos-3.5-libpng15.patch - ./configure --prefix=/usr --with-gsl --with-aa-driver - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/xaos/xaos-3.5-libpng15.patch b/staging/xaos/xaos-3.5-libpng15.patch deleted file mode 100644 index beece8339..000000000 --- a/staging/xaos/xaos-3.5-libpng15.patch +++ /dev/null @@ -1,131 +0,0 @@ -http://code.google.com/p/gnuxaos/issues/detail?id=55 - ---- src/util/png.c -+++ src/util/png.c -@@ -3,6 +3,7 @@ - #include <aconfig.h> - #ifdef USE_PNG - #include <png.h> -+#include <zlib.h> - #endif - #include <stdlib.h> - #include <stdio.h> -@@ -31,6 +32,9 @@ - png_structp png_ptr; - png_infop info_ptr; - png_color palette[256]; -+ png_color_8 sig_bit; -+ int color_type; -+ int bit_depth; - volatile unsigned short a = 255; - volatile unsigned char *b = (volatile unsigned char *) &a; - #ifdef _undefined_ -@@ -59,7 +63,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - return "No memory to create png info structure"; - } -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(file); - return strerror(errno); -@@ -78,57 +82,70 @@ - png_set_compression_window_bits(png_ptr, 15); - png_set_compression_method(png_ptr, 8); - -- info_ptr->width = image->width; -- info_ptr->height = image->height; -- /*info_ptr->gamma=1.0; */ -- info_ptr->gamma = 0.5; -- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs; -- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth); -- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight); -+ switch (image->palette->type) -+ { -+ case C256: -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = image->bytesperpixel * 8; -+ break; -+ case SMALLITER: -+ case LARGEITER: -+ case GRAYSCALE: -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = image->bytesperpixel * 8; -+ break; -+ case TRUECOLOR: -+ case TRUECOLOR24: -+ case TRUECOLOR16: -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 8; -+ break; -+ } - -+ png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth, -+ color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, -+ PNG_FILTER_TYPE_BASE); - - switch (image->palette->type) { - case C256: - { - int i; -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- info_ptr->bit_depth = image->bytesperpixel * 8; -- info_ptr->palette = palette; -- info_ptr->valid |= PNG_INFO_PLTE; -+ png_color png_palette[257]; -+ int png_num_palette; - for (i = 0; i < image->palette->end; i++) -- info_ptr->palette[i].red = image->palette->rgb[i][0], -- info_ptr->palette[i].green = image->palette->rgb[i][1], -- info_ptr->palette[i].blue = image->palette->rgb[i][2], -- info_ptr->num_palette = image->palette->end; -+ png_palette[i].red = image->palette->rgb[i][0], -+ png_palette[i].green = image->palette->rgb[i][1], -+ png_palette[i].blue = image->palette->rgb[i][2], -+ png_num_palette = image->palette->end; -+ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette); - } - break; -- case SMALLITER: -- case LARGEITER: -- case GRAYSCALE: -- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -- info_ptr->bit_depth = image->bytesperpixel * 8; -- break; - case TRUECOLOR: - case TRUECOLOR24: - case TRUECOLOR16: -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -- info_ptr->bit_depth = 8; -- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec; -- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec; -- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec; -+ sig_bit.red = 8 - image->palette->info.truec.rprec; -+ sig_bit.green = 8 - image->palette->info.truec.gprec; -+ sig_bit.blue = 8 - image->palette->info.truec.bprec; -+ png_set_sBIT(png_ptr, info_ptr, &sig_bit); - break; - } -- info_ptr->interlace_type = 0; -+ -+ png_write_info (png_ptr, info_ptr); -+ - #ifdef _undefined_ - png_set_text(png_ptr, info_ptr, comments, - sizeof(comments) / sizeof(png_text)); - #endif - -- png_write_info(png_ptr, info_ptr); -+ png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */); -+ png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth), -+ (png_uint_32) (100 / image->pixelheight), -+ PNG_RESOLUTION_UNKNOWN); -+ - /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */ - png_set_packing(png_ptr); - if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16)) -- png_set_shift(png_ptr, &(info_ptr->sig_bit)); -+ png_set_shift (png_ptr, &sig_bit); - if (*b == 255) - png_set_swap(png_ptr); - png_set_bgr(png_ptr); diff --git a/staging/xaos/xaos.install b/staging/xaos/xaos.install deleted file mode 100644 index afee50a72..000000000 --- a/staging/xaos/xaos.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(xaos.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $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 $infodir/dir 2> /dev/null - done -} diff --git a/staging/xawtv/PKGBUILD b/staging/xawtv/PKGBUILD deleted file mode 100644 index d2db8af63..000000000 --- a/staging/xawtv/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 147176 2012-01-23 23:36:01Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=xawtv -pkgver=3.101 -pkgrel=2 -pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux" -arch=('i686' 'x86_64') -url="http://git.linuxtv.org/xawtv3.git" -license=('GPL') -depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm') -makedepends=('mesa') -source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2) -md5sums=('330ce1789595e370be34ad4cae3dc3fa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - autoconf - autoheader - ./configure --prefix=/usr --disable-motif --disable-quicktime - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/xfce4-datetime-plugin/PKGBUILD b/staging/xfce4-datetime-plugin/PKGBUILD deleted file mode 100644 index c4227bd32..000000000 --- a/staging/xfce4-datetime-plugin/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 146891 2012-01-19 03:56:41Z foutrelis $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Aurelien Foret <orelien@chez.com> - -pkgname=xfce4-datetime-plugin -pkgver=0.6.1 -pkgrel=2 -pkgdesc="A date and time display plugin for the Xfce panel" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://xfce-goodies.berlios.de/" -groups=('xfce4-goodies') -depends=('xfce4-panel>=4.7.4' 'libxfcegui4') -makedepends=('intltool') -options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e82f51ff0e75a63e5cbd139e43e094f9') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/xfce4-notes-plugin/PKGBUILD b/staging/xfce4-notes-plugin/PKGBUILD deleted file mode 100644 index ff9642b45..000000000 --- a/staging/xfce4-notes-plugin/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 146893 2012-01-19 03:57:20Z foutrelis $ -# Maintainer: Andreas Radke <andyrtr at archlinux.org> -# Contributor: Ben Mazer <contrasutra@myrealbox.com> - -pkgname=xfce4-notes-plugin -pkgver=1.7.7 -pkgrel=3 -pkgdesc="A notes plugin for the Xfce4 panel" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://xfce-goodies.berlios.de/" -groups=('xfce4-goodies') -depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'libunique' 'hicolor-icon-theme') -makedepends=('intltool') -options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2) -md5sums=('42b924b23f2fec6a1099e9b7a87db4a3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/xfce4-notes-plugin/xfce4-notes-plugin.install b/staging/xfce4-notes-plugin/xfce4-notes-plugin.install deleted file mode 100644 index fee9e5d11..000000000 --- a/staging/xfce4-notes-plugin/xfce4-notes-plugin.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - diff --git a/staging/xfce4-quicklauncher-plugin/PKGBUILD b/staging/xfce4-quicklauncher-plugin/PKGBUILD deleted file mode 100644 index 73de5a343..000000000 --- a/staging/xfce4-quicklauncher-plugin/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 146895 2012-01-19 03:58:10Z foutrelis $ -# Maintainer: -# Contributor: Tobias Kieslich <tobias (at) archlinux.org> - -pkgname=xfce4-quicklauncher-plugin -pkgver=1.9.4 -pkgrel=6 -pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://xfce-goodies.berlios.de/" -groups=('xfce4-goodies') -depends=('xfce4-panel>=4.7.4' 'libxfcegui4') -makedepends=('intltool') -options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.9/${pkgname}-${pkgver}.tar.bz2 - xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch - xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch - xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch - xfce4-quicklauncher-plugin-1.9.4-save-settings.patch - xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch) -md5sums=('299e17f196ecfa5fb018cf65abb19b56' - 'a7826c9f8199a2f1e914fd39b7f9e2bf' - '4ea4d06ab7284e78ddc4d60304f02cdf' - '5e8126c05def1211fb4a2a65f2812a1b' - '474237b205035214df1c723407251ade' - '9e7f789129b08c787978c7a72a55fae7') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - # Fedora patches - patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch - patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch - patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch - patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch - patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch deleted file mode 100644 index 907c1f23e..000000000 --- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- panel-plugin/quicklauncher.desktop.in.in.orig 2009-07-04 00:46:34.000000000 +0200 -+++ panel-plugin/quicklauncher.desktop.in.in 2009-07-04 00:46:51.000000000 +0200 -@@ -4,4 +4,6 @@ - _Name=Quicklauncher - _Comment=Program with several launchers - Icon=gnome-fs-executable --X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so -+X-XFCE-Module=quicklauncher -+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ -+X-XFCE-Unique=false diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch deleted file mode 100644 index 96f256770..000000000 --- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure ---- xfce4-quicklauncher-plugin-1.9.4/configure 2007-06-27 21:07:14.000000000 +0200 -+++ xfce4-quicklauncher-plugin-1.9.4.new/configure 2008-03-04 22:11:23.000000000 +0100 -@@ -21181,7 +21181,7 @@ - - - -- ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi" -+ ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi" - - - for ac_header in locale.h -diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po ---- xfce4-quicklauncher-plugin-1.9.4/po/en.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po 2008-03-04 22:10:58.000000000 +0100 -@@ -0,0 +1,87 @@ -+# English translation of xfce4-quicklauncher-plugin. -+# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the xfce4-quicklauncher-plugin package. -+# Jeff Bailes <thepizzaking@gmail.com>, 2007. -+# , fuzzy -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-quicklauncher-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-05-17 21:37+0200\n" -+"PO-Revision-Date: 2007-03-31 10:17+1000\n" -+"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n" -+"Language-Team: English\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit" -+ -+#: ../panel-plugin/callbacks.c:79 -+msgid "Configure Quicklauncher" -+msgstr "Configure Quicklauncher" -+ -+#: ../panel-plugin/callbacks.c:93 -+msgid "Lines: " -+msgstr "Lines: " -+ -+#: ../panel-plugin/callbacks.c:123 -+msgid "Espace entre les lanceurs :" -+msgstr "Space between launchers" -+ -+#: ../panel-plugin/callbacks.c:131 -+msgid "afficher les tooltips" -+msgstr "Show tooltips" -+ -+#: ../panel-plugin/callbacks.c:135 -+msgid "afficher les labels" -+msgstr "Show labels" -+ -+#: ../panel-plugin/callbacks.c:216 -+msgid "icone" -+msgstr "icon" -+ -+#: ../panel-plugin/callbacks.c:222 -+msgid "commande" -+msgstr "command" -+ -+#: ../panel-plugin/callbacks.c:228 -+msgid "nom" -+msgstr "name" -+ -+#: ../panel-plugin/callbacks.c:327 -+msgid "Open icon" -+msgstr "Open icon" -+ -+#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2 -+msgid "Quicklauncher" -+msgstr "Quicklauncher" -+ -+#: ../panel-plugin/main.c:166 -+msgid "Allows you to add launchers easily and display them on many lines." -+msgstr "Allows you to add launchers easily and display them on many lines." -+ -+#: ../panel-plugin/main.c:168 -+msgid "Other plugins available here" -+msgstr "Other plugins available here" -+ -+#: ../panel-plugin/main.c:320 -+msgid "Lock" -+msgstr "Lock" -+ -+#: ../panel-plugin/main.c:323 -+msgid "Parameters" -+msgstr "Parameters" -+ -+#: ../panel-plugin/main.c:326 -+msgid "Applications" -+msgstr "Applications" -+ -+#: ../panel-plugin/main.c:329 -+msgid "Help" -+msgstr "Help" -+ -+#: ../panel-plugin/quicklauncher.desktop.in.in.h:1 -+msgid "Program with several launchers" -+msgstr "Program with several launchers" -+ diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch deleted file mode 100644 index 9845ce122..000000000 --- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- panel-plugin/main.c.org 2008-05-13 09:29:29.000000000 -0600 -+++ panel-plugin/main.c 2008-05-13 09:29:33.000000000 -0600 -@@ -148,6 +148,7 @@ - t_qck_launcher_opt_dlg* dlg; - xfce_panel_plugin_block_menu(plugin); - dlg = create_qck_launcher_dlg(); -+ gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin)); - qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); - gtk_dialog_run(GTK_DIALOG(dlg->dialog)); - xfce_panel_plugin_unblock_menu(plugin); -@@ -160,6 +161,7 @@ - GtkWidget *about; - const gchar* authors[2] = {"Bountykiller <masse_nicolas@yahoo.fr>", NULL}; - about = gtk_about_dialog_new(); -+ gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin)); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher")); - gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL); - gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors); -@@ -461,7 +463,7 @@ - if(launcher->quicklauncher->_last_zoomed_launcher == launcher) - { - g_return_val_if_fail(launcher->clicked_img, FALSE); -- xfce_exec(launcher->command, FALSE, FALSE, NULL); -+ xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img); - } - else diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch deleted file mode 100644 index 85dd21729..000000000 --- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c -=================================================================== ---- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c (révision 3779) -+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c (révision 3780) -@@ -151,6 +151,7 @@ - gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin)); - qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); - gtk_dialog_run(GTK_DIALOG(dlg->dialog)); -+ quicklauncher_save(plugin, quicklauncher); - xfce_panel_plugin_unblock_menu(plugin); - } - diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch deleted file mode 100644 index 8314d7a3c..000000000 --- a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- panel-plugin/main.c.orig 2009-09-09 21:15:01.000000000 +0200 -+++ panel-plugin/main.c 2009-09-09 21:23:12.000000000 +0200 -@@ -320,7 +320,7 @@ - launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM, - NULL, quicklauncher); - quicklauncher_add_element(quicklauncher, launcher); -- launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS, -+ launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS, - NULL, quicklauncher); - quicklauncher_add_element(quicklauncher, launcher); - launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY, diff --git a/staging/xfce4-sensors-plugin/PKGBUILD b/staging/xfce4-sensors-plugin/PKGBUILD deleted file mode 100644 index de4048cec..000000000 --- a/staging/xfce4-sensors-plugin/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 146897 2012-01-19 03:58:55Z foutrelis $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Merk Matthias <macem@chello.at> - -pkgname=xfce4-sensors-plugin -pkgver=1.2.3 -pkgrel=3 -pkgdesc="A lm_sensors plugin for the Xfce panel" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" -groups=('xfce4-goodies') -depends=('xfce4-panel' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme') #'libxfcegui4' -makedepends=('pkgconfig' 'intltool' 'hddtemp>=0.3.beta15.45-2' 'gnu-netcat' 'xfce4-dev-tools') -optdepends=('gnu-netcat: for hddtemp access') -options=(!libtool !makeflags) -install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2edf376d140449ca42c4e4f591e626f8') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --datadir=/usr/share \ - --datarootdir=/usr/share \ - --disable-static \ - --with-pathhddtemp=/usr/sbin/hddtemp \ - --disable-debug - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install b/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install deleted file mode 100644 index 17ca8f78a..000000000 --- a/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/xfig/LICENSE b/staging/xfig/LICENSE deleted file mode 100644 index 5b38ccff8..000000000 --- a/staging/xfig/LICENSE +++ /dev/null @@ -1,33 +0,0 @@ -Excerpt of the README from xfig/transfig - legal notice: ---------------------------------------------------------------------------- - -THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, -INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -*************************************************************************** -NEW COPYRIGHT/PERMISSION NOTICE: - -The xfig copyright and permission notice has changed (again) slightly in -version 3.2.5. It now states that: - - FIG : Facility for Interactive Generation of figures - Copyright (c) 1985-1988 by Supoj Sutanthavibul - Parts Copyright (c) 1989-2002 by Brian V. Smith - Parts Copyright (c) 1991 by Paul King - - Any party obtaining a copy of these files is granted, free of charge, a - full and unrestricted irrevocable, world-wide, paid up, royalty-free, - nonexclusive right and license to deal in this software and documentation - files (the "Software"), including without limitation the rights to use, - copy, modify, merge, publish distribute, sublicense and/or sell copies of - the Software, and to permit persons who receive copies from any such - party to do so, with the only requirement being that the above copyright - and this permission notice remain intact. - -The license for 3.2.4 didn't allow selling xfig unless it was simply included in a -collection of programs (e.g. a CD) that one was selling. diff --git a/staging/xfig/PKGBUILD b/staging/xfig/PKGBUILD deleted file mode 100644 index 4314a549a..000000000 --- a/staging/xfig/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 146901 2012-01-19 04:44:44Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=xfig -pkgver=3.2.5b -pkgrel=6 -pkgdesc="An interactive drawing tool" -arch=('i686' 'x86_64') -url="http://www.xfig.org/userman/" -license=('custom') -depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'desktop-file-utils' 'gsfonts') -makedepends=('imake') -optdepends=('transfig: to use the frontend to convert fig files') -options=('!makeflags' '!emptydirs') -install=xfig.install -source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \ - xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \ - xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \ - xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \ - xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \ - xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop) -sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' - '926ad99c7221baa4aa9e9737722958860b2700fc' - 'b7c03fb70066ff476a4039a8c0f8930c15edef68' - '33bff26b42ce164e79de11808b5b34b363f0d59f' - 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' - '39bec6bac9746b643b05fd1286826113ede07ff6' - 'bd76cd50be6a5789cfd6f182309cfd7056be04f3' - 'a1285f4e61ad2eec040460ab03e8022098e7f78e' - '12a64ddaf65a73e23ef74f31483515a0e262768c' - '83032eb61c8dc96d5fc509a1ce632528457d4598' - '31edf4cfab708820ea3f114d095dfef5aa88e5aa' - '9011b8fa6143e37525b28cc9800a3bf2d6b008d2') - -build() { - cd "${srcdir}/${pkgname}.${pkgver}" - patch -p1 < ../xfig-3.2.4-redhat.patch - patch -p1 < ../xfig-3.2.5-fhs.patch - patch -p1 < ../xfig.3.2.5-modularX.patch - patch -p1 < ../xfig-3.2.5-enable-Xaw3d.patch - patch -p1 < ../xfig-3.2.5-color-resources.patch - patch -p1 < ../xfig-3.2.5-urwfonts.patch - patch -p1 < ../xfig-3.2.5-missing-protos.patch - patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch - patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch - chmod 755 Libraries - - xmkmf - make DOCDIR=/usr/share/doc -} - -package() { - cd "${srcdir}/${pkgname}.${pkgver}" - make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all - rm "${pkgdir}/usr/lib/X11/app-defaults" - - find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \; - find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \; - find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \; - find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \; - - install -D -m644 ../xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop" - install -D -m644 xfig.png "${pkgdir}/usr/share/pixmaps/xfig.png" - install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xfig/xfig-3.2.4-redhat.patch b/staging/xfig/xfig-3.2.4-redhat.patch deleted file mode 100644 index da6f150b3..000000000 --- a/staging/xfig/xfig-3.2.4-redhat.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xfig.3.2.4/Fig.ad.redhat 2002-12-19 01:05:41.000000000 +0100 -+++ xfig.3.2.4/Fig.ad 2003-05-06 11:45:15.000000000 +0200 -@@ -11,7 +11,7 @@ - Fig*AllowShellResize: false - - ! Image editor - can edit imported image --Fig.image_editor: xv -+Fig.image_editor: xdg-open - - ! name of ghostscript (not ghostview) - Fig.ghostscript: gs -@@ -20,16 +20,16 @@ - ! This is for viewing the xfig html reference. - ! For netscape, this command will open the help pages in a running netscape, - ! or start a new netscape if one isn't already running --Fig.browser: firefox -remote 'openFile(%f)' || firefox %f -+Fig.browser: xdg-open %f - - ! pdfviewer - put your favorite pdf viewer here. - ! This is for viewing the xfig how-to guide and man pages --Fig.pdfviewer: xpdf %f -+Fig.pdfviewer: xdg-open %f - - ! Spell check program - put your favorite spelling check program here. - ! It must write the misspelled words to standard output. - --Fig.spellcheckcommand: spell %f -+Fig.spellcheckcommand: aspell %f - - ! delay before spinner automatically counts when pressed (milliseconds) - Fig.spinner_delay: 1000 diff --git a/staging/xfig/xfig-3.2.5-color-resources.patch b/staging/xfig/xfig-3.2.5-color-resources.patch deleted file mode 100644 index 6cf1af906..000000000 --- a/staging/xfig/xfig-3.2.5-color-resources.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad ---- xfig.3.2.5/Fig-color.bisque.ad~ 2007-11-16 13:47:45.000000000 +0100 -+++ xfig.3.2.5/Fig-color.bisque.ad 2007-11-16 13:47:52.000000000 +0100 -@@ -93,7 +93,7 @@ Fig*sideruler.background: gray95 - Fig*topruler.background: gray95 - Fig*sideruler.background: gray95 - Fig*List*background: gray95 --Fig*Scrollbar.background: gray95 -+! Fig*Scrollbar.background: gray95 - - Fig*cancel.background: navajowhite1 - Fig*dismiss.background: navajowhite1 -@@ -104,8 +104,8 @@ Fig*menu_divider.foreground: red - Fig*menu_divider.foreground: red - - !##### Shadows --Fig*shadowWidth: 2 --Fig*Label.shadowWidth: 1 -+! Fig*shadowWidth: 2 -+! Fig*Label.shadowWidth: 1 - Fig*horizontal.shadowWidth: 2 - Fig*Scrollbar.shadowWidth: 2 - ! no shadows for update indicators -@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel: gray80 - - Fig*toggle*bottomShadowPixel: gray80 - Fig*toggle*topShadowPixel: gray50 -+ -+! repare damage done to scrollbar shadows non color resources file -+ -+Fig*horizontal.topShadowPixel: gray95 -+Fig*horizontal.bottomShadowPixel: gray50 -+Fig*horizontal.topShadow: gray95 -+Fig*horizontal.bottomShadow: gray50 -+ -+Fig*Scrollbar.topShadow: gray95 -+Fig*Scrollbar.bottomShadow: gray50 -+Fig*Scrollbar.topShadowPixel: gray95 -+Fig*Scrollbar.bottomShadowPixel: gray50 diff --git a/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch b/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch deleted file mode 100644 index f4d113808..000000000 --- a/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up xfig.3.2.5/Imakefile.no-Xaw3d xfig.3.2.5/Imakefile ---- xfig.3.2.5/Imakefile.no-Xaw3d 2007-11-16 10:38:18.000000000 +0100 -+++ xfig.3.2.5/Imakefile 2007-11-16 10:38:49.000000000 +0100 -@@ -50,8 +50,8 @@ XAPPLOADDIR = /usr/share/X11/app-default - XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has - XCOMM some new features, including "Tips", which replace xfig's "help balloons" - XCOMM NOTE: This is the default for many X systems now. - --XCOMM #define XAW3D1_5E -+#define XAW3D1_5E - - #ifdef XAW3D1_5E - DUSEXAW3D = -DXAW3D -DXAW3D1_5E -- XAWLIB = -lXaw3d15e -+ XAWLIB = -lXaw3d - #else - XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c - XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o diff --git a/staging/xfig/xfig-3.2.5-fhs.patch b/staging/xfig/xfig-3.2.5-fhs.patch deleted file mode 100644 index a17d908a7..000000000 --- a/staging/xfig/xfig-3.2.5-fhs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xfig.3.2.5/Imakefile.fhs 2006-10-11 01:19:22.000000000 +0200 -+++ xfig.3.2.5/Imakefile 2007-04-16 14:04:45.000000000 +0200 -@@ -169,8 +169,7 @@ - XFIGLIBDIR = $(LIBDIR)/xfig - - XCOMM XFIGDOCDIR tells where the html and pdf documentation should go --XCOMM XFIGDOCDIR = $(DOCDIR)/xfig --XFIGDOCDIR = /usr/local/xfig/doc -+XFIGDOCDIR = $(DOCDIR)/xfig - - XCOMM MANDIR tells where the standard man pages should go (no need to change it - XCOMM if you want the man pages installed in the standard place on your system diff --git a/staging/xfig/xfig-3.2.5-missing-protos.patch b/staging/xfig/xfig-3.2.5-missing-protos.patch deleted file mode 100644 index 181c52a69..000000000 --- a/staging/xfig/xfig-3.2.5-missing-protos.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c ---- xfig.3.2.5/u_draw.c~ 2008-04-03 15:58:23.000000000 +0200 -+++ xfig.3.2.5/u_draw.c 2008-04-03 15:58:23.000000000 +0200 -@@ -43,6 +43,7 @@ - #include "w_zoom.h" - #include "u_redraw.h" - #include "w_cursor.h" -+#include <X11/ImUtil.h> - - static Boolean add_point(int x, int y); - static void init_point_array(void); diff --git a/staging/xfig/xfig-3.2.5-urwfonts.patch b/staging/xfig/xfig-3.2.5-urwfonts.patch deleted file mode 100644 index 7bc766bd9..000000000 --- a/staging/xfig/xfig-3.2.5-urwfonts.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- xfig.3.2.4/u_fonts.c 2002-09-09 13:36:58.000000000 -0400 -+++ new-xfig-3.2.4/u_fonts.c 2006-10-11 00:29:07.000000000 -0400 -@@ -22,41 +22,41 @@ - /* X11 font names */ - - struct _xfstruct x_fontinfo[NUM_FONTS] = { -- {"-*-times-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-times-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-times-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-times-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL}, -- {"-*-bookman-light-r-normal--", (struct xfont*) NULL}, -- {"-*-bookman-light-i-normal--", (struct xfont*) NULL}, -- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL}, -- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL}, -- {"-*-courier-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-courier-medium-o-normal--", (struct xfont*) NULL}, -- {"-*-courier-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-courier-bold-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l condensed-medium-r-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l condensed-bold-i-condensed--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL}, - }; - - /* Use the following font names for any font that doesn't exist in the table above. diff --git a/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch b/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch deleted file mode 100644 index 7601d20ea..000000000 --- a/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c ---- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200 -+++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100 -@@ -252,12 +252,13 @@ - { - char buf[300]; - FILE *tmpfp, *pixfile, *gsfile; -- char *psnam, *driver; -+ char *driver; - int status, wid, ht, nbitmap, fd; - char tmpfile[PATH_MAX], - pixnam[PATH_MAX], - errnam[PATH_MAX], -- gscom[2 * PATH_MAX]; -+ gscom[2 * PATH_MAX], -+ psnam[PATH_MAX]; - - wid = urx - llx; - ht = ury - lly; -@@ -307,19 +308,14 @@ - /* for color, use pcx */ - driver = "pcx256"; - } -- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */ -- if (tmpfile[0] == '/') { -- psnam = strrchr(tmpfile, '/'); -- *psnam = 0; -- sprintf(gscom, "cd \"%s/\";", tmpfile); -- *psnam++ = '/'; /* Restore name for unlink() below */ -- } else { -- psnam = tmpfile; -- gscom[0] = '\0'; -+ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */ -+ if (!realpath(tmpfile, psnam)) { -+ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno)); -+ return False; - } -- sprintf(&gscom[strlen(gscom)], -- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1", -- appres.ghostscript, driver, wid, ht, pixnam, errnam); -+ sprintf(gscom, -+ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1", -+ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam); - if (appres.DEBUG) - fprintf(stderr,"calling: %s\n",gscom); - if ((gsfile = popen(gscom, "w")) == 0) { diff --git a/staging/xfig/xfig-3.2.5b-libpng-1.5.patch b/staging/xfig/xfig-3.2.5b-libpng-1.5.patch deleted file mode 100644 index 7d9c3f15e..000000000 --- a/staging/xfig/xfig-3.2.5b-libpng-1.5.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: xfig.3.2.5b/f_readpng.c -=================================================================== ---- xfig.3.2.5b.orig/f_readpng.c -+++ xfig.3.2.5b/f_readpng.c -@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic - } - - /* set long jump recovery here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - close_picfile(file,filetype); -@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, - &interlace_type, &compression_type, &filter_type); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); -- else -- png_set_gamma(png_ptr, 2.2, 0.45); -+ png_fixed_point gamma = 0.45; -+ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); -+ png_set_gamma(png_ptr, 2.2, gamma); - -- if (info_ptr->valid & PNG_INFO_bKGD) -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { - /* set the background to the one supplied */ -- png_set_background(png_ptr, &info_ptr->background, -+ png_color_16p background; -+ png_get_bKGD(png_ptr,info_ptr,&background); -+ png_set_background(png_ptr, background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); -+ } - else { - /* blend the canvas background using the alpha channel */ - background.red = x_bg_color.red >> 8; -@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic - - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { - png_get_hIST(png_ptr, info_ptr, &histogram); -+#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5 - png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); -+#else -+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); -+#endif - } - } - if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -Index: xfig.3.2.5b/f_wrpng.c -=================================================================== ---- xfig.3.2.5b.orig/f_wrpng.c -+++ xfig.3.2.5b/f_wrpng.c -@@ -20,6 +20,7 @@ - #include "w_msgpanel.h" - #include "w_setup.h" - #include <png.h> -+#include <zlib.h> - - /* - * Write PNG file from rgb data -@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat - } - - /* set long jump recovery here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_write_struct(&png_ptr, &info_ptr); - return False; diff --git a/staging/xfig/xfig.3.2.5-modularX.patch b/staging/xfig/xfig.3.2.5-modularX.patch deleted file mode 100644 index 3b5ac5937..000000000 --- a/staging/xfig/xfig.3.2.5-modularX.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- xfig.3.2.5/Imakefile.modularX 2007-04-16 14:27:49.000000000 +0200 -+++ xfig.3.2.5/Imakefile 2007-04-16 14:29:18.000000000 +0200 -@@ -45,7 +45,7 @@ - XCOMM different tree than the "correct" tree that your X system expects. The usual - XCOMM purpose of DESTDIR is to test an install process by installing in a benign area. - --XCOMM XAPPLOADDIR = /home/user/xfig -+XAPPLOADDIR = /usr/share/X11/app-defaults - - XCOMM Uncomment the following definition for XAW3D if you want to use - XCOMM the 3d Athena Widget Set (highly recommended!) -@@ -166,12 +166,12 @@ - XCOMM XFIGLIBDIR = $(LIBDIR) - - XCOMM use this if you want the multi-key data base file in the standard X11 tree --XFIGLIBDIR = $(LIBDIR)/xfig -+XFIGLIBDIR = /usr/share/xfig - - XCOMM XFIGDOCDIR tells where the html and pdf documentation should go - XFIGDOCDIR = $(DOCDIR)/xfig - - XCOMM MANDIR tells where the standard man pages should go (no need to change it - XCOMM if you want the man pages installed in the standard place on your system --MANDIR = $(MANSOURCEPATH)$(MANSUFFIX) -+MANDIR = /usr/share/man/man1 - XCOMM MANDIR = /usr/local/xfig/man - - XCOMM If your system doesn't have strstr undefine the following definition diff --git a/staging/xfig/xfig.desktop b/staging/xfig/xfig.desktop deleted file mode 100644 index c634a28e9..000000000 --- a/staging/xfig/xfig.desktop +++ /dev/null @@ -1,47 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Categories=Application;Graphics; -MimeType=image/fig;image/x-xfig; -Exec=xfig -Icon=xfig -Type=Application -Name=Xfig -Name[eo]=XDesegno -Name[et]=Ffig -Name[ja]=xfig -Name[no]=X-figur -Comment=Xfig drawing application -Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå -Comment[ca]=Aplicació de dibuix Xfig -Comment[cs]=Aplikace pro kreslení vektorových obrázků -Comment[da]=Xfig tegneprogram -Comment[de]=Xfig-Zeichenprogramm -Comment[el]=Xfig -Comment[eo]=Desegnilo "Xfig" -Comment[es]=Aplicación de diseño vectorial (objetos) -Comment[et]=XFig joonistusprogramm -Comment[fi]=Xfig vektoripiirto-ohjelma -Comment[fr]=Programme de dessin objet Xfig -Comment[gl]=Aplicación de debuxo (obxectos) -Comment[he]=Xfig רויצה םושיי -Comment[hr]=Program za crtanje -Comment[hu]=Rajzolóprogram -Comment[is]=Hlutbundið teikniforrit -Comment[it]=Applicazione di disegno Xfig -Comment[lt]=Xfig braižymo programa -Comment[mk]=Едноставна апликација за векторско цртање -Comment[nl]=Xfig-tekenprogramma -Comment[no]=Xfig-tegneprogram -Comment[no_NY]=Teikneprogrammet Xfig -Comment[pl]=Aplikacja do kreślenia -Comment[pt]=Aplicação de desenho -Comment[ro]=Program de desenare vectorială -Comment[ru]=Приложения для рисования векторной графики -Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov -Comment[sl]=Program za risanje Xfig -Comment[sr]=Xfig prgram za vektorsko crtanje -Comment[sv]=Xfig ritprogram -Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î -Comment[tr]=Xfig çizim uygulaması -Comment[uk]=Xfig -Comment[zh_CN.GB2312]=Xfig 绘图应用程序 diff --git a/staging/xfig/xfig.install b/staging/xfig/xfig.install deleted file mode 100644 index f01585f79..000000000 --- a/staging/xfig/xfig.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q - } - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/xine-ui/PKGBUILD b/staging/xine-ui/PKGBUILD deleted file mode 100644 index ac3016952..000000000 --- a/staging/xine-ui/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 146917 2012-01-19 05:44:29Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=xine-ui -pkgver=0.99.6 -pkgrel=5 -pkgdesc="A free video player for Unix" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.xine-project.org" -depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm' - 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' - 'desktop-file-utils' 'lirc-utils') -makedepends=('libxt') -options=('!strip') -install=xine-ui.install -source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz - lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch - fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch) -sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' - 'b2df43ede3a9d1a34b80139704a4cbbc7295c584' - '8bbd39f61de7b6991385457a4944b8ea104da88b' - '2361df9ddad59c426b0f863414c6d527b463a38a' - '9c70c6543dae6815710b239b4638ffe3843bac86' - 'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" - patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" - patch -p1 < "${srcdir}/fix_lirc.diff" - patch -p1 < "${srcdir}/xine-ui-xdg.diff" - patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch" - sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c - autoconf - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-x --enable-lirc --without-aalib --enable-debug - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install -} diff --git a/staging/xine-ui/fix_lirc.diff b/staging/xine-ui/fix_lirc.diff deleted file mode 100644 index 93890cb5c..000000000 --- a/staging/xine-ui/fix_lirc.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/m4/_xine.m4 b/m4/_xine.m4 ---- a/m4/_xine.m4 -+++ b/m4/_xine.m4 -@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC], - fi - for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do - AC_CHECK_FILE(["$llirc/liblirc_client.so"], -- [LIRC_LIBS="$llirc/liblirc_client.so"] -+ [LIRC_LIBS="$llirc/liblirc_client.so" -+ found_lirc=yes] - AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]), - AC_CHECK_FILE(["$llirc/liblirc_client.a"], - [LIRC_LIBS="$llirc/liblirc_client.a" diff --git a/staging/xine-ui/lirc-check-a89347673097.patch b/staging/xine-ui/lirc-check-a89347673097.patch deleted file mode 100644 index c1c8d2614..000000000 --- a/staging/xine-ui/lirc-check-a89347673097.patch +++ /dev/null @@ -1,64 +0,0 @@ - -# HG changeset patch -# User Darren Salt <linux@youmustbejoking.demon.co.uk> -# Date 1268754560 0 -# Node ID a89347673097053d89675e991ab403cda04d94cd -# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11 -Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing. - ---- a/m4/_xine.m4 Sun Mar 14 18:04:46 2010 +0000 -+++ b/m4/_xine.m4 Tue Mar 16 15:49:20 2010 +0000 -@@ -25,14 +25,14 @@ - dnl - AC_DEFUN([AC_CHECK_LIRC], - [AC_ARG_ENABLE(lirc, -- [ --disable-lirc Turn off LIRC support.], -- [], enable_lirc=yes) -+ [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])], -+ [given=Y], [given=N; enable_lirc=yes]) - - found_lirc=no - if test x"$enable_lirc" = xyes; then - have_lirc=yes -- PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], []) -- if test "$LIRC_CFLAGS" != ''; then -+ PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:]) -+ if test "$found_lirc" = yes; then - LIRC_INCLUDE="$LIRC_CFLAGS" - else - AC_REQUIRE_CPP -@@ -42,15 +42,20 @@ - - if test x"$LIRC_PREFIX" != "x"; then - lirc_libprefix="$LIRC_PREFIX/lib" -- LIRC_INCLUDE="-I$LIRC_PREFIX/include" -+ LIRC_INCLUDE="-I$LIRC_PREFIX/include" - fi - for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do -- AC_CHECK_FILE(["$llirc/liblirc_client.a"], -- [LIRC_LIBS="$llirc/liblirc_client.a" -- found_lirc=yes],,) -+ AC_CHECK_FILE(["$llirc/liblirc_client.so"], -+ [LIRC_LIBS="$llirc/liblirc_client.so"] -+ AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]), -+ AC_CHECK_FILE(["$llirc/liblirc_client.a"], -+ [LIRC_LIBS="$llirc/liblirc_client.a" -+ found_lirc=yes],,) -+ ) - done - else -- AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]); -+ test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available]) -+ AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]) - fi - fi - fi -@@ -59,7 +64,6 @@ - fi - AC_SUBST(LIRC_LIBS) - AC_SUBST(LIRC_INCLUDE) -- AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"]) - ]) - - dnl AC_C_ATTRIBUTE_ALIGNED - diff --git a/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch deleted file mode 100644 index daad4f03a..000000000 --- a/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# HG changeset patch -# User Darren Salt <linux@youmustbejoking.demon.co.uk> -# Date 1268758696 0 -# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514 -# Parent 882c464d4a650d09da37ade366face74452c1897 -Restore definition of HAVE_LIRC for use in makefiles. - ---- a/m4/_xine.m4 Mon Mar 15 12:03:01 2010 -0700 -+++ b/m4/_xine.m4 Tue Mar 16 16:58:16 2010 +0000 -@@ -62,6 +62,7 @@ - if test "$found_lirc" = yes; then - AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]) - fi -+ AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes]) - AC_SUBST(LIRC_LIBS) - AC_SUBST(LIRC_INCLUDE) - ]) - diff --git a/staging/xine-ui/xine-ui-0.99.6-libpng15.patch b/staging/xine-ui/xine-ui-0.99.6-libpng15.patch deleted file mode 100644 index 6a5fb5522..000000000 --- a/staging/xine-ui/xine-ui-0.99.6-libpng15.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c -=================================================================== ---- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c -+++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c -@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id, - png_destroy_read_struct(&png_ptr, NULL, NULL); - return NULL; - } -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; diff --git a/staging/xine-ui/xine-ui-xdg.diff b/staging/xine-ui/xine-ui-xdg.diff deleted file mode 100644 index 959d674b2..000000000 --- a/staging/xine-ui/xine-ui-xdg.diff +++ /dev/null @@ -1,206 +0,0 @@ ---- xine-ui-0.99.6.orig/src/xitk/common.h -+++ xine-ui-0.99.6/src/xitk/common.h -@@ -331,6 +331,5 @@ typedef struct { - int use_root_window; - - int ssaver_enabled; -- int ssaver_timeout; - - int skip_by_chapter; ---- xine-ui-0.99.6.orig/src/xitk/main.c -+++ xine-ui-0.99.6/src/xitk/main.c -@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) { - if (sigprocmask (SIG_BLOCK, &vo_mask, NULL)) - fprintf (stderr, "sigprocmask() failed.\n"); - -+ signal(SIGCHLD, SIG_IGN); -+ - gGui = (gGui_t *) calloc(1, sizeof(gGui_t)); - - gGui->stream = NULL; ---- xine-ui-0.99.6.orig/src/xitk/panel.c -+++ xine-ui-0.99.6/src/xitk/panel.c -@@ -356,7 +356,6 @@ void panel_update_runtime_display(void) - * Update slider thread. - */ - static void *slider_loop(void *dummy) { -- int screensaver_timer = 0; - int status, speed; - int pos, secs; - int i = 0; -@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) { - else - video_window_set_mrl((char *)gGui->mmk.mrl); - -- if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) { -- -- if(gGui->ssaver_timeout) { -- -- if(!(i % 2)) -- screensaver_timer++; -- -- if(screensaver_timer >= gGui->ssaver_timeout) { -- screensaver_timer = 0; -- video_window_reset_ssaver(); -- -- } -- } -- } -+ video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)); - - if(gGui->logo_mode == 0) { - -@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) { - stream_infos_update_infos(); - - } -+ } else { -+ video_window_suspend_ssaver(0); - } - } - ---- xine-ui-0.99.6.orig/src/xitk/videowin.c -+++ xine-ui-0.99.6/src/xitk/videowin.c -@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi - - /* The old window should be destroyed now */ - if(old_video_window != None) { -+ /* Screensaver control is tied to our window id */ -+ video_window_suspend_ssaver(0); -+ - XDestroyWindow(gGui->video_display, old_video_window); - - if(gGui->cursor_grabbed) -@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X - - } - --void video_window_reset_ssaver(void) { -+void video_window_suspend_ssaver(int do_suspend) { -+ static int was_suspended; - -- if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) { -+ do_suspend = do_suspend && gGui->ssaver_enabled; - --#ifdef HAVE_XTESTEXTENSION -- if(gVw.have_xtest == True) { -- -- gVw.fake_key_cur++; -- -- if(gVw.fake_key_cur >= 2) -- gVw.fake_key_cur = 0; -- -- XLockDisplay(gGui->video_display); -- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime); -- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime); -- XSync(gGui->video_display, False); -- XUnlockDisplay(gGui->video_display); -+ if(was_suspended != do_suspend) { -+ if(fork() == 0) { -+ char window_id[30]; -+ char *args[] = { "xdg-screensaver", NULL, window_id, NULL }; -+ int fd; -+ -+ for(fd = 3; fd < 256; fd++) -+ close(fd); -+ -+ args[1] = do_suspend ? "suspend" : "resume"; -+ sprintf(window_id, "%lu", (unsigned long)gGui->video_window); -+ execvp(args[0], args); -+ _exit(0); - } -- else --#endif -- { -- /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */ -- /* assuming its location and permission will not change during run time of xine-ui. */ -- { -- static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL }; -- static char *gssaver_path = NULL; -- -- if(!gssaver_path) { -- char *path = getenv("PATH"); -- -- if(!path) -- path = "/usr/local/bin:/usr/bin"; -- do { -- char *p, *pbuf; -- int plen; -- -- for(p = path; *path && *path != ':'; path++) -- ; -- if(p == path) -- plen = 1, p = "."; -- else -- plen = path - p; -- asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]); -- if ( access(pbuf, X_OK) ) { -- free(pbuf); -- gssaver_path = ""; -- } else -- gssaver_path = pbuf; -- } while(!gssaver_path[0] && *path++); -- } -- if(gssaver_path[0] && (fork() == 0)) { -- execv(gssaver_path, gssaver_args); -- exit(0); -- } -- } - -- XLockDisplay(gGui->video_display); -- XResetScreenSaver(gGui->video_display); -- XUnlockDisplay(gGui->video_display); -- } -+ was_suspended = do_suspend; - } - } - -+void video_window_reset_ssaver(void) { -+ video_window_suspend_ssaver(1); -+} -+ - void video_window_get_frame_size(int *w, int *h) { - if(w) - *w = gVw.frame_width; ---- xine-ui-0.99.6.orig/src/xitk/videowin.h -+++ xine-ui-0.99.6/src/xitk/videowin.h -@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag, - void video_window_update_logo(void); - void video_window_change_skins(int); - -+void video_window_suspend_ssaver(int do_suspend); - void video_window_reset_ssaver(void); - - void video_window_get_frame_size(int *w, int *h); ---- xine-ui-0.99.6.orig/src/xitk/event.c -+++ xine-ui-0.99.6/src/xitk/event.c -@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat - gGui->skip_by_chapter = cfg->num_value; - panel_update_nextprev_tips(); - } --static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) { -- gGui->ssaver_timeout = cfg->num_value; --} - - static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) { - -@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam - snapshot_loc_cb, - CONFIG_NO_DATA); - -- gGui->ssaver_timeout = -- xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10, -- _("Screensaver reset interval (s)"), -- _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."), -- CONFIG_LEVEL_ADV, -- ssaver_timeout_cb, -- CONFIG_NO_DATA); -- - gGui->skip_by_chapter = - xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1, - _("Chapter hopping"), - - - - - diff --git a/staging/xine-ui/xine-ui.install b/staging/xine-ui/xine-ui.install deleted file mode 100644 index 3b3aff7d9..000000000 --- a/staging/xine-ui/xine-ui.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/staging/xorg-xcursorgen/PKGBUILD b/staging/xorg-xcursorgen/PKGBUILD deleted file mode 100644 index 630794be0..000000000 --- a/staging/xorg-xcursorgen/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 147178 2012-01-24 01:21:47Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xcursorgen -pkgver=1.0.4 -pkgrel=3 -pkgdesc="Create an X cursor file from PNG images" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxcursor' 'libpng') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2) -sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a') - -build() { - cd "${srcdir}/xcursorgen-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/xcursorgen-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xsane/PKGBUILD b/staging/xsane/PKGBUILD deleted file mode 100644 index aa022720b..000000000 --- a/staging/xsane/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 147252 2012-01-25 03:22:07Z eric $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgbase=xsane -pkgname=('xsane' 'xsane-gimp') -pkgver=0.998 -pkgrel=2 -arch=(i686 x86_64) -url="http://www.xsane.org" -license=('GPL2') -makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp') -source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz - xsane-0.995-xdg-open.patch) -md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' - '15541ff0ddc10acfa2059cf99d5478eb') - -build() { - cd "$srcdir/$pkgbase-$pkgver" - # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora - patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" - sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c - - ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp - make - mv src/xsane src/xsane-gimp - - # build again with gimp enabled - make clean - ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp - make -} - -package_xsane() { - pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp." - install=$pkgname.install - depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg') - optdepends=('xsane-gimp: for gimp plugin support') - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install -} - -package_xsane-gimp() { - pkgdesc="XSane Gimp plugin" - depends=('xsane' 'gimp') - cd "$srcdir/$pkgbase-$pkgver" - install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp" - - ## For making Gimp Plugin available - /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" - cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" - /bin/ln -s ../../../../bin/xsane-gimp xsane - -# http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup -# when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, -# gentoo has something similar -#%post gimp -#107 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then -#108 %{_sbindir}/gimp-plugin-mgr --install xsane -#109 fi -#110 -#111 %preun gimp -#112 if [ $1 = 0 ]; then -#113 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then -#114 %{_sbindir}/gimp-plugin-mgr --uninstall xsane -#115 fi -#116 fi -} diff --git a/staging/xsane/xsane-0.995-xdg-open.patch b/staging/xsane/xsane-0.995-xdg-open.patch deleted file mode 100644 index db1f9bd68..000000000 --- a/staging/xsane/xsane-0.995-xdg-open.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h ---- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200 -+++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100 -@@ -251,7 +251,7 @@ - # elif defined(HAVE_OS2_H) - # define DEFAULT_BROWSER "netscape" - # else --# define DEFAULT_BROWSER "netscape" -+# define DEFAULT_BROWSER "xdg-open" - # endif - #endif - diff --git a/staging/xsane/xsane.install b/staging/xsane/xsane.install deleted file mode 100644 index aa3e3b8f8..000000000 --- a/staging/xsane/xsane.install +++ /dev/null @@ -1,16 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_install() { - echo "NOTE:" - echo " If you experience any problems after installing xsane " - echo " it may help to remove the setup and preferences files" - echo " of xsane:" - echo "" - echo " \$ rm -rf ~/.sane/xsane" - echo "" -} - -post_upgrade() { - post_install $1 -} diff --git a/staging/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch b/staging/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch deleted file mode 100644 index dc93a2e8a..000000000 --- a/staging/xulrunner/5007_fix_libpr0n_nsPNGDecoder.patch +++ /dev/null @@ -1,81 +0,0 @@ -# HG changeset patch -# User Glenn Randers-Pehrson <glennrp+bmo@gmail.com> -# Date 1320490106 0 -# Node ID aff1bd412058cb6926a8feae1e8c0fc76b4c04a3 -# Parent 8248dbffd64534fb6c65ad3d757b795119e783c6 -Bug 682677 - Eliminated direct access to mInfo->pixel_depth, which is not allowed in libpng15. We access pixel_depth via png_get_IHDR() instead; r=joedrew - -diff --git a/modules/libpr0n/decoders/nsICODecoder.cpp b/modules/libpr0n/decoders/nsICODecoder.cpp ---- a/modules/libpr0n/decoders/nsICODecoder.cpp -+++ b/modules/libpr0n/decoders/nsICODecoder.cpp -@@ -381,18 +381,17 @@ nsICODecoder::WriteInternal(const char* - return; - } - mPos += aCount; - aBuffer += aCount; - aCount = 0; - - // Raymond Chen says that 32bpp only are valid PNG ICOs - // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && -- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) { -+ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) { - PostDataError(); - } - return; - } - - // We've processed all of the icon dir entries and are within the - // bitmap info size - if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset && -diff --git a/modules/libpr0n/decoders/nsPNGDecoder.h b/modules/libpr0n/decoders/nsPNGDecoder.h ---- a/modules/libpr0n/decoders/nsPNGDecoder.h -+++ b/modules/libpr0n/decoders/nsPNGDecoder.h -@@ -68,29 +68,35 @@ public: - - void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset, - PRInt32 width, PRInt32 height, - gfxASurface::gfxImageFormat format); - void SetAnimFrameInfo(); - - void EndImageFrame(); - -- // Checks if the info header contains valid information -- bool HasValidInfo() const -+ // Check if PNG is valid ICO (32bpp RGBA) -+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -+ bool IsValidICO() const - { -- return mInfo && mInfo->valid; -- } -+ png_uint_32 -+ png_width, // Unused -+ png_height; // Unused - -- // Obtain the pixel depth if available or 0 otherwise -- PRInt32 GetPixelDepth() const -- { -- if (!mInfo) { -- return 0; -+ int png_bit_depth, -+ png_color_type; -+ -+ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth, -+ &png_color_type, NULL, NULL, NULL)) { -+ -+ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA && -+ png_bit_depth == 8); -+ } else { -+ return false; - } -- return mInfo->pixel_depth; - } - - public: - png_structp mPNG; - png_infop mInfo; - nsIntRect mFrameRect; - PRUint8 *mCMSLine; - PRUint8 *interlacebuf; - - diff --git a/staging/xulrunner/PKGBUILD b/staging/xulrunner/PKGBUILD deleted file mode 100644 index e67045542..000000000 --- a/staging/xulrunner/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 148014 2012-01-29 21:53:25Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -pkgname=xulrunner -pkgver=9.0.1 -pkgrel=2 -pkgdesc="Mozilla Runtime Environment" -arch=('i686' 'x86_64') -license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa') -url="http://wiki.mozilla.org/XUL:Xul_Runner" -source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2 - mozconfig - mozilla-pkgconfig.patch - 5007_fix_libpr0n_nsPNGDecoder.patch) -options=('!emptydirs') -replaces=('xulrunner-oss') -md5sums=('7cf2bd379792a9b232267c6a79680566' - '8dfb78c5bd0581c8cf4753813132bf0b' - '27271ce647a83906ef7a24605e840d61' - '6f3be4f4ac0217d0782b1a0770d80f28') - -build() { - cd "$srcdir/mozilla-release" - cp "$srcdir/mozconfig" .mozconfig - - #fix libdir/sdkdir - fedora - patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" - - patch -Np1 -i "$srcdir/5007_fix_libpr0n_nsPNGDecoder.patch" - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd "$srcdir/mozilla-release" - make -j1 -f client.mk DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" - - # add xulrunner library path to ld.so.conf - install -d $pkgdir/etc/ld.so.conf.d - echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf - - chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py" -} diff --git a/staging/xulrunner/mozconfig b/staging/xulrunner/mozconfig deleted file mode 100644 index 82a6ae512..000000000 --- a/staging/xulrunner/mozconfig +++ /dev/null @@ -1,38 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/staging/xulrunner/mozilla-pkgconfig.patch b/staging/xulrunner/mozilla-pkgconfig.patch deleted file mode 100644 index 037d4aee0..000000000 --- a/staging/xulrunner/mozilla-pkgconfig.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 -+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 -@@ -6,5 +6,6 @@ - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue -ldl - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in ---- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - idldir=%idldir% - -diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in ---- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 -@@ -108,6 +108,7 @@ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in ---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 -@@ -7,4 +7,4 @@ - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib %MOZ_JS_LINK% --Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE -+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/staging/zvbi/PKGBUILD b/staging/zvbi/PKGBUILD deleted file mode 100644 index 442df8b76..000000000 --- a/staging/zvbi/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 146940 2012-01-19 13:11:45Z giovanni $ -# Maintainer: -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=zvbi -pkgver=0.2.33 -pkgrel=4 -pkgdesc="VBI capture and decoding library" -url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" -arch=('i686' 'x86_64') -depends=('libpng' 'libx11') -license=('GPL') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2" - 'fix-includes.patch' - 'zvbi-0.2.33-libpng15.patch') -md5sums=('1741a6045c3eedfb611d645f2da69ac8' - '38766bc59e1571133d0399f0102da653' - '4434de7addc438be8c5a33274146bd11') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/fix-includes.patch" - patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch" - - ./configure --prefix=/usr \ - --disable-static \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/zvbi/fix-includes.patch b/staging/zvbi/fix-includes.patch deleted file mode 100644 index 28252649e..000000000 --- a/staging/zvbi/fix-includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add proper #includes so that we do not get undef errors to S_ISCHR -during linking. - -Signed-off-by: Alex Chiang <achiang@canonical.com> ---- ---- zvbi-0.2.33.orig/src/io-dvb.c -+++ zvbi-0.2.33/src/io-dvb.c -@@ -29,6 +29,8 @@ - #include <errno.h> - #include <sys/select.h> - #include <sys/ioctl.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #ifndef HAVE_S64_U64 - /* Linux 2.6.x asm/types.h defines __s64 and __u64 only ---- zvbi-0.2.33.orig/src/io-v4l.c -+++ zvbi-0.2.33/src/io-v4l.c -@@ -42,6 +42,7 @@ static const char rcsid [] = - #include <assert.h> - #include <sys/time.h> /* timeval */ - #include <sys/types.h> /* fd_set, uid_t */ -+#include <sys/stat.h> /* S_ISCHR */ - #include <sys/ioctl.h> /* for (_)videodev.h */ - #include <pthread.h> - ---- zvbi-0.2.33.orig/contrib/ntsc-cc.c -+++ zvbi-0.2.33/contrib/ntsc-cc.c -@@ -34,6 +34,7 @@ - #include <locale.h> - #include <sys/ioctl.h> - #include <sys/types.h> -+#include <sys/stat.h> - #include <sys/time.h> - #ifdef HAVE_GETOPT_LONG - # include <getopt.h> diff --git a/staging/zvbi/zvbi-0.2.33-libpng15.patch b/staging/zvbi/zvbi-0.2.33-libpng15.patch deleted file mode 100644 index 262677376..000000000 --- a/staging/zvbi/zvbi-0.2.33-libpng15.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: src/exp-gfx.c -=================================================================== -RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v -retrieving revision 1.16 -diff -u -B -r1.16 exp-gfx.c ---- src/exp-gfx.c 24 Feb 2008 14:17:47 -0000 1.16 -+++ src/exp-gfx.c 15 Feb 2011 20:03:58 -0000 -@@ -1672,11 +1672,11 @@ - char title[80]; - unsigned int i; - -- if (setjmp (png_ptr->jmpbuf)) -+ if (setjmp (png_jmpbuf(png_ptr))) - return FALSE; - - png_set_write_fn (png_ptr, -- (voidp) gfx, -+ (png_voidp) gfx, - write_data, - flush_data); - |
