diff options
Diffstat (limited to 'extra')
575 files changed, 154 insertions, 57876 deletions
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD deleted file mode 100644 index c712247d6..000000000 --- a/extra/abiword/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 173825 2012-12-24 15:09:23Z jgc $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Maël Lavault <moimael@neuf.fr> - -pkgbase=abiword -pkgname=('abiword' 'abiword-plugins') -pkgver=2.8.6 -pkgrel=8 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.abisource.com" -makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' - 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv') -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 - abiword-2.8.6-glib-2.31.patch) -md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' - '09446a2ebba8288fc611e88f7cf17298' - '42e2614b6e0aad457d91f6ce20b6f225' - '40e370e7e88c5437140ef18037abfbd3' - '6ec338a27a6fb590c348724ddb545849') - -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" - - # Fix build with recent glib, patch from Gentoo - patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.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' 'goffice0.8' '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/extra/abiword/abiword-2.8.6-glib-2.31.patch b/extra/abiword/abiword-2.8.6-glib-2.31.patch deleted file mode 100644 index 8b938cc25..000000000 --- a/extra/abiword/abiword-2.8.6-glib-2.31.patch +++ /dev/null @@ -1,40 +0,0 @@ ------------------------------------------------------------------------- -r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines -Changed paths: - M /abiword/trunk/src/af/util/xp/ut_go_file.h - -Bug 13197: only import glib.h -Patch by Dominique Leuenberger. ------------------------------------------------------------------------- -r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines -Changed paths: - M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h - -Bug 13247 - Fix glib headers. Patch by Funda Wang -(safe to backport) ------------------------------------------------------------------------- -Index: src/af/util/xp/ut_go_file.h -=================================================================== ---- src/af/util/xp/ut_go_file.h (revision 30478) -+++ src/af/util/xp/ut_go_file.h (revision 30479) -@@ -31,7 +31,6 @@ - - #include <glib.h> - #include <gsf/gsf.h> --#include <glib/gerror.h> - #include <time.h> - - G_BEGIN_DECLS -Index: goffice-bits/goffice/app/goffice-app.h -=================================================================== ---- goffice-bits/goffice/app/goffice-app.h (revision 30601) -+++ goffice-bits/goffice/app/goffice-app.h (revision 30602) -@@ -22,7 +22,7 @@ - #ifndef GOFFICE_APP_H - #define GOFFICE_APP_H - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - diff --git a/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch deleted file mode 100644 index 7eded4c83..000000000 --- a/extra/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/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch deleted file mode 100644 index c07000edb..000000000 --- a/extra/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/extra/abiword/abiword.install b/extra/abiword/abiword.install deleted file mode 100644 index 2eaa60550..000000000 --- a/extra/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/extra/abiword/compat_libwpg_0_9.patch b/extra/abiword/compat_libwpg_0_9.patch deleted file mode 100644 index cf36e188e..000000000 --- a/extra/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/extra/abs/PKGBUILD b/extra/abs/PKGBUILD deleted file mode 100644 index 26ab5ebca..000000000 --- a/extra/abs/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 166403 2012-09-07 16:50:29Z dreisner $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=abs -pkgver=2.4.4 -pkgrel=1 -pkgdesc="Utilities to download and work with the Arch Build System (ABS)" -arch=('i686' 'x86_64') -url="http://projects.archlinux.org/abs.git/" -license=('GPL') -depends=('bash' 'rsync') -backup=(etc/abs.conf) -source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' - 'a628f7d5b1cd1e838366b88709690c24') - -build() { - cd "$pkgname-$pkgver" - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install - - # Add readme file, and make base /var/abs path - install -dm755 "${pkgdir}"/var/abs/local/ - install -Dm644 README "${pkgdir}"/var/abs/README - - # make adjustments to abs.conf - if [[ $CARCH = "i686" ]]; then - sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf - fi - if [[ $CARCH = "x86_64" ]]; then - sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf - fi -} diff --git a/extra/accountsservice/32bit-crash.patch b/extra/accountsservice/32bit-crash.patch deleted file mode 100644 index 87b5d308e..000000000 --- a/extra/accountsservice/32bit-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4d5166d1833e42d81b854374aa6e73f83a67a70e Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Tue, 27 Nov 2012 23:30:45 +0000 -Subject: Fix a crash on 32bit systems - -The login-frequency property of the User interface is defined -as uint64 type. Therefore, when setting it with g_object_set, -a 64bit value is collected, and passing an int might lead to -bad things. -https://bugs.freedesktop.org/show_bug.cgi?id=57343 ---- -diff --git a/src/daemon.c b/src/daemon.c -index ed3a114..4d6f3ab 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -207,7 +207,7 @@ daemon_local_user_is_excluded (Daemon *daemon, const gchar *username, const gcha - #ifdef HAVE_UTMPX_H - - typedef struct { -- int frequency; -+ guint64 frequency; - gint64 time; - GList *previous_logins; - } UserAccounting; --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/alsa-firmware/PKGBUILD b/extra/alsa-firmware/PKGBUILD deleted file mode 100644 index 00df415a4..000000000 --- a/extra/alsa-firmware/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 158602 2012-05-05 02:35:11Z dreisner $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com> -pkgname=alsa-firmware -pkgver=1.0.25 -pkgrel=2 -pkgdesc="ALSA firmware package" -arch=('i686' 'x86_64') -url="http://alsa-project.org/" -license=('GPL') -source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2) -options=(!strip) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-hotplug-dir=/usr/lib/firmware - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # remove files which conflicts with linux-firmware - rm -rf ${pkgdir}/usr/lib/firmware/{ess,korg,sb16,yamaha} - # remove broken symlinks (broken upstream) - rm -rf ${pkgdir}/usr/lib/firmware/turtlebeach - # remove empty dir - rm -rf ${pkgdir}/usr/bin -} -md5sums=('f1939da45b162c83a726c54a470ef139') diff --git a/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch deleted file mode 100644 index 602fe47f5..000000000 --- a/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp ---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:12:22.000000000 +0300 -+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:14:56.000000000 +0300 -@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run() - foreach( Meta::TrackPtr track, m_tracks ) - { - //TODO replace with "avformat_open_input" since av_open_input_file is deprecated -- if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) ) -+ if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) ) - { - warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile(); - continue; -@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run() - } - - --#include "MusicDNSAudioDecoder.moc" -\ No newline at end of file -+#include "MusicDNSAudioDecoder.moc" diff --git a/extra/amarok/contextviewfix.patch b/extra/amarok/contextviewfix.patch deleted file mode 100644 index 2363b623c..000000000 --- a/extra/amarok/contextviewfix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp -index a23305f..8fa6f9b 100644 ---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp -+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp -@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry() - if(!view()) - return; - -- QRectF rect = view()->sceneRect(); -+ // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895 -+ QRectF rect( view()->pos(), view()->maximumViewportSize() ); - setGeometry( rect ); - m_applets->setGeometry( rect ); - m_applets->refresh();
\ No newline at end of file diff --git a/extra/amarok/toolbarfix.patch b/extra/amarok/toolbarfix.patch deleted file mode 100644 index ec012ca74..000000000 --- a/extra/amarok/toolbarfix.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp ---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp 2012-01-29 20:20:01.901360205 +0100 -@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P - } - } - -+void Context::AppletToolbar::setContainment( Containment * containment ) -+{ -+ m_cont = containment; -+} -+ -+Context::Containment * -+Context::AppletToolbar::containment() const -+{ -+ return m_cont; -+} -+ - QSizeF - Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const - { -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej -diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h ---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h 2012-01-29 20:17:52.414686784 +0100 -@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi - - void appletRemoved( Plasma::Applet* applet ); - -+ void setContainment( Containment * containment ); -+ Containment* containment() const; -+ - signals: - void showApplet( Plasma::Applet* ); - void appletAddedToToolbar( Plasma::Applet* applet, int loc ); -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig -diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp ---- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/ToolbarView.cpp 2012-01-29 20:17:52.394686782 +0100 -@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm - setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - - // now we create the toolbar -- m_toolbar = new AppletToolbar( containment ); -+ m_toolbar = new AppletToolbar(0); -+ scene->addItem(m_toolbar.data()); -+ m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) ); - m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 ); - m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 ); - -@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm - - Context::ToolbarView::~ToolbarView() - { -- -+ delete m_toolbar.data(); - } - - void -Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig diff --git a/extra/apache/pcre_info.patch b/extra/apache/pcre_info.patch deleted file mode 100644 index 906a3159e..000000000 --- a/extra/apache/pcre_info.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- httpd-2.2.22/server/util_pcre.c 2005-11-10 16:20:05.000000000 +0100 -+++ httpd-2.2.22/server/util_pcre.c 2012-02-08 11:23:56.273855663 +0100 -@@ -128,6 +128,7 @@ - const char *errorptr; - int erroffset; - int options = 0; -+int nsub; - - if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS; - if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE; -@@ -136,8 +137,9 @@ - preg->re_erroffset = erroffset; - - if (preg->re_pcre == NULL) return AP_REG_INVARG; -- --preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); -+pcre_fullinfo((const pcre *)preg->re_pcre, NULL, -+ PCRE_INFO_CAPTURECOUNT, &nsub); -+preg->re_nsub = nsub; - return 0; - } - diff --git a/extra/audacious-plugins/PKGBUILD b/extra/audacious-plugins/PKGBUILD deleted file mode 100644 index f9625a77f..000000000 --- a/extra/audacious-plugins/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 173108 2012-12-11 04:47:03Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=audacious-plugins -pkgver=3.3.3 -pkgrel=1 -pkgdesc='Plugins for Audacious' -url='http://audacious-media-player.org/' -license=('custom:BSD' 'GPL') -arch=('i686' 'x86_64') - -makedepends=("audacious>=${pkgver}" - 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' - 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' - 'libnotify' 'lirc-utils' 'curl' 'libmtp' - 'neon' 'libmms' 'libcue') - -optdepends=('oss: Open Sound System v4 output' - 'alsa-lib: Advanced Linux Sound Arch. output' - 'pulseaudio: PulseAudio output' - 'jack2: Jack Audio Connection Kit output' - 'lame: FileWriter MP3 output' - 'libvorbis: Vorbis input, FileWriter Vorbis output' - 'flac: FLAC input, FileWriter FLAC output' - - 'mpg123: MP3 input' - 'faad2: AAC input' - 'ffmpeg: ffaudio input' - 'libmodplug: modplug input' - 'fluidsynth: MIDI FluidSynth backend input' - 'libcdio: CD Digital Audio input' - 'libsidplay: Commodore 64 audio input' - 'wavpack: WavPack input' - - 'libnotify: libnotify OSD' - 'lirc-utils: LIRC' - 'curl: AudioScrobbler Client' - 'libmtp: Upload to MTP device' - - 'neon: neon-based http transport' - 'libmms: libmms-based mms transport' - 'libcue: CUE playlist format') - -source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --enable-amidiplug \ - --disable-adplug \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/avahi/gnome-nettool.png b/extra/avahi/gnome-nettool.png Binary files differdeleted file mode 100644 index 227d0678a..000000000 --- a/extra/avahi/gnome-nettool.png +++ /dev/null diff --git a/extra/avfs/PKGBUILD b/extra/avfs/PKGBUILD deleted file mode 100644 index 385fcc403..000000000 --- a/extra/avfs/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 166454 2012-09-08 02:48:18Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: K. Piche <kpiche@rogers.com> - -pkgname=avfs -pkgver=1.0.1 -pkgrel=1.1 -pkgdesc="A virtual filesystem that allows browsing of compressed files" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL') -url="http://avf.sourceforge.net/" -depends=('fuse' 'xz' 'perl') -options=('!emptydirs' '!libtool') -source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2{,.asc}) -md5sums=('f0f254d092e54da14bbf3ea22b76da99' - 'd71607de21819f3d67246473f0bc21f3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-library \ - --enable-fuse \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/avfs/avfs-1.0.0-fix_open_missing_mode.patch b/extra/avfs/avfs-1.0.0-fix_open_missing_mode.patch deleted file mode 100644 index 1e4a0a4d8..000000000 --- a/extra/avfs/avfs-1.0.0-fix_open_missing_mode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/urar.c 2007-05-14 20:21:23.000000000 +0200 -+++ b/modules/urar.c 2009-02-09 13:48:56.780225932 +0100 -@@ -587,7 +587,7 @@ - if(res < 0) - return res; - -- fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC); -+ fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC, 0644); - if(fd == -1) { - res = -errno; - av_log(AVLOG_ERROR, "RAR: Could not open %s: %s", tmpfile, diff --git a/extra/avogadro/fix-boost.patch b/extra/avogadro/fix-boost.patch deleted file mode 100644 index 8fb53ef12..000000000 --- a/extra/avogadro/fix-boost.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000 -+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000 -@@ -149,7 +149,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000 -+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000 -@@ -11,7 +11,7 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --QT4_WRAP_CPP(MOC_SRCS moleculelist.h) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) ---- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000 -+++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000 -@@ -18,7 +18,7 @@ - # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp - # We should probably scan the header to verify the Q_OBJECT macro is used - string(REPLACE ".cpp" ".h" hdr_list "${src_list}") -- qt4_wrap_cpp(moc_files ${hdr_list}) -+ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - # Now sort out the ui and qrc files, process them as appropriate - set(ui_plugin_files) - set(qrc_plugin_files) diff --git a/extra/avogadro/fix-opengl-headers.patch b/extra/avogadro/fix-opengl-headers.patch deleted file mode 100644 index e6e8bc3b5..000000000 --- a/extra/avogadro/fix-opengl-headers.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/camera.cpp~ 2012-02-27 18:35:52.109999585 +0000 -+++ avogadro-1.0.3/libavogadro/src/camera.cpp 2012-02-27 18:36:27.103053453 +0000 -@@ -25,6 +25,8 @@ - #include "camera.h" - #include "glwidget.h" - #include <avogadro/molecule.h> -+#include <Eigen/LU> -+#include <GL/glu.h> - - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~ 2012-02-27 18:37:28.535894209 +0000 -+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp 2012-02-27 18:37:46.912413557 +0000 -@@ -42,6 +42,7 @@ - #include <QColor> - #include <QVarLengthArray> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~ 2012-02-27 18:37:55.099014598 +0000 -+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp 2012-02-27 18:38:30.805395066 +0000 -@@ -70,6 +70,8 @@ - - #include <openbabel/mol.h> - -+#include <GL/glu.h> -+ - using namespace OpenBabel; - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~ 2012-02-27 18:36:53.646173944 +0000 -+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp 2012-02-27 18:37:10.739370227 +0000 -@@ -36,6 +36,7 @@ - #include <QFile> - #include <QDebug> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~ 2012-02-27 18:38:47.491928000 +0000 -+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp 2012-02-27 18:39:05.735115136 +0000 -@@ -44,6 +44,8 @@ - #include <QComboBox> - #include <QDebug> - -+#include <GL/glu.h> -+ - using namespace std; - using namespace OpenBabel; - using namespace Eigen; diff --git a/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch deleted file mode 100644 index 11f58a505..000000000 --- a/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch +++ /dev/null @@ -1,778 +0,0 @@ -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 -@@ -75,6 +75,42 @@ - zmatrix.h - ) - -+SET(libavogadro_MOC_HDRS -+ animation.h -+ atom.h -+ bond.h -+ color.h -+ colorbutton.h -+ colors/elementcolor.h -+ cube.h -+ elementdetail_p.h -+ elementtranslator.h -+ engine.h -+ engines/bsdyengine.h -+ extension.h -+ fragment.h -+ glwidget.h -+ mesh.h -+ molecule.h -+ moleculefile.h -+ moleculefile_p.h -+ periodictablescene_p.h -+ periodictableview.h -+ plotwidget.h -+ plugin.h -+ pluginmanager.h -+ primitive.h -+ protein.h -+ pythonengine_p.h -+ pythonerror.h -+ pythonextension_p.h -+ pythontool_p.h -+ residue.h -+ tool.h -+ toolgroup.h -+ zmatrix.h -+) -+ - set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) - # Also add in the qtiocompressor class - #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) -@@ -113,7 +148,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --qt4_automoc(${libavogadro_SRCS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) -@@ -149,7 +184,7 @@ - COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") - endforeach(headerFile ${libavogadro_HDRS}) - --add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) -+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) - set_target_properties(avogadro - PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) - target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp ---- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 -@@ -224,5 +224,3 @@ - } - - } // end namespace Avogadro -- --#include "animation.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp ---- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 -@@ -293,5 +293,3 @@ - } - - } // End namespace Avogadro -- --#include "atom.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp ---- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 -@@ -166,5 +166,3 @@ - } - - } // End namespace Avogadro -- --#include "bond.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp ---- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 -@@ -152,5 +152,3 @@ - return "Generic Color"; - } - } -- --#include "color.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp ---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 -@@ -94,5 +94,3 @@ - } - - } // end namespace -- --#include "colorbutton.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp ---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 -@@ -63,7 +63,5 @@ - - } - --#include "elementcolor.moc" - //this is a static color plugin... - //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp ---- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 -@@ -322,5 +322,3 @@ - } - - } // End namespace Avogadro -- --#include "cube.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp ---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 -@@ -132,5 +132,3 @@ - } - - } // End namespace Avogadro -- --#include "elementdetail_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp ---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 -@@ -401,5 +401,3 @@ - } - - } // End namespace Avogadro -- --#include "elementtranslator.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp ---- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 -@@ -377,5 +377,3 @@ - return m_molecule->bonds(); - } - } -- --#include "engine.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp ---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 -@@ -442,7 +442,5 @@ - } - - } -- --#include "bsdyengine.moc" - // This is a static engine... - // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp ---- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 -@@ -80,5 +80,3 @@ - } - - } -- --#include "extension.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp ---- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 -@@ -82,5 +82,3 @@ - } - - } // End namespace Avogadro -- --#include "fragment.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 -@@ -1966,5 +1966,3 @@ - d->updateCache = true; - } - } -- --#include "glwidget.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp ---- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 -@@ -231,5 +231,3 @@ - } - - } // End namespace Avogadro -- --#include "mesh.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp ---- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 -@@ -1575,5 +1575,3 @@ - } - - } // End namespace Avogadro -- --#include "molecule.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp ---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 -@@ -22,23 +22,14 @@ - 02110-1301, USA. - **********************************************************************/ - --#include "moleculefile.h" -+#include "moleculefile_p.h" - - #include <avogadro/molecule.h> - --#include <QFile> - #include <QFileInfo> --#include <QStringList> --#include <QThread> - #include <QDebug> - #include <QPointer> - --#include <openbabel/mol.h> --#include <openbabel/obconversion.h> -- --// Included in obconversion.h --//#include <iostream> -- - namespace Avogadro { - - using OpenBabel::OBConversion; -@@ -578,164 +569,6 @@ - return false; - } - -- class ReadFileThread : public QThread -- { -- // Q_OBJECT -- -- public: -- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -- { -- } -- -- void addConformer(const OpenBabel::OBMol &conformer) -- { -- unsigned int numAtoms = conformer.NumAtoms(); -- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -- for (unsigned int i = 0; i < numAtoms; ++i) -- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -- m_moleculeFile->m_conformers.push_back(coords); -- } -- -- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -- { -- if (!c) { -- // this is the first molecule read -- m_moleculeFile->setConformerFile(true); -- addConformer(current); -- return; -- } -- -- if (!m_moleculeFile->isConformerFile()) -- return; -- -- // as long as we are not sure if this really is a -- // conformer/trajectory file, add the conformers -- addConformer(current); -- -- // performance: check only certain molecule 1-10,20,50 -- switch (c) { -- case 1: -- case 2: -- case 3: -- case 4: -- case 5: -- case 6: -- case 7: -- case 8: -- case 9: -- case 10: -- case 20: -- case 50: -- break; -- default: -- return; -- } -- -- if (first.NumAtoms() != current.NumAtoms()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- -- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- } -- } -- -- void run() -- { -- // Check that the file can be read from disk -- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -- // Cannot read the file -- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- -- // Construct the OpenBabel objects, set the file type -- OpenBabel::OBConversion conv; -- OpenBabel::OBFormat *inFormat; -- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -- // Input format not supported -- m_moleculeFile->m_error.append( -- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -- return; -- } else { -- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -- if (!inFormat || !conv.SetInFormat(inFormat)) { -- // Input format not supported -- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- } -- -- // set any options -- if (!m_moleculeFile->m_fileOptions.isEmpty()) { -- foreach(const QString &option, -- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -- } -- } -- -- // Now attempt to read the molecule in -- ifstream ifs; -- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -- if (!ifs) // Should not happen, already checked file could be opened -- return; -- -- // read all molecules -- OpenBabel::OBMol firstOBMol, currentOBMol; -- unsigned int c = 0; -- conv.SetInStream(&ifs); -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- while (ifs.good() && conv.Read(¤tOBMol)) { -- if (!c) -- firstOBMol = currentOBMol; -- -- if (c > 20 && !m_moleculeFile->isConformerFile()) -- m_moleculeFile->setFirstReady(true); -- -- // detect conformer/trajectory files -- detectConformers(c, firstOBMol, currentOBMol); -- // store information about molecule -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -- // increment count -- ++c; -- } -- m_moleculeFile->streamposRef().pop_back(); -- -- // signle molecule files are not conformer files -- if (c == 1) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- } -- -- // check for empty titles -- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -- if (!m_moleculeFile->titlesRef()[i].isEmpty()) -- continue; -- -- QString title; -- if (m_moleculeFile->isConformerFile()) -- title = tr("Conformer %1").arg(i+1); -- else -- title = tr("Molecule %1").arg(i+1); -- -- m_moleculeFile->titlesRef()[i] = title; -- } -- } -- -- MoleculeFile *m_moleculeFile; -- }; // end ReadFileThread class -- - MoleculeFile* MoleculeFile::readFile(const QString &fileName, - const QString &fileType, const QString &fileOptions, bool wait) - { -@@ -794,6 +627,3 @@ - } - - } // end namespace Avogadro -- --#include "moleculefile.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h ---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 -@@ -0,0 +1,202 @@ -+/********************************************************************** -+ MoleculeFile - Class representing molecule file. -+ -+ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch -+ -+ This file is part of the Avogadro molecular editor project. -+ For more information, see <http://avogadro.openmolecules.net/> -+ -+ Avogadro 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. -+ -+ Avogadro is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301, USA. -+ **********************************************************************/ -+ -+#ifndef MOLECULEFILE_P_H -+#define MOLECULEFILE_P_H -+ -+#include "moleculefile.h" -+ -+#include <openbabel/mol.h> -+#include <openbabel/obconversion.h> -+ -+#include <QFile> -+#include <QStringList> -+#include <QThread> -+ -+namespace Avogadro { -+ -+ using OpenBabel::OBConversion; -+ using std::ifstream; -+ -+class ReadFileThread : public QThread -+{ -+ Q_OBJECT -+ -+ public: -+ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -+ { -+ } -+ -+ void addConformer(const OpenBabel::OBMol &conformer) -+ { -+ unsigned int numAtoms = conformer.NumAtoms(); -+ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -+ for (unsigned int i = 0; i < numAtoms; ++i) -+ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -+ m_moleculeFile->m_conformers.push_back(coords); -+ } -+ -+ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -+ { -+ if (!c) { -+ // this is the first molecule read -+ m_moleculeFile->setConformerFile(true); -+ addConformer(current); -+ return; -+ } -+ -+ if (!m_moleculeFile->isConformerFile()) -+ return; -+ -+ // as long as we are not sure if this really is a -+ // conformer/trajectory file, add the conformers -+ addConformer(current); -+ -+ // performance: check only certain molecule 1-10,20,50 -+ switch (c) { -+ case 1: -+ case 2: -+ case 3: -+ case 4: -+ case 5: -+ case 6: -+ case 7: -+ case 8: -+ case 9: -+ case 10: -+ case 20: -+ case 50: -+ break; -+ default: -+ return; -+ } -+ -+ if (first.NumAtoms() != current.NumAtoms()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ -+ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -+ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -+ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -+ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ } -+ } -+ -+ void run() -+ { -+ // Check that the file can be read from disk -+ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -+ // Cannot read the file -+ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ -+ // Construct the OpenBabel objects, set the file type -+ OpenBabel::OBConversion conv; -+ OpenBabel::OBFormat *inFormat; -+ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -+ // Input format not supported -+ m_moleculeFile->m_error.append( -+ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -+ return; -+ } else { -+ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -+ if (!inFormat || !conv.SetInFormat(inFormat)) { -+ // Input format not supported -+ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ } -+ -+ // set any options -+ if (!m_moleculeFile->m_fileOptions.isEmpty()) { -+ foreach(const QString &option, -+ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -+ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -+ } -+ } -+ -+ // Now attempt to read the molecule in -+ ifstream ifs; -+ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -+ if (!ifs) // Should not happen, already checked file could be opened -+ return; -+ -+ // read all molecules -+ OpenBabel::OBMol firstOBMol, currentOBMol; -+ unsigned int c = 0; -+ conv.SetInStream(&ifs); -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ while (ifs.good() && conv.Read(¤tOBMol)) { -+ if (!c) -+ firstOBMol = currentOBMol; -+ -+ if (c > 20 && !m_moleculeFile->isConformerFile()) -+ m_moleculeFile->setFirstReady(true); -+ -+ // detect conformer/trajectory files -+ detectConformers(c, firstOBMol, currentOBMol); -+ // store information about molecule -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -+ // increment count -+ ++c; -+ } -+ m_moleculeFile->streamposRef().pop_back(); -+ -+ // signle molecule files are not conformer files -+ if (c == 1) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ } -+ -+ // check for empty titles -+ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -+ if (!m_moleculeFile->titlesRef()[i].isEmpty()) -+ continue; -+ -+ QString title; -+ if (m_moleculeFile->isConformerFile()) -+ title = tr("Conformer %1").arg(i+1); -+ else -+ title = tr("Molecule %1").arg(i+1); -+ -+ m_moleculeFile->titlesRef()[i] = title; -+ } -+ } -+ -+ MoleculeFile *m_moleculeFile; -+}; -+ -+} // end namespace Avogadro -+ -+#endif // MOLECULEFILE_P_H -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp ---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -213,5 +213,3 @@ - } - - } // End namespace Avogadro -- --#include "periodictablescene_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp ---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -69,4 +69,3 @@ - - } // End namespace Avogadro - --#include "periodictableview.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp ---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 -@@ -27,7 +27,6 @@ - **********************************************************************/ - - #include "plotwidget.h" --#include "plotwidget.moc" - - #include <math.h> - #include <QDebug> -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp ---- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 -@@ -65,5 +65,3 @@ - } - - } // end namespace Avogadro -- --#include "plugin.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp ---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 -@@ -784,5 +784,3 @@ - } - - } -- --#include "pluginmanager.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp ---- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 -@@ -77,5 +77,3 @@ - } - - } -- --#include "primitive.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp ---- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 -@@ -978,5 +978,3 @@ - } - - } // End namespace Avogadro -- --#include "protein.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 -@@ -11,9 +11,9 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --qt4_automoc(moleculelist.cpp) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h) - --ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) -+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) - SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") - if (WIN32) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp ---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 -@@ -70,4 +70,3 @@ - - } - --#include "moleculelist.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 -@@ -289,5 +289,3 @@ - - - } -- --#include "pythonengine_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp ---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 -@@ -112,4 +112,3 @@ - - } // namespace - --#include "pythonerror.moc" - -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 -@@ -340,5 +340,3 @@ - } - - } -- --#include "pythonextension_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 -@@ -344,5 +344,3 @@ - } - - } -- --#include "pythontool_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp ---- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 -@@ -160,6 +160,3 @@ - } - - } // End namespace Avogadro -- -- #include "residue.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp ---- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 -@@ -117,5 +117,3 @@ - } - - } // end namespace Avogadro -- --#include "tool.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp ---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 -@@ -206,5 +206,3 @@ - } - - } // end namespace Avogadro -- --#include "toolgroup.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp ---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 -@@ -149,5 +149,3 @@ - - - } // End namespace Avogadro -- --#include "zmatrix.moc" diff --git a/extra/banshee/banshee-recent-gpod.patch b/extra/banshee/banshee-recent-gpod.patch deleted file mode 100644 index afb3a0fd1..000000000 --- a/extra/banshee/banshee-recent-gpod.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001 -From: William Witt <william@witt-family.net> -Date: Sat, 30 Jul 2011 21:54:41 -0500 -Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp - ---- - .../AppleDeviceTrackInfo.cs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs -index 178266d..b8549f7 100644 ---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs -+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs -@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice - track.CDs = DiscCount; - track.CDNumber = DiscNumber; - track.TrackLength = (int) Duration.TotalMilliseconds; -- track.Size = (int)FileSize; -+ track.Size = (uint)FileSize; - track.Grouping = Grouping; - try { - track.TimePlayed = LastPlayed; --- -1.7.3.4 diff --git a/extra/banshee/gst-1.0.patch b/extra/banshee/gst-1.0.patch deleted file mode 100644 index f8fa7a7c2..000000000 --- a/extra/banshee/gst-1.0.patch +++ /dev/null @@ -1,1025 +0,0 @@ -From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> -Date: Wed, 19 Sep 2012 11:34:06 +0200 -Subject: [PATCH] Initial port to GStreamer 1.0 - ---- - build/m4/banshee/gstreamer.m4 | 19 +++--- - data/audio-profiles/wav.xml.in | 5 +- - libbanshee/banshee-bpmdetector.c | 11 ++-- - libbanshee/banshee-gst.h | 4 +- - libbanshee/banshee-player-cdda.c | 5 +- - libbanshee/banshee-player-dvd.c | 4 +- - libbanshee/banshee-player-equalizer.c | 4 +- - libbanshee/banshee-player-missing-elements.c | 2 +- - libbanshee/banshee-player-pipeline.c | 37 ++++++----- - libbanshee/banshee-player-private.h | 13 ++-- - libbanshee/banshee-player-replaygain.c | 29 ++++----- - libbanshee/banshee-player-video.c | 89 +++++++++++++------------- - libbanshee/banshee-player-vis.c | 88 ++++++++----------------- - libbanshee/banshee-player.c | 11 ++-- - libbanshee/banshee-ripper.c | 16 ++--- - libbanshee/banshee-tagger.c | 2 +- - libbanshee/banshee-transcoder.c | 19 +++--- - 17 files changed, 156 insertions(+), 202 deletions(-) - -diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4 -index 6267cce..917cf58 100644 ---- a/build/m4/banshee/gstreamer.m4 -+++ b/build/m4/banshee/gstreamer.m4 -@@ -1,17 +1,18 @@ - AC_DEFUN([BANSHEE_CHECK_GSTREAMER], - [ -- GSTREAMER_REQUIRED_VERSION=0.10.26 -+ GSTREAMER_REQUIRED_VERSION=0.11.99 - AC_SUBST(GSTREAMER_REQUIRED_VERSION) - - PKG_CHECK_MODULES(GST, -- gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION) -- -- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10" -+ gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION) - - AC_SUBST(GST_CFLAGS) - AC_SUBST(GST_LIBS) -diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in -index 35cd1d2..6dc1bab 100644 ---- a/data/audio-profiles/wav.xml.in -+++ b/data/audio-profiles/wav.xml.in -@@ -14,10 +14,7 @@ - "audioresample" - "audioconvert" - (+ "audio/x-raw-int, " -- "endianness=(int)1234, " -- "width=(int)16, " -- "depth=(int)16, " -- "signed=(boolean)true, " -+ "format=(string)S16LE, " - "rate=(int)44100, " - "channels=(int)2" ) - "wavenc") -diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c -index c06ffcb..68b0419 100644 ---- a/libbanshee/banshee-bpmdetector.c -+++ b/libbanshee/banshee-bpmdetector.c -@@ -30,6 +30,7 @@ - # include "config.h" - #endif - -+#include <stdio.h> - #include <string.h> - #include <glib/gi18n.h> - -@@ -50,7 +51,7 @@ struct BansheeBpmDetector { - - /* - * You can run this pipeline on the cmd line with: -- * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \ -+ * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \ - * audioconvert ! bpmdetect ! fakesink - */ - -@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, - - g_return_if_fail(detector != NULL); - -- audiopad = gst_element_get_pad(detector->audioconvert, "sink"); -+ audiopad = gst_element_get_static_pad(detector->audioconvert, "sink"); - - if(GST_PAD_IS_LINKED(audiopad)) { - g_object_unref(audiopad); - return; - } - -- caps = gst_pad_get_caps(pad); -+ caps = gst_pad_query_caps(pad, NULL); - str = gst_caps_get_structure(caps, 0); - - if(!g_strrstr(gst_structure_get_name(str), "audio")) { -@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector) - return FALSE; - } - -- detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2"); -+ detector->decodebin = gst_element_factory_make ("decodebin", "decodebin"); - if (detector->decodebin == NULL) { -- bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL); -+ bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL); - return FALSE; - } - -diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h -index 85662cf..332f356 100644 ---- a/libbanshee/banshee-gst.h -+++ b/libbanshee/banshee-gst.h -@@ -41,9 +41,11 @@ - #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \ - gboolean iter##_done = FALSE; \ - while (!iter##_done) { \ -+ GValue child_value = {0, }; \ - child_type child_name; \ -- switch (gst_iterator_next (iter, (gpointer)&child_name)) { \ -+ switch (gst_iterator_next (iter, &child_value)) { \ - case GST_ITERATOR_OK: { \ -+ child_name = (child_type) g_value_get_object(&child_value); \ - { block; } \ - break; \ - } \ -diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c -index 8be2bdd..401edf0 100644 ---- a/libbanshee/banshee-player-cdda.c -+++ b/libbanshee/banshee-player-cdda.c -@@ -28,7 +28,8 @@ - // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - // - --#include <gst/cdda/gstcddabasesrc.h> -+#include <stdlib.h> -+#include <gst/audio/gstaudiocdsrc.h> - #include "banshee-player-cdda.h" - - // --------------------------------------------------------------------------- -@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin) - - g_object_get (playbin, "source", &source, NULL); - -- if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) { -+ if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) { - if (source != NULL) { - g_object_unref (source); - } -diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c -index 55d499c..991b506 100644 ---- a/libbanshee/banshee-player-dvd.c -+++ b/libbanshee/banshee-player-dvd.c -@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player) - { - gint64 index; - GstFormat format = gst_format_get_by_nick ("chapter"); -- gst_element_query_position (player->playbin, &format, &index); -+ gst_element_query_position (player->playbin, format, &index); - gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0); - } -@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player) - { - gint64 index; - GstFormat format = gst_format_get_by_nick ("chapter"); -- gst_element_query_position (player->playbin, &format, &index); -+ gst_element_query_position (player->playbin, format, &index); - gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0); - } -diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c -index a496ada..0cbb3b7 100644 ---- a/libbanshee/banshee-player-equalizer.c -+++ b/libbanshee/banshee-player-equalizer.c -@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain) - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - if (player->equalizer != NULL) { -- GstObject *band; -+ GObject *band; - - g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer))); - -@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq) - count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)); - - for (i = 0; i < count; i++) { -- GstObject *band; -+ GObject *band; - - band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i); - g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL); -diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c -index 20804c4..30118c5 100644 ---- a/libbanshee/banshee-player-missing-elements.c -+++ b/libbanshee/banshee-player-missing-elements.c -@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old, - } - #endif - -- install_return = gst_install_plugins_async (details, player->install_plugins_context, -+ install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, - bp_missing_elements_handle_install_result, player); - - if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) { -diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c -index ed845f3..6c2af35 100644 ---- a/libbanshee/banshee-player-pipeline.c -+++ b/libbanshee/banshee-player-pipeline.c -@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player) - GstMessage *msg; - - // We're being called from the streaming thread, so don't do anything here -- msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL)); -+ msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed")); - gst_element_post_message (player->playbin, msg); - } - -@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) - break; - } - -+ case GST_MESSAGE_STREAM_START: { -+ bp_next_track_starting (player); -+ break; -+ } -+ - case GST_MESSAGE_APPLICATION: { - const gchar * name; - const GstStructure * s = gst_message_get_structure (message); -@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player) - - // Playbin is the core element that handles autoplugging (finding the right - // source and decoder elements) based on source URI and stream content -- player->playbin = gst_element_factory_make ("playbin2", "playbin"); -+ player->playbin = gst_element_factory_make ("playbin", "playbin"); - - #ifdef ENABLE_GAPLESS - // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. -- // This can be removed once playbin2 generates its own next-track signal. -+ // This can be removed once playbin generates its own next-track signal. - // bgo#584987 - this is included in >= 0.10.26 - g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); - #endif //ENABLE_GAPLESS -@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player) - g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player); - g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player); - -- // Try to find an audio sink, prefer gconf, which typically is set to auto these days, -- // fall back on auto, which should work on windows, and as a last ditch, try alsa -- audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink"); -- if (audiosink == NULL) { -- audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); -- if (audiosink != NULL) { -- g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); -- } else { -- audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); -- if (audiosink == NULL) { -- audiosink = gst_element_factory_make ("alsasink", "audiosink"); -- } -+ audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); -+ if (audiosink != NULL) { -+ g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); -+ } else { -+ audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); -+ if (audiosink == NULL) { -+ audiosink = gst_element_factory_make ("alsasink", "audiosink"); - } - } - -@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player) - GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink)); - BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, { - player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL; -- gst_object_unref (element); - }); - } - bp_debug ("Audiosink has volume: %s", -@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player) - } - - // Ghost pad the audio bin so audio is passed from the bin into the tee -- teepad = gst_element_get_pad (player->audiotee, "sink"); -+ teepad = gst_element_get_static_pad (player->audiotee, "sink"); - gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad)); - gst_object_unref (teepad); - -@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player) - gst_bus_add_watch (bus, bp_pipeline_bus_callback, player); - - // Link the first tee pad to the primary audio sink queue -- GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink"); -- pad = gst_element_get_request_pad (player->audiotee, "src%d"); -+ GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink"); -+ pad = gst_element_get_request_pad (player->audiotee, "src_%u"); - g_object_set(player->audiotee, "alloc-pad", pad, NULL); - gst_pad_link (pad, sinkpad); - gst_object_unref (GST_OBJECT (pad)); -diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h -index 9fed356..9346911 100644 ---- a/libbanshee/banshee-player-private.h -+++ b/libbanshee/banshee-player-private.h -@@ -42,14 +42,14 @@ - #include <gst/fft/gstfftf32.h> - #include <gst/pbutils/pbutils.h> - #include <gst/tag/tag.h> --#include <gst/interfaces/navigation.h> -+#include <gst/video/navigation.h> - - #if defined(GDK_WINDOWING_X11) - # include <gdk/gdkx.h> --# include <gst/interfaces/xoverlay.h> -+# include <gst/video/videooverlay.h> - #elif defined(GDK_WINDOWING_WIN32) - # include <gdk/gdkwin32.h> --# include <gst/interfaces/xoverlay.h> -+# include <gst/video/videooverlay.h> - #endif - - #include "banshee-gst.h" -@@ -155,11 +155,11 @@ struct BansheePlayer { - // Video State - BpVideoDisplayContextType video_display_context_type; - #if defined(GDK_WINDOWING_X11) -- GstXOverlay *xoverlay; -+ GstVideoOverlay *video_overlay; - GdkWindow *video_window; - XID video_window_xid; - #elif defined(GDK_WINDOWING_WIN32) -- GstXOverlay *xoverlay; -+ GstVideoOverlay *video_overlay; - GdkWindow *video_window; - HWND video_window_xid; - #endif -@@ -179,6 +179,8 @@ struct BansheePlayer { - GstFFTF32 *vis_fft; - GstFFTF32Complex *vis_fft_buffer; - gfloat *vis_fft_sample_buffer; -+ GstPad *vis_event_probe_pad; -+ gulong vis_event_probe_id; - - // Plugin Installer State - GdkWindow *window; -@@ -197,6 +199,7 @@ struct BansheePlayer { - // http://replaygain.hydrogenaudio.org/player_scale.html - gdouble rg_gain_history[10]; - gint history_size; -+ gulong rg_pad_block_id; - - //dvd navigation - GstNavigation *navigation; -diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c -index a479d4a..e42b197 100644 ---- a/libbanshee/banshee-player-replaygain.c -+++ b/libbanshee/banshee-player-replaygain.c -@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban - _bp_rgvolume_print_volume (player); - } - --static void --pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) -+static GstPadProbeReturn -+pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data) - { - BansheePlayer* player; - -- if (!blocked) { -- return; -- } -- - player = (BansheePlayer*) user_data; -- g_return_if_fail (IS_BANSHEE_PLAYER (player)); -+ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK); - - // The pad_block_cb can get triggered multiple times, on different threads. - // Lock around the link/unlink code, so we don't end up going through here -@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) - if ((player->replaygain_enabled && player->rgvolume_in_pipeline) || - (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) { - // The pipeline is already in the correct state. Unblock the pad, and return. -+ player->rg_pad_block_id = 0; - g_mutex_unlock (player->replaygain_mutex); -- if (gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); -- } -- return; -+ return GST_PAD_PROBE_REMOVE; - } - - if (player->rgvolume_in_pipeline) { -@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) - } - - // Our state is now consistent -+ player->rg_pad_block_id = 0; - g_mutex_unlock (player->replaygain_mutex); - -- if (gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); -- } -- - _bp_rgvolume_print_volume (player); -+ -+ return GST_PAD_PROBE_REMOVE; - } - - // --------------------------------------------------------------------------- -@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player) - srcPad = gst_element_get_static_pad (player->before_rgvolume, "src"); - - if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player); -- } else if (srcPad->block_callback == NULL) { -- pad_block_cb (srcPad, TRUE, player); -+ player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL); -+ } else if (!player->rg_pad_block_id) { -+ pad_block_cb (srcPad, NULL, player); - } - } - -diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c -index b901354..eb95c3f 100644 ---- a/libbanshee/banshee-player-video.c -+++ b/libbanshee/banshee-player-video.c -@@ -37,54 +37,54 @@ - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) - - static gboolean --bp_video_find_xoverlay (BansheePlayer *player) -+bp_video_find_video_overlay (BansheePlayer *player) - { - GstElement *video_sink = NULL; -- GstElement *xoverlay; -- GstXOverlay *previous_xoverlay; -- gboolean found_xoverlay; -+ GstElement *video_overlay; -+ GstVideoOverlay *previous_video_overlay; -+ gboolean found_video_overlay; - - g_object_get (player->playbin, "video-sink", &video_sink, NULL); - - g_mutex_lock (player->video_mutex); -- previous_xoverlay = player->xoverlay; -+ previous_video_overlay = player->video_overlay; - - if (video_sink == NULL) { -- player->xoverlay = NULL; -- if (previous_xoverlay != NULL) { -- gst_object_unref (previous_xoverlay); -+ player->video_overlay = NULL; -+ if (previous_video_overlay != NULL) { -+ gst_object_unref (previous_video_overlay); - } - g_mutex_unlock (player->video_mutex); - return FALSE; - } - -- xoverlay = GST_IS_BIN (video_sink) -- ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY) -+ video_overlay = GST_IS_BIN (video_sink) -+ ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY) - : video_sink; - -- player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL; -+ player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL; - -- if (previous_xoverlay != NULL) { -- gst_object_unref (previous_xoverlay); -+ if (previous_video_overlay != NULL) { -+ gst_object_unref (previous_video_overlay); - } - - #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink -- if (player->xoverlay != NULL && g_object_class_find_property ( -- G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) { -- g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL); -+ if (player->video_overlay != NULL && g_object_class_find_property ( -+ G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) { -+ g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL); - } - #endif - -- if (player->xoverlay != NULL && g_object_class_find_property ( -- G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) { -- g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL); -+ if (player->video_overlay != NULL && g_object_class_find_property ( -+ G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) { -+ g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL); - } - - gst_object_unref (video_sink); -- found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE; -+ found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE; - - g_mutex_unlock (player->video_mutex); -- return found_xoverlay; -+ return found_video_overlay; - } - - #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */ -@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) -- bp_video_find_xoverlay (player); -+ bp_video_find_video_overlay (player); - #endif - } - - static void - bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player) - { -- gboolean found_xoverlay; -+ gboolean found_video_overlay; - - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) - -- if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) { -+ if (!gst_is_video_overlay_prepare_window_handle_message (message)) { - return; - } - -- found_xoverlay = bp_video_find_xoverlay (player); -+ found_video_overlay = bp_video_find_video_overlay (player); - -- if (found_xoverlay) { -- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); -+ if (found_video_overlay) { -+ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); - } - - #endif -@@ -164,7 +164,7 @@ static void - cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p) - { - GstStructure * s = NULL; -- GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj)); -+ GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj)); - - if (G_UNLIKELY (!caps)) { - return; -@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player) - } - - if (G_LIKELY (vpad)) { -- GstCaps *caps = gst_pad_get_negotiated_caps (vpad); -+ GstCaps *caps = gst_pad_get_current_caps (vpad); - if (G_LIKELY (caps)) { - cb_caps_set (G_OBJECT (vpad), NULL, player); - gst_caps_unref (caps); -@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus) - - player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW; - -- videosink = gst_element_factory_make ("gconfvideosink", "videosink"); -+ videosink = gst_element_factory_make ("autovideosink", "videosink"); - if (videosink == NULL) { -- videosink = gst_element_factory_make ("autovideosink", "videosink"); -- if (videosink == NULL) { -- player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; -- videosink = gst_element_factory_make ("fakesink", "videosink"); -- if (videosink != NULL) { -- g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); -- } -+ player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; -+ videosink = gst_element_factory_make ("fakesink", "videosink"); -+ if (videosink != NULL) { -+ g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); - } - } - - g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL); - -- gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player); -+ gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL); - g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player); - - if (GST_IS_BIN (videosink)) { -@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc - { - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - -- if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) { -- gst_x_overlay_expose (player->xoverlay); -+ if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) { -+ gst_video_overlay_expose (player->video_overlay); - return; - } - -- if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) { -+ if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) { - return; - } - -- gst_object_ref (player->xoverlay); -+ gst_object_ref (player->video_overlay); - -- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); -- gst_x_overlay_expose (player->xoverlay); -+ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); -+ gst_video_overlay_expose (player->video_overlay); - -- gst_object_unref (player->xoverlay); -+ gst_object_unref (player->video_overlay); - } - - // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing. -@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window) - // //Explicitly create the native window. GDK_WINDOW_XWINDOW will call this - // //function anyway, but this way we can raise a more useful message should it fail. - // if (!gdk_window_ensure_native (window)) { --// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!"); -+// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!"); - // } - //#endif - -diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c -index 5787c87..7e7dc78 100644 ---- a/libbanshee/banshee-player-vis.c -+++ b/libbanshee/banshee-player-vis.c -@@ -27,17 +27,17 @@ - // - - #include <math.h> -+#include <gst/audio/audio.h> - - #include "banshee-player-vis.h" - - #define SLICE_SIZE 735 - - static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS ( -- "audio/x-raw-float, " -+ "audio/x-raw, " -+ "format = (string) " GST_AUDIO_NE(F32) ", " - "rate = (int) 44100, " -- "channels = (int) 2, " -- "endianness = (int) BYTE_ORDER, " -- "width = (int) 32" -+ "channels = (int) 2" - ); - - // --------------------------------------------------------------------------- -@@ -48,6 +48,7 @@ static void - bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata) - { - BansheePlayer *player = (BansheePlayer*)userdata; -+ GstCaps *caps; - GstStructure *structure; - gint channels, wanted_size; - gfloat *data; -@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - player->vis_thawing = FALSE; - } - -- structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0); -+ caps = gst_pad_get_current_caps (pad); -+ structure = gst_caps_get_structure (caps, 0); - gst_structure_get_int (structure, "channels", &channels); -+ gst_caps_unref (caps); - - wanted_size = channels * SLICE_SIZE * sizeof (gfloat); - -- gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer)); -+ gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer)); - -- while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) { -+ while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) { - gfloat *deinterlaced = g_malloc (wanted_size); - gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2); - -@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - g_free (deinterlaced); - g_free (specbuf); - -+ gst_adapter_unmap (player->vis_buffer); - gst_adapter_flush (player->vis_buffer, wanted_size); - } - } -@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - // Internal Functions - // --------------------------------------------------------------------------- - --static void --_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data) -+static GstPadProbeReturn -+_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data) - { - BansheePlayer *player = (BansheePlayer *) data; -+ GstEvent *event; - -- if (!blocked) { -- // Set thawing mode (discards buffers that are too old from the queue). -- player->vis_thawing = TRUE; -- } --} -- --static void --_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked) --{ -- GstPad *queue_sink; -- -- if (player->vis_resampler == NULL) -- return; -- -- queue_sink = gst_element_get_static_pad (player->vis_resampler, "src"); -- -- gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player); -- -- gst_object_unref (GST_OBJECT (queue_sink)); --} -- --static gboolean --_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data) --{ -- BansheePlayer *player = (BansheePlayer *) data; -+ if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0) -+ return GST_PAD_PROBE_PASS; - -+ event = GST_EVENT (info->data); - switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_FLUSH_START: - case GST_EVENT_FLUSH_STOP: - case GST_EVENT_SEEK: -- case GST_EVENT_NEWSEGMENT: -+ case GST_EVENT_SEGMENT: - case GST_EVENT_CUSTOM_DOWNSTREAM: - player->vis_thawing = TRUE; - - default: break; - } - -- if (player->vis_enabled) -- return TRUE; -- -- switch (GST_EVENT_TYPE (event)) { -- case GST_EVENT_EOS: -- case GST_EVENT_CUSTOM_DOWNSTREAM_OOB: -- _bp_vis_pipeline_set_blocked (player, FALSE); -- break; -- case GST_EVENT_CUSTOM_DOWNSTREAM: -- case GST_EVENT_NEWSEGMENT: -- _bp_vis_pipeline_set_blocked (player, TRUE); -- break; -- -- default: break; -- } -- -- return TRUE; -+ return GST_PAD_PROBE_PASS; - } - - void -@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - // Core elements, if something fails here, it's the end of the world - audiosinkqueue = gst_element_factory_make ("queue", "vis-queue"); - -- pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -- gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player); -- gst_object_unref (GST_OBJECT (pad)); -+ player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -+ player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL); - - resampler = gst_element_factory_make ("audioresample", "vis-resample"); - converter = gst_element_factory_make ("audioconvert", "vis-convert"); -@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - converter, fakesink, NULL); - - pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -- teepad = gst_element_get_request_pad (player->audiotee, "src%d"); -+ teepad = gst_element_get_request_pad (player->audiotee, "src_%u"); - gst_pad_link (teepad, pad); - gst_object_unref (GST_OBJECT (teepad)); - gst_object_unref (GST_OBJECT (pad)); -@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - player->vis_resampler = resampler; - player->vis_thawing = FALSE; - player->vis_enabled = FALSE; -- -- // Disable the pipeline till we hear otherwise from managed land. -- _bp_vis_pipeline_set_blocked (player, TRUE); - } - - void - _bp_vis_pipeline_destroy (BansheePlayer *player) - { -+ if (player->vis_event_probe_pad) { -+ gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id); -+ gst_object_unref (GST_OBJECT (player->vis_event_probe_pad)); -+ player->vis_event_probe_pad = NULL; -+ } -+ - if (player->vis_buffer != NULL) { - gst_object_unref (player->vis_buffer); - player->vis_buffer = NULL; -@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb - - player->vis_data_cb = cb; - -- _bp_vis_pipeline_set_blocked (player, cb == NULL); - player->vis_enabled = cb != NULL; - } -diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c -index c655a72..b8f98b8 100644 ---- a/libbanshee/banshee-player.c -+++ b/libbanshee/banshee-player.c -@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms) - P_INVOKE guint64 - bp_get_position (BansheePlayer *player) - { -- static GstFormat format = GST_FORMAT_TIME; - gint64 position; - - g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); - -- if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) { -+ if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) { - return position / GST_MSECOND; - } - -@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player) - P_INVOKE guint64 - bp_get_duration (BansheePlayer *player) - { -- static GstFormat format = GST_FORMAT_TIME; - gint64 duration; - - g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); - -- if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) { -+ if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) { - return duration / GST_MSECOND; - } - -@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - gint64 pos = -1; - GstState state; -- GstFormat format = GST_FORMAT_BYTES; - gboolean paused = FALSE; - - // Gstreamer playbin do not support to set suburi during playback -@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - gst_element_get_state (player->playbin, &state, NULL, 0); - paused = (state == GST_STATE_PAUSED); - if (state >= GST_STATE_PAUSED) { -- gst_element_query_position (player->playbin, &format, &pos); -+ gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos); - gst_element_set_state (player->playbin, GST_STATE_READY); - // Force to wait asynch operation - gst_element_get_state (player->playbin, &state, NULL, -1); -@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - gst_element_get_state (player->playbin, &state, NULL, -1); - - if (pos != -1) { -- gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); -+ gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); - } - } - -diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c -index e0e8c85..b3f8fed 100644 ---- a/libbanshee/banshee-ripper.c -+++ b/libbanshee/banshee-ripper.c -@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug) - static gboolean - br_iterate_timeout (BansheeRipper *ripper) - { -- GstFormat format = GST_FORMAT_TIME; - GstState state; - gint64 position; - -@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper) - return TRUE; - } - -- if (!gst_element_query_position (ripper->cddasrc, &format, &position)) { -+ if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) { - return TRUE; - } - -@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin) - GstIterator *pad_iter = gst_element_iterate_src_pads (element); - - BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, { -- GstStructure *str = GST_PAD_CAPS (pad) != NULL -- ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0) -+ GstCaps *caps = gst_pad_get_current_caps (pad); -+ GstStructure *str = caps != NULL -+ ? gst_caps_get_structure (caps, 0) - : NULL; - - if (str != NULL) { -@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin) - preferred_mimetype = mimetype; - } - } -- -- gst_object_unref (pad); -+ gst_caps_unref (caps); - }); -- -- gst_object_unref (element); - }); - - return preferred_mimetype; -@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper) - return FALSE; - } - -- ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc"); -+ ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL); - if (ripper->cddasrc == NULL) { - br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL); - return FALSE; -@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path, - - // We'll warn the user in the UI if we can't tag the encoded audio files - *tagging_supported = TRUE; -- gst_object_unref (element); - } - }); - -diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c -index ca15e8f..762dfa9 100644 ---- a/libbanshee/banshee-tagger.c -+++ b/libbanshee/banshee-tagger.c -@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata - GstTagList * - bt_tag_list_new () - { -- return gst_tag_list_new (); -+ return gst_tag_list_new_empty (); - } - - void -diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c -index 10fc35c..0e241f0 100644 ---- a/libbanshee/banshee-transcoder.c -+++ b/libbanshee/banshee-transcoder.c -@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const - static gboolean - gst_transcoder_iterate_timeout(GstTranscoder *transcoder) - { -- GstFormat format = GST_FORMAT_TIME; - gint64 position; - gint64 duration; - - g_return_val_if_fail(transcoder != NULL, FALSE); - -- if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) || -- !gst_element_query_position(transcoder->sink_bin, &format, &position)) { -+ if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) || -+ !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) { - return TRUE; - } - -@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, - - g_return_if_fail(transcoder != NULL); - -- audiopad = gst_element_get_pad(transcoder->sink_bin, "sink"); -+ audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink"); - - if(GST_PAD_IS_LINKED(audiopad)) { - g_object_unref(audiopad); - return; - } - -- caps = gst_pad_get_caps(pad); -+ caps = gst_pad_query_caps(pad, NULL); - str = gst_caps_get_structure(caps, 0); - - if(!g_strrstr(gst_structure_get_name(str), "audio")) { -@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, - - transcoder->pipeline = gst_pipeline_new("pipeline"); - -- source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source"); -+ source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL); - if(source_elem == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL); - return FALSE; - } - -- decoder_elem = gst_element_factory_make("decodebin2", "decodebin2"); -+ decoder_elem = gst_element_factory_make("decodebin", "decodebin"); - if(decoder_elem == NULL) { -- gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL); -+ gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL); - return FALSE; - } - -- sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink"); -+ sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL); - if(sink_elem == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL); - return FALSE; -@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, - return FALSE; - } - -- encoder_pad = gst_element_get_pad(conv_elem, "sink"); -+ encoder_pad = gst_element_get_static_pad(conv_elem, "sink"); - if(encoder_pad == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL); - return FALSE; --- -1.7.10.4
\ No newline at end of file diff --git a/extra/bitlbee/install b/extra/bitlbee/install deleted file mode 100644 index b0dd5511d..000000000 --- a/extra/bitlbee/install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null - getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null - getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null - true -} diff --git a/extra/bitlbee/sbindir.patch b/extra/bitlbee/sbindir.patch deleted file mode 100644 index 7640508f7..000000000 --- a/extra/bitlbee/sbindir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -aur old/Makefile new/Makefile ---- old/Makefile 2012-02-18 21:55:09.000000000 +1100 -+++ new/Makefile 2012-02-20 18:28:08.716130584 +1100 -@@ -135,8 +135,8 @@ - - systemd: - ifdef SYSTEMDSYSTEMUNITDIR -- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service -- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service -+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service -+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service - endif - - install-systemd: diff --git a/extra/bluez/0001-udev-remove-deprecated-function.patch b/extra/bluez/0001-udev-remove-deprecated-function.patch deleted file mode 100644 index 7dadf5cd1..000000000 --- a/extra/bluez/0001-udev-remove-deprecated-function.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Sun, 27 May 2012 00:53:36 +0200 -Subject: [PATCH] udev: remove deprecated function - -This function has in the past returned "/sys" unconditionally. As of udev-183 it -is gone, so just replace it with the string. ---- - tools/hid2hci.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/hid2hci.c b/tools/hid2hci.c -index 45a3a3d..e3a5b2e 100644 ---- a/tools/hid2hci.c -+++ b/tools/hid2hci.c -@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) - if (udev == NULL) - goto exit; - -- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath); -+ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath); - udev_dev = udev_device_new_from_syspath(udev, syspath); - if (udev_dev == NULL) { - fprintf(stderr, "error: could not find '%s'\n", devpath); --- -1.7.10.2 - diff --git a/extra/bluez/org.bluez.service b/extra/bluez/org.bluez.service deleted file mode 100644 index dd7ae8f1c..000000000 --- a/extra/bluez/org.bluez.service +++ /dev/null @@ -1,5 +0,0 @@ -[D-BUS Service] -Name=org.bluez -Exec=/bin/false -User=root -SystemdService=dbus-org.bluez.service diff --git a/extra/bmp-musepack/PKGBUILD b/extra/bmp-musepack/PKGBUILD deleted file mode 100644 index 0cde321fb..000000000 --- a/extra/bmp-musepack/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 137709 2011-09-10 13:05:29Z pierre $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Nikos Kouremenos <nk@ebox.gr> - -pkgname=bmp-musepack -pkgver=1.2 -pkgrel=4 -pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format" -arch=('i686' 'x86_64' 'mips64el') -url="http://musepack.net/" -license=('BSD') -depends=('bmp' 'libmpcdec' 'taglib') -groups=('bmp-plugins' 'bmp-io-plugins') -options=('!libtool') -source=("http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5fe0c9d341ca37d05c780a478f829a5f') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/extra/bmp-wma/PKGBUILD b/extra/bmp-wma/PKGBUILD deleted file mode 100644 index a8b78b1c5..000000000 --- a/extra/bmp-wma/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 137730 2011-09-10 14:26:41Z pierre $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com> - -pkgname=bmp-wma -pkgver=0.1.1 -pkgrel=4 -pkgdesc="WMA plugin for Beep Media Player" -url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma" -license=('GPL') -arch=('x86_64' 'i686' 'mips64el') -depends=('bmp') -groups=('bmp-plugins' 'bmp-io-plugins') -options=('!libtool' '!emptydirs') -source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz" - 'bmp-wma-gcc4.patch') -md5sums=('8dcf3fcdb10e8e2e386f70745812412b' - '730eba8f41e989dd8b56c18bcc826cc4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" - if [ "${CARCH}" != "i686" ]; then - export CFLAGS="${CFLAGS} -fPIC" - fi - ./configure --prefix=/usr --disable-static - echo '#define HAVE_LRINTF 1' >> config.h - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/bmp-wma/bmp-wma-gcc4.patch b/extra/bmp-wma/bmp-wma-gcc4.patch deleted file mode 100644 index 9d773e89e..000000000 --- a/extra/bmp-wma/bmp-wma-gcc4.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400 -+++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400 -@@ -11,6 +11,43 @@ - extern "C" { - #endif - -+ -+/** -+ * AVOption. -+ */ -+typedef struct AVOption { -+ /** options' name */ -+ const char *name; /* if name is NULL, it indicates a link to next */ -+ /** short English text help or const struct AVOption* subpointer */ -+ const char *help; // const struct AVOption* sub; -+ /** offset to context structure where the parsed value should be stored */ -+ int offset; -+ /** options' type */ -+ int type; -+#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) -+#define FF_OPT_TYPE_DOUBLE 2 ///< double -+#define FF_OPT_TYPE_INT 3 ///< integer -+#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) -+#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags -+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option -+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) -+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) -+ /** min value (min == max -> no limits) */ -+ double min; -+ /** maximum value for double/int */ -+ double max; -+ /** default boo [0,1]l/double/int value */ -+ double defval; -+ /** -+ * default string value (with optional semicolon delimited extra option-list -+ * i.e. option1;option2;option3 -+ * defval might select other then first argument as default -+ */ -+ const char *defstr; -+#define FF_OPT_MAX_DEPTH 10 -+} AVOption; -+ -+ - #include "common.h" - #include <sys/types.h> /* size_t */ - -@@ -1396,41 +1433,6 @@ - - - /** -- * AVOption. -- */ --typedef struct AVOption { -- /** options' name */ -- const char *name; /* if name is NULL, it indicates a link to next */ -- /** short English text help or const struct AVOption* subpointer */ -- const char *help; // const struct AVOption* sub; -- /** offset to context structure where the parsed value should be stored */ -- int offset; -- /** options' type */ -- int type; --#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) --#define FF_OPT_TYPE_DOUBLE 2 ///< double --#define FF_OPT_TYPE_INT 3 ///< integer --#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) --#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags --//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option --#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) --#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) -- /** min value (min == max -> no limits) */ -- double min; -- /** maximum value for double/int */ -- double max; -- /** default boo [0,1]l/double/int value */ -- double defval; -- /** -- * default string value (with optional semicolon delimited extra option-list -- * i.e. option1;option2;option3 -- * defval might select other then first argument as default -- */ -- const char *defstr; --#define FF_OPT_MAX_DEPTH 10 --} AVOption; -- --/** - * Parse option(s) and sets fields in passed structure - * @param strct structure where the parsed results will be written - * @param list list with AVOptions ---- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400 -+++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400 -@@ -28,7 +28,6 @@ - #ifndef DSPUTIL_H - #define DSPUTIL_H - --#include "common.h" - #include "avcodec.h" - - diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD deleted file mode 100644 index 6fb801418..000000000 --- a/extra/bochs/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 166567 2012-09-11 23:15:35Z eric $ -#Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Kevin Piche <kevin@archlinux.org> - -pkgname=bochs -pkgver=2.6 -pkgrel=1 -pkgdesc="A portable x86 PC emulation software package" -arch=('i686' 'x86_64' 'mips64el') -url="http://bochs.sourceforge.net/" -license=('LGPL') -depends=('gcc-libs' 'libxrandr') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7e25e1a4d2f7e0464e8d6381f38741d9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --without-wx --enable-cpu-level=6 \ - --enable-fpu --enable-3dnow --enable-disasm - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m 644 .bochsrc "${pkgdir}/etc/bochsrc-sample.txt" -} diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD deleted file mode 100644 index 018f70a54..000000000 --- a/extra/bogofilter/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Low Kian Seong <fastmail_low@speedymail.org> - -pkgname=bogofilter -pkgver=1.2.2 -pkgrel=4 -pkgdesc="A fast Bayesian spam filtering tool" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://bogofilter.sourceforge.net" -depends=('db' 'perl' 'gsl') -backup=('etc/bogofilter/bogofilter.cf') -source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc/bogofilter \ - --localstatedir=/var \ - --enable-transactions - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf" - - install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib" - install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/" -} diff --git a/extra/boost/exceptions.patch b/extra/boost/exceptions.patch deleted file mode 100644 index 9faa71526..000000000 --- a/extra/boost/exceptions.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp ---- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 -+++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 -@@ -20,6 +20,7 @@ - - #include "boost/mpl/if.hpp" - #include "boost/mpl/integral_c.hpp" -+#include "boost/throw_exception.hpp" - - namespace boost { namespace numeric - { -@@ -159,9 +160,9 @@ struct def_overflow_handler - void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) - { - if ( r == cNegOverflow ) -- throw negative_overflow() ; -+ boost::throw_exception( negative_overflow() ) ; - else if ( r == cPosOverflow ) -- throw positive_overflow() ; -+ boost::throw_exception( positive_overflow() ) ; - } - } ; - - -Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/extra/bootchart/README.patch b/extra/bootchart/README.patch deleted file mode 100644 index 195052d0a..000000000 --- a/extra/bootchart/README.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Fri, 16 Mar 2012 01:34:10 +0100 -Subject: [PATCH] README: point to the correct location of the binary - ---- - README | 2 +- - 1 file changed, 1 insertions(+), 1 deletions(-) - -diff --git a/README b/README -index fa1d730..1906abb 100644 ---- a/README -+++ b/README -@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool - Bootchart is a tool, usually run at system startup, that collects and graphs - the CPU and disk load of the system as it works. The output of bootchart is - an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel --by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork -+by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork - init off to resume normal system startup, while monitoring and logging - startup information in the background. - --- -1.7.9.5 - diff --git a/extra/bootchart/build.patch b/extra/bootchart/build.patch deleted file mode 100644 index 91ca34def..000000000 --- a/extra/bootchart/build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Fri, 16 Mar 2012 01:34:10 +0100 -Subject: [PATCH] Makefile: move binary and avoid empty dirs - -Install to /usr/bin by default, and don't install an empty /etc. - -v2: Adjust README to reflect the change. ---- - Makefile | 10 ++++------ - README | 2 +- - 2 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/Makefile b/Makefile -index 2150ed3..ae432fa 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,12 +6,10 @@ CC := gcc - all: bootchartd - - install: bootchartd -- mkdir -p $(DESTDIR)/sbin -- mkdir -p $(DESTDIR)/etc -- mkdir -p $(DESTDIR)/usr/share/doc/bootchart/ -- install -m0755 bootchartd $(DESTDIR)/sbin/ -- install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/ -- install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/ -+ install -d $(DESTDIR)/usr/bin -+ install -d $(DESTDIR)/usr/share/doc/bootchart -+ install -m0755 bootchartd $(DESTDIR)/usr/bin/ -+ install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/ - - OBJS := log.o svg.o bootchart.o - -diff --git a/README b/README -index fa1d730..1906abb 100644 ---- a/README -+++ b/README -@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool - Bootchart is a tool, usually run at system startup, that collects and graphs - the CPU and disk load of the system as it works. The output of bootchart is - an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel --by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork -+by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork - init off to resume normal system startup, while monitoring and logging - startup information in the background. - --- -1.7.9.5 - diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD deleted file mode 100644 index 58be3787e..000000000 --- a/extra/botan/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 163218 2012-07-11 00:19:22Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: d'Ronin <daronin@2600.com> - -pkgname=botan -pkgver=1.10.3 -pkgrel=1 -pkgdesc="Crypto library written in C++" -license=('BSD') -arch=('i686' 'x86_64' 'mips64el') -url="http://botan.randombit.net/" -depends=('gcc-libs' 'sh') -makedepends=('python2') -source=(http://files.randombit.net/botan/Botan-${pkgver}.tbz{,.asc}) -sha1sums=('9f929101bf75c19432f49f57c80d2d26eec91dcb' - 'd03b220849e3d3b3a49363a0debc266b615d9fca') - -build() { - cd "${srcdir}/Botan-${pkgver}" - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py - ./configure.py --prefix=/usr - sed -i 's/-mabi=64//' Makefile # not needed and incorrect on N32 - make -} - -package() { - cd "${srcdir}/Botan-${pkgver}" - make DESTDIR="${pkgdir}/usr" install - install -D -m644 doc/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - find "${pkgdir}/usr/share/doc" -type f -exec chmod 0644 {} \; -} - diff --git a/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch b/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch deleted file mode 100644 index f67e34677..000000000 --- a/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 47e1a496c9a7124c28d420afe202e5bbb01ce02e Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Sat, 13 Oct 2012 20:37:09 -0700 -Subject: [PATCH] disable setting jobs due to cabal 1.16.0 bug shipped with - ghc 7.6.1 - ---- - Distribution/Client/Config.hs | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Distribution/Client/Config.hs b/Distribution/Client/Config.hs -index 93e5a52..ecbc6f7 100644 ---- a/Distribution/Client/Config.hs -+++ b/Distribution/Client/Config.hs -@@ -202,8 +202,7 @@ initialSavedConfig = do - }, - savedInstallFlags = mempty { - installSummaryFile = [toPathTemplate (logsDir </> "build.log")], -- installBuildReports= toFlag AnonymousReports, -- installNumJobs = toFlag (Just numberOfProcessors) -+ installBuildReports= toFlag AnonymousReports - } - } - --- -1.7.12.3 - diff --git a/extra/cairo/cairo-1.10.0-buggy_gradients.patch b/extra/cairo/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index 368e356d3..000000000 --- a/extra/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/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch deleted file mode 100644 index e43a10312..000000000 --- a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2f1d6b27e8b78c77346a5b603114b54400e57d83 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 07 Jun 2012 09:48:52 +0000 -Subject: cff-subsetting: Ignore charset for non cid fonts - -Fixes crash in https://bugzilla.gnome.org/show_bug.cgi?id=677422 ---- -diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c -index db6fdf7..6f0cd66 100644 ---- a/src/cairo-cff-subset.c -+++ b/src/cairo-cff-subset.c -@@ -1178,14 +1178,16 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font) - goto fail; - font->num_glyphs = _cairo_array_num_elements (&font->charstrings_index); - -- operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); -- if (font->is_cid && !operand) -- return CAIRO_INT_STATUS_UNSUPPORTED; -+ if (font->is_cid) { -+ operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); -+ if (!operand) -+ return CAIRO_INT_STATUS_UNSUPPORTED; - -- decode_integer (operand, &offset); -- font->charset = font->data + offset; -- if (font->charset >= font->data_end) -- return CAIRO_INT_STATUS_UNSUPPORTED; -+ decode_integer (operand, &offset); -+ font->charset = font->data + offset; -+ if (font->charset >= font->data_end) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ } - - if (!font->is_opentype) - cairo_cff_font_read_font_metrics (font, font->top_dict); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch b/extra/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch deleted file mode 100644 index e3bb30580..000000000 --- a/extra/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch +++ /dev/null @@ -1,275 +0,0 @@ -From f228769dfe5a8b5d73c49a41e95e31ed73a77fb3 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 08 Jun 2012 16:22:41 +0000 -Subject: polygon-reduce: Reduce broken stopped-edge continuation - -This is hopefully a lesser used path and the attempted optimisation to -continue a stopped edge with a colinear stopped edge highly unlikely and -lost in the noise of the general inefficiency of the routine. As it was -broken, rather than attempt to rectify the "optimisation" remove it. - -Reported-by: Evangelos Foutras <evangelos@foutrelis.com> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50852 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-polygon-reduce.c b/src/cairo-polygon-reduce.c -index 8758070..ea457fe 100644 ---- a/src/cairo-polygon-reduce.c -+++ b/src/cairo-polygon-reduce.c -@@ -42,6 +42,8 @@ - #include "cairo-freelist-private.h" - #include "cairo-combsort-inline.h" - -+#define DEBUG_POLYGON 0 -+ - typedef cairo_point_t cairo_bo_point32_t; - - typedef struct _cairo_bo_intersect_ordinate { -@@ -114,7 +116,6 @@ typedef struct _cairo_bo_event_queue { - - typedef struct _cairo_bo_sweep_line { - cairo_bo_edge_t *head; -- cairo_bo_edge_t *stopped; - int32_t current_y; - cairo_bo_edge_t *current_edge; - } cairo_bo_sweep_line_t; -@@ -476,8 +477,8 @@ edges_compare_x_for_y (const cairo_bo_edge_t *a, - static inline int - _line_equal (const cairo_line_t *a, const cairo_line_t *b) - { -- return a->p1.x == b->p1.x && a->p1.y == b->p1.y && -- a->p2.x == b->p2.x && a->p2.y == b->p2.y; -+ return (a->p1.x == b->p1.x && a->p1.y == b->p1.y && -+ a->p2.x == b->p2.x && a->p2.y == b->p2.y); - } - - static int -@@ -1024,7 +1025,6 @@ static void - _cairo_bo_sweep_line_init (cairo_bo_sweep_line_t *sweep_line) - { - sweep_line->head = NULL; -- sweep_line->stopped = NULL; - sweep_line->current_y = INT32_MIN; - sweep_line->current_edge = NULL; - } -@@ -1139,6 +1139,8 @@ edges_colinear (const cairo_bo_edge_t *a, const cairo_bo_edge_t *b) - */ - if (a->edge.line.p1.y == b->edge.line.p1.y) { - return a->edge.line.p1.x == b->edge.line.p1.x; -+ } else if (a->edge.line.p2.y == b->edge.line.p2.y) { -+ return a->edge.line.p2.x == b->edge.line.p2.x; - } else if (a->edge.line.p1.y < b->edge.line.p1.y) { - return edge_compare_for_y_against_x (b, - a->edge.line.p1.y, -@@ -1205,82 +1207,48 @@ _active_edges_to_polygon (cairo_bo_edge_t *left, - cairo_polygon_t *polygon) - { - cairo_bo_edge_t *right; -+ unsigned int mask; - -- if (fill_rule == CAIRO_FILL_RULE_WINDING) { -- while (left != NULL) { -- int in_out = left->edge.dir; -- -- right = left->next; -- if (left->deferred.right == NULL) { -- while (right != NULL && right->deferred.right == NULL) -- right = right->next; -- -- if (right != NULL && edges_colinear (left, right)) { -- /* continuation on left */ -- left->deferred = right->deferred; -- right->deferred.right = NULL; -- } -- } -- -- right = left->next; -- while (right != NULL) { -- if (right->deferred.right != NULL) -- _cairo_bo_edge_end (right, top, polygon); -- -- in_out += right->edge.dir; -- if (in_out == 0) { -- cairo_bo_edge_t *next; -- cairo_bool_t skip = FALSE; -- -- /* skip co-linear edges */ -- next = right->next; -- if (next != NULL) -- skip = edges_colinear (right, next); -+ if (fill_rule == CAIRO_FILL_RULE_WINDING) -+ mask = ~0; -+ else -+ mask = 1; - -- if (! skip) -- break; -- } -+ while (left != NULL) { -+ int in_out = left->edge.dir; - -+ right = left->next; -+ if (left->deferred.right == NULL) { -+ while (right != NULL && right->deferred.right == NULL) - right = right->next; -- } -- -- _cairo_bo_edge_start_or_continue (left, right, top, polygon); - -- left = right; -- if (left != NULL) -- left = left->next; -+ if (right != NULL && edges_colinear (left, right)) { -+ /* continuation on left */ -+ left->deferred = right->deferred; -+ right->deferred.right = NULL; -+ } - } -- } else { -- while (left != NULL) { -- int in_out = 0; - -- right = left->next; -- while (right != NULL) { -- if (right->deferred.right != NULL) -- _cairo_bo_edge_end (right, top, polygon); -+ right = left->next; -+ while (right != NULL) { -+ if (right->deferred.right != NULL) -+ _cairo_bo_edge_end (right, top, polygon); - -- if ((in_out++ & 1) == 0) { -- cairo_bo_edge_t *next; -- cairo_bool_t skip = FALSE; -- -- /* skip co-linear edges */ -- next = right->next; -- if (next != NULL) -- skip = edges_colinear (right, next); -- -- if (! skip) -- break; -- } -- -- right = right->next; -+ in_out += right->edge.dir; -+ if ((in_out & mask) == 0) { -+ /* skip co-linear edges */ -+ if (right->next == NULL || !edges_colinear (right, right->next)) -+ break; - } - -- _cairo_bo_edge_start_or_continue (left, right, top, polygon); -- -- left = right; -- if (left != NULL) -- left = left->next; -+ right = right->next; - } -+ -+ _cairo_bo_edge_start_or_continue (left, right, top, polygon); -+ -+ left = right; -+ if (left != NULL) -+ left = left->next; - } - } - -@@ -1303,12 +1271,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t **start_events, - - while ((event = _cairo_bo_event_dequeue (&event_queue))) { - if (event->point.y != sweep_line.current_y) { -- for (e1 = sweep_line.stopped; e1; e1 = e1->next) { -- if (e1->deferred.right != NULL) -- _cairo_bo_edge_end (e1, e1->edge.bottom, polygon); -- } -- sweep_line.stopped = NULL; -- - _active_edges_to_polygon (sweep_line.head, - sweep_line.current_y, - fill_rule, polygon); -@@ -1328,23 +1290,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t **start_events, - if (unlikely (status)) - goto unwind; - -- /* check to see if this is a continuation of a stopped edge */ -- /* XXX change to an infinitesimal lengthening rule */ -- for (left = sweep_line.stopped; left; left = left->next) { -- if (e1->edge.top <= left->edge.bottom && -- edges_colinear (e1, left)) -- { -- e1->deferred = left->deferred; -- if (left->prev != NULL) -- left->prev = left->next; -- else -- sweep_line.stopped = left->next; -- if (left->next != NULL) -- left->next->prev = left->prev; -- break; -- } -- } -- - left = e1->prev; - right = e1->next; - -@@ -1371,14 +1316,8 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t **start_events, - - _cairo_bo_sweep_line_delete (&sweep_line, e1); - -- /* first, check to see if we have a continuation via a fresh edge */ -- if (e1->deferred.right != NULL) { -- e1->next = sweep_line.stopped; -- if (sweep_line.stopped != NULL) -- sweep_line.stopped->prev = e1; -- sweep_line.stopped = e1; -- e1->prev = NULL; -- } -+ if (e1->deferred.right != NULL) -+ _cairo_bo_edge_end (e1, e1->edge.bottom, polygon); - - if (left != NULL && right != NULL) { - status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue, left, right); -@@ -1420,10 +1359,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t **start_events, - } - } - -- for (e1 = sweep_line.stopped; e1; e1 = e1->next) { -- if (e1->deferred.right != NULL) -- _cairo_bo_edge_end (e1, e1->edge.bottom, polygon); -- } - unwind: - _cairo_bo_event_queue_fini (&event_queue); - -@@ -1447,6 +1382,12 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon, - if (unlikely (0 == num_events)) - return CAIRO_STATUS_SUCCESS; - -+ if (DEBUG_POLYGON) { -+ FILE *file = fopen ("reduce_in.txt", "w"); -+ _cairo_debug_print_polygon (file, polygon); -+ fclose (file); -+ } -+ - events = stack_events; - event_ptrs = stack_event_ptrs; - if (num_events > ARRAY_LENGTH (stack_events)) { -@@ -1482,10 +1423,16 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon, - num_events, - fill_rule, - polygon); -- polygon->num_limits = num_limits; -+ polygon->num_limits = num_limits; - - if (events != stack_events) - free (events); - -+ if (DEBUG_POLYGON) { -+ FILE *file = fopen ("reduce_out.txt", "w"); -+ _cairo_debug_print_polygon (file, polygon); -+ fclose (file); -+ } -+ - return status; - } --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/cairo/git_fixes.diff b/extra/cairo/git_fixes.diff deleted file mode 100644 index 3fc7ff659..000000000 --- a/extra/cairo/git_fixes.diff +++ /dev/null @@ -1,934 +0,0 @@ -From e43f53bf7f3d371116f31f22ab9754b08b5abe7f Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 22 Oct 2012 12:47:11 +0000 -Subject: version: Post release bump to 1.12.7 - ---- -diff --git a/cairo-version.h b/cairo-version.h -index dc89a19..c685909 100644 ---- a/cairo-version.h -+++ b/cairo-version.h -@@ -3,6 +3,6 @@ - - #define CAIRO_VERSION_MAJOR 1 - #define CAIRO_VERSION_MINOR 12 --#define CAIRO_VERSION_MICRO 6 -+#define CAIRO_VERSION_MICRO 7 - - #endif --- -cgit v0.9.0.2-2-gbebe -From 00feb8ce530a472abbde445b52d9ae8c99ec97f0 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 26 Oct 2012 09:51:31 +0000 -Subject: xlib/shm: Sanity check that the server handles XSendEvent with ShmCompletion - -Uli Schlachter suggested it would be wiser to complement our blacklist -of known broken X/libXext with an explicit roundtrip to check for a -BadValue error return when we try to use XSendEvent. - -Suggested-by: Uli Schlachter <psychon@znc.in> -Reported-by: Martin Husemann <martin@duskware.de> -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c -index ec0d334..17594b1 100644 ---- a/src/cairo-xlib-surface-shm.c -+++ b/src/cairo-xlib-surface-shm.c -@@ -1128,8 +1128,60 @@ _cairo_xlib_shm_surface_is_idle (cairo_surface_t *surface) - (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap) - - static cairo_bool_t --xorg_has_buggy_send_shm_completion_event(Display *dpy) -+has_broken_send_shm_event (cairo_xlib_display_t *display, -+ cairo_xlib_shm_display_t *shm) - { -+ Display *dpy = display->display; -+ int (*old_handler) (Display *display, XErrorEvent *event); -+ XShmCompletionEvent ev; -+ XShmSegmentInfo info; -+ -+ info.shmid = shmget (IPC_PRIVATE, 0x1000, IPC_CREAT | 0600); -+ if (info.shmid == -1) -+ return TRUE; -+ -+ info.readOnly = FALSE; -+ info.shmaddr = shmat (info.shmid, NULL, 0); -+ if (info.shmaddr == (char *) -1) { -+ shmctl (info.shmid, IPC_RMID, NULL); -+ return TRUE; -+ } -+ -+ ev.type = shm->event; -+ ev.drawable = shm->window; -+ ev.major_code = shm->opcode; -+ ev.minor_code = X_ShmPutImage; -+ -+ ev.shmseg = info.shmid; -+ ev.offset = 0; -+ -+ assert (CAIRO_MUTEX_IS_LOCKED (_cairo_xlib_display_mutex)); -+ _x_error_occurred = FALSE; -+ -+ XLockDisplay (dpy); -+ XSync (dpy, False); -+ old_handler = XSetErrorHandler (_check_error_handler); -+ -+ XShmAttach (dpy, &info); -+ XSendEvent (dpy, ev.drawable, False, 0, (XEvent *)&ev); -+ XShmDetach (dpy, &info); -+ -+ XSync (dpy, False); -+ XSetErrorHandler (old_handler); -+ XUnlockDisplay (dpy); -+ -+ shmctl (info.shmid, IPC_RMID, NULL); -+ shmdt (info.shmaddr); -+ -+ return _x_error_occurred; -+} -+ -+static cairo_bool_t -+xorg_has_buggy_send_shm_completion_event(cairo_xlib_display_t *display, -+ cairo_xlib_shm_display_t *shm) -+{ -+ Display *dpy = display->display; -+ - /* As libXext sets the SEND_EVENT bit in the ShmCompletionEvent, - * the Xserver may crash if it does not take care when processing - * the event type. For instance versions of Xorg prior to 1.11.1 -@@ -1141,8 +1193,12 @@ xorg_has_buggy_send_shm_completion_event(Display *dpy) - * - * Remove the SendEvent bit (0x80) before doing range checks on event type. - */ -- return (strstr (ServerVendor (dpy), "X.Org") != NULL && -- VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1)); -+ if (strstr (ServerVendor (dpy), "X.Org") != NULL && -+ VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1)) -+ return TRUE; -+ -+ /* For everyone else check that no error is generated */ -+ return has_broken_send_shm_event (display, shm); - } - - void -@@ -1162,6 +1218,15 @@ _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) - if (unlikely (shm == NULL)) - return; - -+ codes = XInitExtension (display->display, SHMNAME); -+ if (codes == NULL) { -+ free (shm); -+ return; -+ } -+ -+ shm->opcode = codes ->major_opcode; -+ shm->event = codes->first_event; -+ - if (unlikely (_pqueue_init (&shm->info))) { - free (shm); - return; -@@ -1177,16 +1242,12 @@ _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) - DefaultVisual (display->display, scr), - CWOverrideRedirect, &attr); - -- if (xorg_has_buggy_send_shm_completion_event(display->display)) -+ if (xorg_has_buggy_send_shm_completion_event(display, shm)) - has_pixmap = 0; - - shm->has_pixmaps = has_pixmap ? MIN_PIXMAP_SIZE : 0; - cairo_list_init (&shm->pool); - -- codes = XInitExtension (display->display, SHMNAME); -- shm->opcode = codes ->major_opcode; -- shm->event = codes->first_event; -- - cairo_list_init (&shm->surfaces); - - display->shm = shm; --- -cgit v0.9.0.2-2-gbebe -From fdd2082f923012a1354be7086d03f78fb166695b Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 26 Oct 2012 09:51:31 +0000 -Subject: xlib: Check for both X.org and Xorg ServerVendors - -Martin Husemann reported that on his NetBSD machine the vendor was being -reported as "The Xorg Foundation", a non-conformist separatist split of -the Peoples' Liberation Army^W^W^W "The X.Org Foundation". Simply check -for both during initialisation. - -Reported-by: Martin Husemann <martin@duskware.de> -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c -index 67c0673..04c89b2 100644 ---- a/src/cairo-xlib-display.c -+++ b/src/cairo-xlib-display.c -@@ -315,7 +315,7 @@ _cairo_xlib_device_create (Display *dpy) - * safest to just blacklist all old-versioning-scheme X servers, - * (just using VendorRelease < 70000000), as buggy_repeat=TRUE. - */ -- if (strstr (ServerVendor (dpy), "X.Org") != NULL) { -+ if (_cairo_xlib_vendor_is_xorg (dpy)) { - if (VendorRelease (dpy) >= 60700000) { - if (VendorRelease (dpy) < 70000000) - display->buggy_repeat = TRUE; -diff --git a/src/cairo-xlib-private.h b/src/cairo-xlib-private.h -index d2bd588..c328302 100644 ---- a/src/cairo-xlib-private.h -+++ b/src/cairo-xlib-private.h -@@ -216,6 +216,13 @@ struct _cairo_xlib_proxy { - cairo_surface_t *owner; - }; - -+inline static cairo_bool_t -+_cairo_xlib_vendor_is_xorg (Display *dpy) -+{ -+ const char *const vendor = ServerVendor (dpy); -+ return strstr (vendor, "X.Org") || strstr (vendor, "Xorg"); -+} -+ - cairo_private cairo_status_t - _cairo_xlib_surface_get_gc (cairo_xlib_display_t *display, - cairo_xlib_surface_t *surface, -diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c -index 17594b1..89f51a9 100644 ---- a/src/cairo-xlib-surface-shm.c -+++ b/src/cairo-xlib-surface-shm.c -@@ -1193,7 +1193,7 @@ xorg_has_buggy_send_shm_completion_event(cairo_xlib_display_t *display, - * - * Remove the SendEvent bit (0x80) before doing range checks on event type. - */ -- if (strstr (ServerVendor (dpy), "X.Org") != NULL && -+ if (_cairo_xlib_vendor_is_xorg (dpy) && - VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1)) - return TRUE; - --- -cgit v0.9.0.2-2-gbebe -From d57e652f08f5ff7c334d01bc071962e6a131928f Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Fri, 26 Oct 2012 12:30:01 +0000 -Subject: type1-subset: parse all operators - -The PDF at bug 56265 contained a Type 1 font that used the "div" -operator to compute the glyph width. As the "div" operator was -not handled by the charstring parser this resulted in an incorrect -glyph width in the PDF output. - -Fix this by upgrading the charstring parsing to handle all Type 1 -operators. ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index 1bdb12b..c7f613a 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -137,13 +137,10 @@ typedef struct _cairo_type1_font_subset { - int hex_column; - - struct { -- int stack[TYPE1_STACKSIZE], sp, top_value; -+ double stack[TYPE1_STACKSIZE]; -+ int sp; - } build_stack; - -- struct { -- int other_subr_args[TYPE1_STACKSIZE], num_other_subr_args, cur_other_subr_arg; -- } ps_stack; -- - - } cairo_type1_font_subset_t; - -@@ -742,15 +739,33 @@ use_standard_encoding_glyph (cairo_type1_font_subset_t *font, int index) - return CAIRO_INT_STATUS_UNSUPPORTED; - } - --#define TYPE1_CHARSTRING_COMMAND_ESCAPE 0x0c --#define TYPE1_CHARSTRING_COMMAND_SEAC 0x0c06 --#define TYPE1_CHARSTRING_COMMAND_SBW 0x0c07 --#define TYPE1_CHARSTRING_COMMAND_HSBW 0x0d --#define TYPE1_CHARSTRING_COMMAND_CALLSUBR 0x0a --#define TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR 0x0c10 --#define TYPE1_CHARSTRING_COMMAND_POP 0x0c11 -- - -+#define TYPE1_CHARSTRING_COMMAND_HSTEM 0x01 -+#define TYPE1_CHARSTRING_COMMAND_VSTEM 0x03 -+#define TYPE1_CHARSTRING_COMMAND_VMOVETO 0x04 -+#define TYPE1_CHARSTRING_COMMAND_RLINETO 0x05 -+#define TYPE1_CHARSTRING_COMMAND_HLINETO 0x06 -+#define TYPE1_CHARSTRING_COMMAND_VLINETO 0x07 -+#define TYPE1_CHARSTRING_COMMAND_RRCURVETO 0x08 -+#define TYPE1_CHARSTRING_COMMAND_CLOSEPATH 0x09 -+#define TYPE1_CHARSTRING_COMMAND_CALLSUBR 0x0a -+#define TYPE1_CHARSTRING_COMMAND_RETURN 0x0b -+#define TYPE1_CHARSTRING_COMMAND_ESCAPE 0x0c -+#define TYPE1_CHARSTRING_COMMAND_HSBW 0x0d -+#define TYPE1_CHARSTRING_COMMAND_ENDCHAR 0x0e -+#define TYPE1_CHARSTRING_COMMAND_RMOVETO 0x15 -+#define TYPE1_CHARSTRING_COMMAND_HMOVETO 0x16 -+#define TYPE1_CHARSTRING_COMMAND_VHCURVETO 0x1e -+#define TYPE1_CHARSTRING_COMMAND_HVCURVETO 0x1f -+#define TYPE1_CHARSTRING_COMMAND_DOTSECTION 0x0c00 -+#define TYPE1_CHARSTRING_COMMAND_VSTEM3 0x0c01 -+#define TYPE1_CHARSTRING_COMMAND_HSTEM3 0x0c02 -+#define TYPE1_CHARSTRING_COMMAND_SEAC 0x0c06 -+#define TYPE1_CHARSTRING_COMMAND_SBW 0x0c07 -+#define TYPE1_CHARSTRING_COMMAND_DIV 0x0c0c -+#define TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR 0x0c10 -+#define TYPE1_CHARSTRING_COMMAND_POP 0x0c11 -+#define TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT 0x0c21 - - /* Get glyph width and look for seac operatorParse charstring */ - static cairo_status_t -@@ -765,7 +780,6 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - const unsigned char *p; - cairo_bool_t last_op_was_integer; - int command; -- int subr_num, i; - - charstring = malloc (encrypted_charstring_length); - if (unlikely (charstring == NULL)) -@@ -785,37 +799,60 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - if (*p < 32) { - command = *p++; - switch (command) { -- case TYPE1_CHARSTRING_COMMAND_HSBW: -- if (! last_op_was_integer) -- return CAIRO_INT_STATUS_UNSUPPORTED; -- -- font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; -+ case TYPE1_CHARSTRING_COMMAND_HSTEM: -+ case TYPE1_CHARSTRING_COMMAND_VSTEM: -+ case TYPE1_CHARSTRING_COMMAND_VMOVETO: -+ case TYPE1_CHARSTRING_COMMAND_RLINETO: -+ case TYPE1_CHARSTRING_COMMAND_HLINETO: -+ case TYPE1_CHARSTRING_COMMAND_VLINETO: -+ case TYPE1_CHARSTRING_COMMAND_RRCURVETO: -+ case TYPE1_CHARSTRING_COMMAND_CLOSEPATH: -+ case TYPE1_CHARSTRING_COMMAND_RMOVETO: -+ case TYPE1_CHARSTRING_COMMAND_HMOVETO: -+ case TYPE1_CHARSTRING_COMMAND_VHCURVETO: -+ case TYPE1_CHARSTRING_COMMAND_HVCURVETO: -+ case TYPE1_CHARSTRING_COMMAND_RETURN: -+ case TYPE1_CHARSTRING_COMMAND_ENDCHAR: -+ default: - font->build_stack.sp = 0; -- last_op_was_integer = FALSE; - break; - - case TYPE1_CHARSTRING_COMMAND_CALLSUBR: -- if (font->subset_subrs && -- last_op_was_integer && -- font->build_stack.top_value >= 0 && -- font->build_stack.top_value < font->num_subrs) -- { -- subr_num = font->build_stack.top_value; -- font->build_stack.sp--; -- font->subrs[subr_num].used = TRUE; -- last_op_was_integer = FALSE; -- status = cairo_type1_font_subset_parse_charstring (font, -- glyph, -- font->subrs[subr_num].subr_string, -- font->subrs[subr_num].subr_length); -- } else { -- font->subset_subrs = FALSE; -+ if (font->subset_subrs && font->build_stack.sp > 0) { -+ int subr_num = font->build_stack.stack[--font->build_stack.sp]; -+ if (subr_num >= 0 && subr_num < font->num_subrs) { -+ font->subrs[subr_num].used = TRUE; -+ status = cairo_type1_font_subset_parse_charstring ( -+ font, -+ glyph, -+ font->subrs[subr_num].subr_string, -+ font->subrs[subr_num].subr_length); -+ break; -+ } - } -+ font->subset_subrs = FALSE; -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_HSBW: -+ if (font->build_stack.sp < 2) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; -+ font->build_stack.sp = 0; - break; - - case TYPE1_CHARSTRING_COMMAND_ESCAPE: - command = command << 8 | *p++; - switch (command) { -+ case TYPE1_CHARSTRING_COMMAND_DOTSECTION: -+ case TYPE1_CHARSTRING_COMMAND_VSTEM3: -+ case TYPE1_CHARSTRING_COMMAND_HSTEM3: -+ case TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT: -+ case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -+ default: -+ font->build_stack.sp = 0; -+ break; -+ - case TYPE1_CHARSTRING_COMMAND_SEAC: - /* The seac command takes five integer arguments. The - * last two are glyph indices into the PS standard -@@ -823,6 +860,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - * glyph is composed from. All we need to do is to - * make sure those glyphs are present in the subset - * under their standard names. */ -+ if (font->build_stack.sp < 5) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ - status = use_standard_encoding_glyph (font, font->build_stack.stack[3]); - if (unlikely (status)) - return status; -@@ -832,55 +872,49 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - return status; - - font->build_stack.sp = 0; -- last_op_was_integer = FALSE; - break; - - case TYPE1_CHARSTRING_COMMAND_SBW: -- if (! last_op_was_integer) -+ if (font->build_stack.sp < 4) - return CAIRO_INT_STATUS_UNSUPPORTED; - - font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; - font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -- for (i = 0; i < font->build_stack.sp; i++) -- font->ps_stack.other_subr_args[i] = font->build_stack.stack[i]; -- font->ps_stack.num_other_subr_args = font->build_stack.sp; -- font->ps_stack.cur_other_subr_arg = 0; -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; - break; - -- case TYPE1_CHARSTRING_COMMAND_POP: -- if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) { -- font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++]; -- last_op_was_integer = TRUE; -+ case TYPE1_CHARSTRING_COMMAND_DIV: -+ if (font->build_stack.sp < 2) { -+ return CAIRO_INT_STATUS_UNSUPPORTED; - } else { -- font->subset_subrs = FALSE; -+ double num1 = font->build_stack.stack[font->build_stack.sp - 2]; -+ double num2 = font->build_stack.stack[font->build_stack.sp - 1]; -+ font->build_stack.sp--; -+ if (num2 == 0.0) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->build_stack.stack[font->build_stack.sp - 1] = num1/num2; - } - break; - -- default: -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -+ case TYPE1_CHARSTRING_COMMAND_POP: -+ if (font->build_stack.sp < TYPE1_STACKSIZE) { -+ /* use negative number to prevent it being used as a subr_num */ -+ font->build_stack.stack[font->build_stack.sp++] = -1.0; -+ } - break; - } - break; -- -- default: -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; - } -- } else { -+ } else { - /* integer argument */ -- p = cairo_type1_font_subset_decode_integer (p, &font->build_stack.top_value); -- last_op_was_integer = TRUE; -- if (font->build_stack.sp < TYPE1_STACKSIZE) -- font->build_stack.stack[font->build_stack.sp++] = font->build_stack.top_value; -- } -+ if (font->build_stack.sp < TYPE1_STACKSIZE) { -+ int val; -+ p = cairo_type1_font_subset_decode_integer (p, &val); -+ font->build_stack.stack[font->build_stack.sp++] = val; -+ } else { -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ } -+ } - } - - free (charstring); -@@ -1321,7 +1355,6 @@ skip_subrs: - for (j = 0; j < font->num_glyphs; j++) { - glyph = font->subset_index_to_glyphs[j]; - font->build_stack.sp = 0; -- font->ps_stack.num_other_subr_args = 0; - status = cairo_type1_font_subset_parse_charstring (font, - glyph, - font->glyphs[glyph].encrypted_charstring, --- -cgit v0.9.0.2-2-gbebe -From f18199fcfb3b052c198041fc05156ae3d9e6aee7 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 28 Oct 2012 10:04:12 +0000 -Subject: xlib/shm: Check for XShm headers - -Not all version of libXext ship the same set of headers, so play safe -and check during configure that we have the headers we depend upon in -the code. - -Reported-by: Sebastian Haas <sehaas@gmail.com> -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/configure.ac b/configure.ac -index 7adbeb1..021ec8e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -105,6 +105,10 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib, auto, [ - AC_MSG_RESULT(no), - AC_MSG_RESULT(assuming no)) - fi -+ -+ AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h], [], [], -+ [#include <X11/Xlibint.h> -+ #include <X11/Xproto.h>]) - ]) - - CAIRO_ENABLE_SURFACE_BACKEND(xlib_xrender, Xlib Xrender, auto, [ -diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c -index 89f51a9..a3d4385 100644 ---- a/src/cairo-xlib-surface-shm.c -+++ b/src/cairo-xlib-surface-shm.c -@@ -41,12 +41,105 @@ - - #include "cairo-xlib-private.h" - #include "cairo-xlib-surface-private.h" --#include "cairo-image-surface-private.h" --#include "cairo-mempool-private.h" -+ -+#if !HAVE_X11_EXTENSIONS_XSHM_H || !HAVE_X11_EXTENSIONS_SHMPROTO_H -+void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {} -+ -+cairo_surface_t * -+_cairo_xlib_surface_get_shm (cairo_xlib_surface_t *surface, -+ cairo_bool_t overwrite) -+{ -+ return NULL; -+} -+ -+cairo_int_status_t -+_cairo_xlib_surface_put_shm (cairo_xlib_surface_t *surface) -+{ -+ ASSERT_NOT_REACHED; -+ return CAIRO_INT_STATUS_SUCCESS; -+} -+ -+cairo_surface_t * -+_cairo_xlib_surface_create_shm (cairo_xlib_surface_t *other, -+ pixman_format_code_t format, -+ int width, int height) -+{ -+ return NULL; -+} -+ -+cairo_surface_t * -+_cairo_xlib_surface_create_shm__image (cairo_xlib_surface_t *surface, -+ pixman_format_code_t format, -+ int width, int height) -+{ -+ return NULL; -+} -+ -+cairo_surface_t * -+_cairo_xlib_surface_create_similar_shm (void *other, -+ cairo_format_t format, -+ int width, int height) -+{ -+ return cairo_image_surface_create (format, width, height); -+} -+ -+void -+_cairo_xlib_shm_surface_mark_active (cairo_surface_t *_shm) -+{ -+ ASSERT_NOT_REACHED; -+} -+ -+void -+_cairo_xlib_shm_surface_get_ximage (cairo_surface_t *surface, -+ XImage *ximage) -+{ -+ ASSERT_NOT_REACHED; -+} -+ -+void * -+_cairo_xlib_shm_surface_get_obdata (cairo_surface_t *surface) -+{ -+ ASSERT_NOT_REACHED; -+ return NULL; -+} -+ -+Pixmap -+_cairo_xlib_shm_surface_get_pixmap (cairo_surface_t *surface) -+{ -+ ASSERT_NOT_REACHED; -+ return 0; -+} -+ -+XRenderPictFormat * -+_cairo_xlib_shm_surface_get_xrender_format (cairo_surface_t *surface) -+{ -+ ASSERT_NOT_REACHED; -+ return NULL; -+} -+ -+cairo_bool_t -+_cairo_xlib_shm_surface_is_active (cairo_surface_t *surface) -+{ -+ ASSERT_NOT_REACHED; -+ return FALSE; -+} -+ -+cairo_bool_t -+_cairo_xlib_shm_surface_is_idle (cairo_surface_t *surface) -+{ -+ ASSERT_NOT_REACHED; -+ return TRUE; -+} -+ -+void _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display) {} -+ -+#else - - #include "cairo-damage-private.h" - #include "cairo-default-context-private.h" -+#include "cairo-image-surface-private.h" - #include "cairo-list-inline.h" -+#include "cairo-mempool-private.h" - - #include <X11/Xlibint.h> - #include <X11/Xproto.h> -@@ -1281,5 +1374,5 @@ _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display) - free (shm); - display->shm = NULL; - } -- -+#endif - #endif --- -cgit v0.9.0.2-2-gbebe -From 0e2458697848cf8c89c9d57fa9b64f0ea7bd0877 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 28 Oct 2012 10:08:39 +0000 -Subject: xlib/shm: Use shmstr.h instead of shmproto.h if available - -Before it was known as shmproto.h, the wire protocol definition was to -be found in shmstr.h, so if we don't have the current version of libXext -try to use the older includes. - -Reported-by: Sebastian Haas <sehaas@gmail.com> -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/configure.ac b/configure.ac -index 021ec8e..f523284 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -106,7 +106,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib, auto, [ - AC_MSG_RESULT(assuming no)) - fi - -- AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h], [], [], -+ AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h X11/extensions/shmstr.h], [], [], - [#include <X11/Xlibint.h> - #include <X11/Xproto.h>]) - ]) -diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c -index a3d4385..44e6284 100644 ---- a/src/cairo-xlib-surface-shm.c -+++ b/src/cairo-xlib-surface-shm.c -@@ -42,7 +42,7 @@ - #include "cairo-xlib-private.h" - #include "cairo-xlib-surface-private.h" - --#if !HAVE_X11_EXTENSIONS_XSHM_H || !HAVE_X11_EXTENSIONS_SHMPROTO_H -+#if !HAVE_X11_EXTENSIONS_XSHM_H || !(HAVE_X11_EXTENSIONS_SHMPROTO_H || HAVE_X11_EXTENSIONS_SHMSTR_H) - void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {} - - cairo_surface_t * -@@ -144,7 +144,11 @@ void _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display) {} - #include <X11/Xlibint.h> - #include <X11/Xproto.h> - #include <X11/extensions/XShm.h> -+#if HAVE_X11_EXTENSIONS_SHMPROTO_H - #include <X11/extensions/shmproto.h> -+#elif HAVE_X11_EXTENSIONS_SHMSTR_H -+#include <X11/extensions/shmstr.h> -+#endif - #include <sys/ipc.h> - #include <sys/shm.h> - --- -cgit v0.9.0.2-2-gbebe -From 5a6e1d680a5bf1c4091e74f999abd611abd92334 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Sun, 28 Oct 2012 10:28:52 +0000 -Subject: type1-subset: restore correct callothersub behavior - -that was removed in d57e652f. Without this subsetting of subroutines -won't work for some fonts. ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index c7f613a..786055a 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -141,6 +141,11 @@ typedef struct _cairo_type1_font_subset { - int sp; - } build_stack; - -+ struct { -+ int stack[TYPE1_STACKSIZE]; -+ int sp; -+ } ps_stack; -+ - - } cairo_type1_font_subset_t; - -@@ -767,7 +772,9 @@ use_standard_encoding_glyph (cairo_type1_font_subset_t *font, int index) - #define TYPE1_CHARSTRING_COMMAND_POP 0x0c11 - #define TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT 0x0c21 - --/* Get glyph width and look for seac operatorParse charstring */ -+/* Parse the charstring, including recursing into subroutines. Find -+ * the glyph width, subroutines called, and glyphs required by the -+ * SEAC operator. */ - static cairo_status_t - cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - int glyph, -@@ -814,6 +821,7 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - case TYPE1_CHARSTRING_COMMAND_RETURN: - case TYPE1_CHARSTRING_COMMAND_ENDCHAR: - default: -+ /* stack clearing operator */ - font->build_stack.sp = 0; - break; - -@@ -848,8 +856,8 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - case TYPE1_CHARSTRING_COMMAND_VSTEM3: - case TYPE1_CHARSTRING_COMMAND_HSTEM3: - case TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT: -- case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: - default: -+ /* stack clearing operator */ - font->build_stack.sp = 0; - break; - -@@ -896,11 +904,25 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - } - break; - -+ case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -+ if (font->build_stack.sp < 1) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->build_stack.sp--; -+ font->ps_stack.sp = 0; -+ while (font->build_stack.sp) -+ font->ps_stack.stack[font->ps_stack.sp++] = font->build_stack.stack[--font->build_stack.sp]; -+ -+ break; -+ - case TYPE1_CHARSTRING_COMMAND_POP: -- if (font->build_stack.sp < TYPE1_STACKSIZE) { -- /* use negative number to prevent it being used as a subr_num */ -- font->build_stack.stack[font->build_stack.sp++] = -1.0; -- } -+ if (font->ps_stack.sp < 1) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ /* T1 spec states that if the interpreter does not -+ * support executing the callothersub, the results -+ * must be taken from the callothersub arguments. */ -+ font->build_stack.stack[font->build_stack.sp++] = font->ps_stack.stack[--font->ps_stack.sp]; - break; - } - break; -@@ -1355,6 +1377,7 @@ skip_subrs: - for (j = 0; j < font->num_glyphs; j++) { - glyph = font->subset_index_to_glyphs[j]; - font->build_stack.sp = 0; -+ font->ps_stack.sp = 0; - status = cairo_type1_font_subset_parse_charstring (font, - glyph, - font->glyphs[glyph].encrypted_charstring, --- -cgit v0.9.0.2-2-gbebe -From 0c800dc3f64ee030df1cd0a6a1dcd6df71502dea Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Tue, 30 Oct 2012 08:53:30 +0000 -Subject: type1-subset: ensure subroutine numnber is an integer - ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index 786055a..dff4a95 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -827,15 +827,18 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - - case TYPE1_CHARSTRING_COMMAND_CALLSUBR: - if (font->subset_subrs && font->build_stack.sp > 0) { -- int subr_num = font->build_stack.stack[--font->build_stack.sp]; -- if (subr_num >= 0 && subr_num < font->num_subrs) { -- font->subrs[subr_num].used = TRUE; -- status = cairo_type1_font_subset_parse_charstring ( -- font, -- glyph, -- font->subrs[subr_num].subr_string, -- font->subrs[subr_num].subr_length); -- break; -+ double int_val; -+ if (modf(font->build_stack.stack[--font->build_stack.sp], &int_val) == 0.0) { -+ int subr_num = int_val; -+ if (subr_num >= 0 && subr_num < font->num_subrs) { -+ font->subrs[subr_num].used = TRUE; -+ status = cairo_type1_font_subset_parse_charstring ( -+ font, -+ glyph, -+ font->subrs[subr_num].subr_string, -+ font->subrs[subr_num].subr_length); -+ break; -+ } - } - } - font->subset_subrs = FALSE; --- -cgit v0.9.0.2-2-gbebe -From 65176b7380f0d633da514be1febe16f17b99d876 Mon Sep 17 00:00:00 2001 -From: Kevin Tardif <kiyoka@gmail.com> -Date: Tue, 30 Oct 2012 04:27:27 +0000 -Subject: type1-subset, cff-subset: Plugged 2 memory leaks - -- _cairo_type1_font_subset_fini doesn't free font->cleartext -- _cairo_cff_font_create can exit without freeing font->font_name and/or - font->data; _cairo_cff_font_load_opentype_cff is called to allocate - font_name, then _cairo_cff_font_load_cff is called to allocate - font->data, then _cairo_cff_font_load_cff's return status is checked - and if it failed, it jumps to fail1. This can cause font_name to leak - since the fail1 target only frees the font variable. In addition, - _cairo_cff_font_load_cff can fail -after- allocating data, and then - data won't be freed either. - -Bug 56566 ---- -diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c -index e3040fc..bd8d5b5 100644 ---- a/src/cairo-cff-subset.c -+++ b/src/cairo-cff-subset.c -@@ -2787,7 +2787,7 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t *scaled_font_subset, - if (backend->is_synthetic && backend->is_synthetic (scaled_font_subset->scaled_font)) - return CAIRO_INT_STATUS_UNSUPPORTED; - -- font = malloc (sizeof (cairo_cff_font_t)); -+ font = calloc (1, sizeof (cairo_cff_font_t)); - if (unlikely (font == NULL)) - return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -@@ -2862,11 +2862,11 @@ fail4: - fail3: - free (font->subset_font_name); - fail2: -- free (font->data); -- free (font->font_name); - free (font->ps_name); - _cairo_array_fini (&font->output); - fail1: -+ free (font->data); -+ free (font->font_name); - free (font); - - return status; -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index dff4a95..2ec56f1 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -1670,6 +1670,8 @@ _cairo_type1_font_subset_fini (cairo_type1_font_subset_t *font) - - free (font->subset_index_to_glyphs); - -+ free (font->cleartext); -+ - return status; - } - --- -cgit v0.9.0.2-2-gbebe -From 66625cb46c985321c46b79d2163a4d676d6700ba Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Tue, 30 Oct 2012 12:40:41 +0000 -Subject: xlib: Apply the image offsets to the destination rather the source - -So that we can specify the entire source surface as the region to copy -and not introduce clipping errors. - -Fixes regression from -commit c068691ff57c2f6cd750a54db17393c0e132cb00 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri Aug 17 21:33:54 2012 +0100 - - xlib/shm: Use an impromptu upload ShmSegment - -Reported-by: John Lindgren <john.lindgren@aol.com> -Reported-by: Kalev Lember <kalevlember@gmail.com> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56547 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-xlib-render-compositor.c b/src/cairo-xlib-render-compositor.c -index e325382..74c43e9 100644 ---- a/src/cairo-xlib-render-compositor.c -+++ b/src/cairo-xlib-render-compositor.c -@@ -179,22 +179,19 @@ copy_image_boxes (void *_dst, - int x2 = _cairo_fixed_integer_part (chunk->base[i].p2.x); - int y2 = _cairo_fixed_integer_part (chunk->base[i].p2.y); - -- rects[j].x = x1; -- rects[j].y = y1; -- rects[j].width = x2 - x1; -- rects[j].height = y2 - y1; -- j++; -+ if (x2 > x1 && y2 > y1) { -+ rects[j].x = x1; -+ rects[j].y = y1; -+ rects[j].width = x2 - x1; -+ rects[j].height = y2 - y1; -+ j++; -+ } - } - } -- assert (j == boxes->num_boxes); - - XSetClipRectangles (dst->dpy, gc, 0, 0, rects, j, Unsorted); -- - XCopyArea (dst->dpy, src, dst->drawable, gc, -- dx, dy, -- image->width, image->height, -- 0, 0); -- -+ 0, 0, image->width, image->height, -dx, -dy); - XSetClipMask (dst->dpy, gc, None); - - if (rects != stack_rects) -@@ -337,7 +334,8 @@ draw_image_boxes (void *_dst, - - if (_cairo_xlib_shm_surface_get_pixmap (&image->base)) { - status = copy_image_boxes (dst, image, boxes, dx, dy); -- goto out; -+ if (status != CAIRO_INT_STATUS_UNSUPPORTED) -+ goto out; - } - } - } --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/cairo/git_fixes.patch b/extra/cairo/git_fixes.patch deleted file mode 100644 index 6ad8979eb..000000000 --- a/extra/cairo/git_fixes.patch +++ /dev/null @@ -1,1086 +0,0 @@ -From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Sun, 25 Mar 2012 18:37:14 +0000 -Subject: Fix math in comments - ---- -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index dc07fee..6977e88 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -139,7 +139,7 @@ _arc_segments_needed (double angle, - - From that paper, a very practical value of h is: - -- h = 4/3 * tan(angle/4) -+ h = 4/3 * R * tan(angle/4) - - This value does not give the spline with minimal error, but it does - provide a very good approximation, (6th-order convergence), and the --- -cgit v0.9.0.2-2-gbebe -From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Tue, 27 Mar 2012 21:25:37 +0000 -Subject: gl: use font's antialias option to check whether it needs mask - -There is need to loop over number of glyphs to check wether the glyph -image is a ARGB32 as the font's antialias option can be used for checking. -If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32, -otherwise it will be A8 format. Therefore we will only be using -component-alpha at SUBPIXEL (or better) font quality and only then need -a mask for multiple pass glyph composition. ---- -diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c -index 832956f..9756ea4 100644 ---- a/src/cairo-gl-glyphs.c -+++ b/src/cairo-gl-glyphs.c -@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void *_dst, - - TRACE ((stderr, "%s\n", __FUNCTION__)); - -- /* If any of the glyphs are component alpha, we have to go through a mask, -- * since only _cairo_gl_surface_composite() currently supports component -- * alpha. -+ /* If any of the glyphs require component alpha, we have to go through -+ * a mask, since only _cairo_gl_surface_composite() currently supports -+ * component alpha. - */ -- if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) { -- for (i = 0; i < info->num_glyphs; i++) { -- cairo_scaled_glyph_t *scaled_glyph; -- -- if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index, -- CAIRO_SCALED_GLYPH_INFO_SURFACE, -- &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS && -- scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32) -- { -- info->use_mask = TRUE; -- break; -- } -- } -+ if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER && -+ (info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL || -+ info->font->options.antialias == CAIRO_ANTIALIAS_BEST)) -+ { -+ info->use_mask = TRUE; - } - - if (info->use_mask) { --- -cgit v0.9.0.2-2-gbebe -From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 28 Mar 2012 23:32:36 +0000 -Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask - -The SOURCE and CLEAR are the odd pair in Cairo's range of operators that -are bound by the shape/mask, but are unbound by the source. This -regularly leads to bugs as only track the bound/unbound rectangles and -confuse the meaning when bound only by the mask. - -What is required is that the unbound extents in this case is only -trimmed by the mask (the bounded extents are still the intersection of -all). - -Fixes bug-source-cu - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c -index 106571e..8c5cd5a 100644 ---- a/src/cairo-composite-rectangles.c -+++ b/src/cairo-composite-rectangles.c -@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents, - if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) - return CAIRO_INT_STATUS_NOTHING_TO_DO; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); - if (_cairo_clip_is_all_clipped (extents->clip)) -@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles - rect.height == extents->bounded.height) - return CAIRO_INT_STATUS_SUCCESS; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - clip = extents->clip; - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); -@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t - mask.height == extents->bounded.height) - return CAIRO_INT_STATUS_SUCCESS; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - clip = extents->clip; - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); --- -cgit v0.9.0.2-2-gbebe -From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Thu, 29 Mar 2012 13:48:24 +0000 -Subject: cairoint: Mark PDF surface as requiring the deflate stream output - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairoint.h b/src/cairoint.h -index 9a8003e..9f20d51 100644 ---- a/src/cairoint.h -+++ b/src/cairoint.h -@@ -73,7 +73,10 @@ - #include "cairo-compiler-private.h" - #include "cairo-error-private.h" - --#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE -+#if CAIRO_HAS_PDF_SURFACE || \ -+ CAIRO_HAS_PS_SURFACE || \ -+ CAIRO_HAS_SCRIPT_SURFACE || \ -+ CAIRO_HAS_XML_SURFACE - #define CAIRO_HAS_DEFLATE_STREAM 1 - #endif - -@@ -84,7 +87,9 @@ - #define CAIRO_HAS_FONT_SUBSET 1 - #endif - --#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET -+#if CAIRO_HAS_PS_SURFACE || \ -+ CAIRO_HAS_PDF_SURFACE || \ -+ CAIRO_HAS_FONT_SUBSET - #define CAIRO_HAS_PDF_OPERATORS 1 - #endif - --- -cgit v0.9.0.2-2-gbebe -From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Thu, 29 Mar 2012 01:08:51 +0000 -Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface - -We need to fix y-axis origin when map a GL surface to image surface for -non-texture GL surface. - -Test cases: extended-blend-alpha-mask, extended-blend-mask. -Although the image outputs is not right, but the image on the first grid -(upper-left corner) is correct comparing to image output. ---- -diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c -index 8bbf939..32ecf63 100644 ---- a/src/cairo-gl-surface.c -+++ b/src/cairo-gl-surface.c -@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void *abstract_surface, - unsigned int cpp; - cairo_bool_t invert; - cairo_status_t status; -+ int y; - - /* Want to use a switch statement here but the compiler gets whiny. */ - if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) { -@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void *abstract_surface, - glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp); - if (invert) - glPixelStorei (GL_PACK_INVERT_MESA, 1); -- glReadPixels (extents->x, extents->y, -+ -+ y = extents->y; -+ if (! _cairo_gl_surface_is_texture (surface)) -+ y = surface->height - extents->y - extents->height; -+ -+ glReadPixels (extents->x, y, - extents->width, extents->height, - format, type, image->data); - if (invert) --- -cgit v0.9.0.2-2-gbebe -From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Mon, 02 Apr 2012 18:43:00 +0000 -Subject: xcb: Fix SHM in _get_image() - -Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM -path when getting the image via SHM failed, we now did the fallback when getting -the image via SHM worked (which means that the SHM operation was a waste of -time). - -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c -index fff4f52..6bedbda 100644 ---- a/src/cairo-xcb-surface.c -+++ b/src/cairo-xcb-surface.c -@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t *surface, - if (use_shm) { - image = _get_shm_image (surface, x, y, width, height); - if (image) { -- if (image->status) { -+ if (image->status == CAIRO_STATUS_SUCCESS) { - _cairo_xcb_connection_release (connection); - return image; - } --- -cgit v0.9.0.2-2-gbebe -From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Mon, 02 Apr 2012 21:29:47 +0000 -Subject: gl: Remove an unused variable - ---- -diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c -index b364b92..ce7c0dd 100644 ---- a/src/cairo-gl-gradient.c -+++ b/src/cairo-gl-gradient.c -@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t *ctx, - cairo_status_t status; - int tex_width; - void *data; -- cairo_gl_dispatch_t *dispatch = &ctx->dispatch; - - if ((unsigned int) ctx->max_texture_size / 2 <= n_stops) - return CAIRO_INT_STATUS_UNSUPPORTED; --- -cgit v0.9.0.2-2-gbebe -From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Wed, 04 Apr 2012 10:23:09 +0000 -Subject: fix bug in _cairo_image_analyze_color - ---- -diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c -index 8208a15..e860e1b 100644 ---- a/src/cairo-image-surface.c -+++ b/src/cairo-image-surface.c -@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t *image) - if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR) - return image->color; - -- if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8) -+ if (image->format == CAIRO_FORMAT_A1) - return image->color = CAIRO_IMAGE_IS_MONOCHROME; - -+ if (image->format == CAIRO_FORMAT_A8) -+ return image->color = CAIRO_IMAGE_IS_GRAYSCALE; -+ - if (image->format == CAIRO_FORMAT_ARGB32) { - image->color = CAIRO_IMAGE_IS_MONOCHROME; - for (y = 0; y < image->height; y++) { --- -cgit v0.9.0.2-2-gbebe -From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 05 Apr 2012 23:43:35 +0000 -Subject: type1-subset: use fallback font if glyph widths are calculated - -Bug 48349 has a pdf file with a Type 1 font where the glyph widths are -of the form: - -34 9302 19 div hsbw ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index 607ac8e..ba1008a 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - command = *p++; - switch (command) { - case TYPE1_CHARSTRING_COMMAND_HSBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ - font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; -@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - break; - - case TYPE1_CHARSTRING_COMMAND_SBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ - font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; --- -cgit v0.9.0.2-2-gbebe -From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 05 Apr 2012 23:53:50 +0000 -Subject: fix indentation in cairo_type1_font_subset_parse_charstring - ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index ba1008a..ddef8ae 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -1,3 +1,4 @@ -+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ - /* cairo - a vector graphics library with display and print output - * - * Copyright © 2006 Red Hat, Inc -@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - if (*p < 32) { - command = *p++; - switch (command) { -- case TYPE1_CHARSTRING_COMMAND_HSBW: -- if (! last_op_was_integer) -- return CAIRO_INT_STATUS_UNSUPPORTED; -+ case TYPE1_CHARSTRING_COMMAND_HSBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_CALLSUBR: -+ if (font->subset_subrs && -+ last_op_was_integer && -+ font->build_stack.top_value >= 0 && -+ font->build_stack.top_value < font->num_subrs) -+ { -+ subr_num = font->build_stack.top_value; -+ font->subrs[subr_num].used = TRUE; -+ last_op_was_integer = FALSE; -+ status = cairo_type1_font_subset_parse_charstring (font, -+ glyph, -+ font->subrs[subr_num].subr_string, -+ font->subrs[subr_num].subr_length); -+ } else { -+ font->subset_subrs = FALSE; -+ } -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_ESCAPE: -+ command = command << 8 | *p++; -+ switch (command) { -+ case TYPE1_CHARSTRING_COMMAND_SEAC: -+ /* The seac command takes five integer arguments. The -+ * last two are glyph indices into the PS standard -+ * encoding give the names of the glyphs that this -+ * glyph is composed from. All we need to do is to -+ * make sure those glyphs are present in the subset -+ * under their standard names. */ -+ status = use_standard_encoding_glyph (font, font->build_stack.stack[3]); -+ if (unlikely (status)) -+ return status; -+ -+ status = use_standard_encoding_glyph (font, font->build_stack.stack[4]); -+ if (unlikely (status)) -+ return status; - -- font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; - break; - -- case TYPE1_CHARSTRING_COMMAND_CALLSUBR: -- if (font->subset_subrs && -- last_op_was_integer && -- font->build_stack.top_value >= 0 && -- font->build_stack.top_value < font->num_subrs) -- { -- subr_num = font->build_stack.top_value; -- font->subrs[subr_num].used = TRUE; -- last_op_was_integer = FALSE; -- status = cairo_type1_font_subset_parse_charstring (font, -- glyph, -- font->subrs[subr_num].subr_string, -- font->subrs[subr_num].subr_length); -- } else { -- font->subset_subrs = FALSE; -- } -+ case TYPE1_CHARSTRING_COMMAND_SBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; - break; - -- case TYPE1_CHARSTRING_COMMAND_ESCAPE: -- command = command << 8 | *p++; -- switch (command) { -- case TYPE1_CHARSTRING_COMMAND_SEAC: -- /* The seac command takes five integer arguments. The -- * last two are glyph indices into the PS standard -- * encoding give the names of the glyphs that this -- * glyph is composed from. All we need to do is to -- * make sure those glyphs are present in the subset -- * under their standard names. */ -- status = use_standard_encoding_glyph (font, font->build_stack.stack[3]); -- if (unlikely (status)) -- return status; -- -- status = use_standard_encoding_glyph (font, font->build_stack.stack[4]); -- if (unlikely (status)) -- return status; -- -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_SBW: -- if (! last_op_was_integer) -- return CAIRO_INT_STATUS_UNSUPPORTED; -- -- font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -- for (i = 0; i < font->build_stack.sp; i++) -- font->ps_stack.other_subr_args[i] = font->build_stack.stack[i]; -- font->ps_stack.num_other_subr_args = font->build_stack.sp; -- font->ps_stack.cur_other_subr_arg = 0; -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_POP: -- if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) { -- font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++]; -- last_op_was_integer = TRUE; -- } else { -- font->subset_subrs = FALSE; -- } -- break; -- -- default: -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -+ case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -+ for (i = 0; i < font->build_stack.sp; i++) -+ font->ps_stack.other_subr_args[i] = font->build_stack.stack[i]; -+ font->ps_stack.num_other_subr_args = font->build_stack.sp; -+ font->ps_stack.cur_other_subr_arg = 0; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_POP: -+ if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) { -+ font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++]; -+ last_op_was_integer = TRUE; -+ } else { -+ font->subset_subrs = FALSE; - } - break; - -@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - font->build_stack.sp = 0; - last_op_was_integer = FALSE; - break; -+ } -+ break; -+ -+ default: -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; - } - } else { - /* integer argument */ --- -cgit v0.9.0.2-2-gbebe -From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Fri, 06 Apr 2012 00:13:53 +0000 -Subject: type1-subset: if font name is prefixed with a subset tag, strip it off - ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index ddef8ae..e507abe 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font) - { - const char *start, *end, *segment_end; - char *s; -+ int i; - - segment_end = font->header_segment + font->header_segment_size; - start = find_token (font->header_segment, segment_end, "/FontName"); -@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font) - return CAIRO_INT_STATUS_UNSUPPORTED; - } - -+ /* If font name is prefixed with a subset tag, strip it off. */ -+ if (strlen(start) > 7 && start[6] == '+') { -+ for (i = 0; i < 6; i++) { -+ if (start[i] < 'A' || start[i] > 'Z') -+ break; -+ } -+ if (i == 6) -+ start += 7; -+ } -+ - font->base.base_font = strdup (start); - free (s); - if (unlikely (font->base.base_font == NULL)) --- -cgit v0.9.0.2-2-gbebe -From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Fri, 06 Apr 2012 11:50:40 +0000 -Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces - -It had caused pdf bbox sizes to regress to page size bboxes. ---- -diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c -index 27ba004..5b3e177 100644 ---- a/src/cairo-pattern.c -+++ b/src/cairo-pattern.c -@@ -37,6 +37,7 @@ - #include "cairo-path-private.h" - #include "cairo-pattern-private.h" - #include "cairo-recording-surface-private.h" -+#include "cairo-surface-snapshot-private.h" - - #include <float.h> - -@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t *pattern, - (const cairo_surface_pattern_t *) pattern; - cairo_surface_t *surface = surface_pattern->surface; - -+ if (_cairo_surface_is_snapshot (surface)) -+ surface = _cairo_surface_snapshot_get_target (surface); -+ - if (_cairo_surface_is_recording (surface)) { - cairo_matrix_t imatrix; - cairo_box_t box; --- -cgit v0.9.0.2-2-gbebe -From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 08 Apr 2012 10:28:59 +0000 -Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes - -A typo using half_line_x instead of half_line_y when emitting dashed -segments of the rectilinear stroke. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c -index 3e8c5a4..cc9dd19 100644 ---- a/src/cairo-path-stroke-boxes.c -+++ b/src/cairo-path-stroke-boxes.c -@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st - box.p1.x = box.p2.x - half_line_x; - } - if (out_slope.dy >= 0) -- box.p1.y -= half_line_x; -+ box.p1.y -= half_line_y; - if (out_slope.dy <= 0) -- box.p2.y += half_line_x; -+ box.p2.y += half_line_y; - } else { - if (box.p1.y <= box.p2.y) { - box.p1.y = box.p2.y; -- box.p2.y += half_line_x; -+ box.p2.y += half_line_y; - } else { -- box.p1.y = box.p2.y - half_line_x; -+ box.p1.y = box.p2.y - half_line_y; - } - if (out_slope.dx >= 0) - box.p1.x -= half_line_x; --- -cgit v0.9.0.2-2-gbebe -From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 08 Apr 2012 16:58:13 +0000 -Subject: traps: Clip the trapezoid extents against the clip extents - -Just in case the clip polygon turns out to be much larger than the -operation extents (silly us for not reducing it correctly) and lead to -catastrophe, such as: - -Program received signal SIGSEGV, Segmentation fault. -pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0, -width=3, height=-34811, data=0) at pixman-sse2.c:3369 -3369 *(uint16_t *)d = data; - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c -index 284a0be..c49e208 100644 ---- a/src/cairo-traps-compositor.c -+++ b/src/cairo-traps-compositor.c -@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor, - _cairo_traps_fini (&traps); - cairo_surface_destroy (src); - -- if (status == CAIRO_INT_STATUS_SUCCESS && -- (fixup.width < extents->width || fixup.height < extents->height)) { -+ if (unlikely (status)) -+ return status; -+ -+ if (! _cairo_rectangle_intersect (&fixup, extents)) -+ return CAIRO_STATUS_SUCCESS; -+ -+ if (fixup.width < extents->width || fixup.height < extents->height) { - cairo_boxes_t clear; - - _cairo_boxes_init (&clear); --- -cgit v0.9.0.2-2-gbebe -From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 09 Apr 2012 11:47:34 +0000 -Subject: build: Disable -Wset-but-unused-variable - -This is too noisy in the current build, and masking more important -warnings. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index 3eb0104..f1b17f4 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \ - -Wno-missing-field-initializers -Wno-unused-parameter \ - -Wno-attributes -Wno-long-long -Winline" - -+# -Wunused-but-set-variable is too noisy at present -+NO_WARN="-Wno-unused-but-set-variable" -+ - dnl Sun Studio 12 likes to rag at us for abusing enums like - dnl having cairo_status_t variables hold cairo_int_status_t - dnl values. It's bad, we know. Now please be quiet. -@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto" - dnl Also to turn various gcc/glibc-specific preprocessor checks - MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" - -+MAYBE_WARN="$MAYBE_WARN $NO_WARN" -+ - # invalidate cached value if MAYBE_WARN has changed - if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then - unset cairo_cv_warn_cflags --- -cgit v0.9.0.2-2-gbebe -From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 09 Apr 2012 11:49:20 +0000 -Subject: analysis: Apply the integer translation to the bbox as well - -The bbox is used to compute the ink extents (and so the pattern extents -of a recording surface) and if given an integer translation we failed to -transform the bbox into the target space. - -Fixes mask (pdf). - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c -index b8abe02..8878f62 100644 ---- a/src/cairo-analysis-surface.c -+++ b/src/cairo-analysis-surface.c -@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface, - if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) { - rect->x += tx; - rect->y += ty; -+ -+ tx = _cairo_fixed_from_int (tx); -+ bbox.p1.x += tx; -+ bbox.p2.x += tx; -+ -+ ty = _cairo_fixed_from_int (ty); -+ bbox.p1.y += ty; -+ bbox.p2.y += ty; - } else { - _cairo_matrix_transform_bounding_box_fixed (&surface->ctm, - &bbox, NULL); --- -cgit v0.9.0.2-2-gbebe -From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Mon, 09 Apr 2012 08:31:44 +0000 -Subject: pdf: avoid unnecessary use of patterns in mask groups - ---- -diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c -index 4930e72..78537ce 100644 ---- a/src/cairo-pdf-surface.c -+++ b/src/cairo-pdf-surface.c -@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t *surface, - if (unlikely (status)) - return status; - -- pattern_res.id = 0; -- gstate_res.id = 0; -- status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL, -- &pattern_res, &gstate_res); -- if (unlikely (status)) -- return status; -- -- if (gstate_res.id != 0) { -- smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -- if (unlikely (smask_group == NULL)) -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- smask_group->width = group->width; -- smask_group->height = group->height; -- smask_group->operation = PDF_PAINT; -- smask_group->source = cairo_pattern_reference (group->mask); -- smask_group->source_res = pattern_res; -- status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -- if (unlikely (status)) { -- _cairo_pdf_smask_group_destroy (smask_group); -- return status; -- } -- -- status = _cairo_pdf_surface_add_smask (surface, gstate_res); -- if (unlikely (status)) -- return status; -- -- status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (_can_paint_pattern (group->mask)) { -+ _cairo_output_stream_printf (surface->output, "q\n"); -+ status = _cairo_pdf_surface_paint_pattern (surface, -+ group->mask, -+ &group->extents, -+ FALSE); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "q /s%d gs /x%d Do Q\n", -- gstate_res.id, -- smask_group->group_res.id); -+ _cairo_output_stream_printf (surface->output, "Q\n"); - } else { -- status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE); -+ pattern_res.id = 0; -+ gstate_res.id = 0; -+ status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL, -+ &pattern_res, &gstate_res); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "%f %f %f %f re f\n", -- bbox.p1.x, -- bbox.p1.y, -- bbox.p2.x - bbox.p1.x, -- bbox.p2.y - bbox.p1.y); -+ if (gstate_res.id != 0) { -+ smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -+ if (unlikely (smask_group == NULL)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -- status = _cairo_pdf_surface_unselect_pattern (surface); -- if (unlikely (status)) -- return status; -+ smask_group->width = group->width; -+ smask_group->height = group->height; -+ smask_group->operation = PDF_PAINT; -+ smask_group->source = cairo_pattern_reference (group->mask); -+ smask_group->source_res = pattern_res; -+ status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -+ if (unlikely (status)) { -+ _cairo_pdf_smask_group_destroy (smask_group); -+ return status; -+ } -+ -+ status = _cairo_pdf_surface_add_smask (surface, gstate_res); -+ if (unlikely (status)) -+ return status; -+ -+ status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "q /s%d gs /x%d Do Q\n", -+ gstate_res.id, -+ smask_group->group_res.id); -+ } else { -+ status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "%f %f %f %f re f\n", -+ bbox.p1.x, -+ bbox.p1.y, -+ bbox.p2.x - bbox.p1.x, -+ bbox.p2.y - bbox.p1.y); -+ -+ status = _cairo_pdf_surface_unselect_pattern (surface); -+ if (unlikely (status)) -+ return status; -+ } - } - - status = _cairo_pdf_surface_close_group (surface, &mask_group); -@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t *surface, - if (unlikely (status)) - return status; - -- pattern_res.id = 0; -- gstate_res.id = 0; -- status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL, -- &pattern_res, &gstate_res); -- if (unlikely (status)) -- return status; -- -- if (gstate_res.id != 0) { -- smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -- if (unlikely (smask_group == NULL)) -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- smask_group->operation = PDF_PAINT; -- smask_group->source = cairo_pattern_reference (group->source); -- smask_group->source_res = pattern_res; -- status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -- if (unlikely (status)) { -- _cairo_pdf_smask_group_destroy (smask_group); -- return status; -- } -- -- status = _cairo_pdf_surface_add_smask (surface, gstate_res); -- if (unlikely (status)) -- return status; -- -- status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (_can_paint_pattern (group->source)) { -+ _cairo_output_stream_printf (surface->output, "q\n"); -+ status = _cairo_pdf_surface_paint_pattern (surface, -+ group->source, -+ &group->extents, -+ FALSE); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "q /s%d gs /x%d Do Q\n", -- gstate_res.id, -- smask_group->group_res.id); -+ _cairo_output_stream_printf (surface->output, "Q\n"); - } else { -- status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE); -+ pattern_res.id = 0; -+ gstate_res.id = 0; -+ status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL, -+ &pattern_res, &gstate_res); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "%f %f %f %f re f\n", -- bbox.p1.x, -- bbox.p1.y, -- bbox.p2.x - bbox.p1.x, -- bbox.p2.y - bbox.p1.y); -+ if (gstate_res.id != 0) { -+ smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -+ if (unlikely (smask_group == NULL)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -- status = _cairo_pdf_surface_unselect_pattern (surface); -- if (unlikely (status)) -- return status; -+ smask_group->operation = PDF_PAINT; -+ smask_group->source = cairo_pattern_reference (group->source); -+ smask_group->source_res = pattern_res; -+ status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -+ if (unlikely (status)) { -+ _cairo_pdf_smask_group_destroy (smask_group); -+ return status; -+ } -+ -+ status = _cairo_pdf_surface_add_smask (surface, gstate_res); -+ if (unlikely (status)) -+ return status; -+ -+ status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "q /s%d gs /x%d Do Q\n", -+ gstate_res.id, -+ smask_group->group_res.id); -+ } else { -+ status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "%f %f %f %f re f\n", -+ bbox.p1.x, -+ bbox.p1.y, -+ bbox.p2.x - bbox.p1.x, -+ bbox.p2.y - bbox.p1.y); -+ -+ status = _cairo_pdf_surface_unselect_pattern (surface); -+ if (unlikely (status)) -+ return status; -+ } - } - - status = _cairo_pdf_surface_close_group (surface, NULL); --- -cgit v0.9.0.2-2-gbebe -From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001 -From: Maarten Bosmans <mkbosmans@gmail.com> -Date: Mon, 09 Apr 2012 19:33:50 +0000 -Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM - ---- -diff --git a/configure.ac b/configure.ac -index cedfebe..5d2e6ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes") - if test "x$have_dlsym" = "xyes"; then - AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available]) - fi -+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes") - - dnl =========================================================================== - -diff --git a/util/Makefile.am b/util/Makefile.am -index f202f35..82d0a80 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -12,20 +12,24 @@ endif - - if CAIRO_HAS_TRACE - SUBDIRS += cairo-trace -+if CAIRO_HAS_DLSYM - if CAIRO_HAS_SCRIPT_SURFACE - if CAIRO_HAS_TEE_SURFACE - SUBDIRS += cairo-fdr - endif - endif - endif -+endif - - if BUILD_SPHINX -+if CAIRO_HAS_DLSYM - if CAIRO_HAS_SCRIPT_SURFACE - if CAIRO_HAS_TEE_SURFACE - SUBDIRS += cairo-sphinx - endif - endif - endif -+endif - - AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ --- -cgit v0.9.0.2-2-gbebe -From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Tue, 10 Apr 2012 13:04:05 +0000 -Subject: any2ppm: fix missing enumeration warning - ---- -diff --git a/test/any2ppm.c b/test/any2ppm.c -index 6b61c47..2403347 100644 ---- a/test/any2ppm.c -+++ b/test/any2ppm.c -@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd) - break; - case CAIRO_FORMAT_A1: - case CAIRO_FORMAT_RGB16_565: -+ case CAIRO_FORMAT_RGB30: - case CAIRO_FORMAT_INVALID: - default: - return "unhandled image format"; --- -cgit v0.9.0.2-2-gbebe -From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001 -From: Gilles Espinasse <g.esp@free.fr> -Date: Sat, 07 Apr 2012 21:09:51 +0000 -Subject: Cosmetic configure fix - -'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this - -checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes --Wl,--allow-shlib-undefined - -Signed-off-by: Gilles Espinasse <g.esp@free.fr> -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index f1b17f4..3b2c6f3 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result], - - dnl check linker flags - AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags, -- [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [], -+ [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [], - [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")]) - CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags" - AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS) --- -cgit v0.9.0.2-2-gbebe -From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Wed, 11 Apr 2012 19:37:55 +0000 -Subject: xlib: Disable fallback compositor with xlib-xcb - -When xlib-xcb is enabled, this is just dead code which is never used. Thus, this -shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a -problem? Well, that header contains static inline functions which some compiler -on Solaris will emit even when they are unused. - -This brings us to the real problem: That static inline function refers to a -function which isn't compiled with xlib-xcb and thus linking fails with -undefined symbols. - -This can be reproduced with GCC by adding a call to -_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to -_cairo_xlib_fallback_compositor_get. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489 -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c -index 5391926..7d45cd1 100644 ---- a/src/cairo-xlib-fallback-compositor.c -+++ b/src/cairo-xlib-fallback-compositor.c -@@ -42,6 +42,8 @@ - - #include "cairoint.h" - -+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS -+ - #include "cairo-xlib-private.h" - - #include "cairo-compositor-private.h" -@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void) - /* XXX Do something interesting here to mitigate fallbacks ala xcb */ - return &_cairo_fallback_compositor; - } -+ -+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch b/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch deleted file mode 100644 index ffd324252..000000000 --- a/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch +++ /dev/null @@ -1,144 +0,0 @@ -From a73e7ff0186176bc82cd3ae1432c054c1fd3aebd Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 06 Jan 2013 11:29:27 +0000 -Subject: xlib: Simplify source creation by use of map-to-image - -We were open-coding the functionality of map-to-image inside the source -creation routines. so refactor to actually use map-to-image instead. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c -index e312222..d08052a 100644 ---- a/src/cairo-xlib-source.c -+++ b/src/cairo-xlib-source.c -@@ -898,9 +898,6 @@ surface_source (cairo_xlib_surface_t *dst, - cairo_surface_pattern_t local_pattern; - cairo_status_t status; - cairo_rectangle_int_t upload, limit; -- cairo_matrix_t m; -- pixman_format_code_t format; -- int draw_x, draw_y; - - src = pattern->surface; - if (src->type == CAIRO_SURFACE_TYPE_IMAGE && -@@ -910,7 +907,6 @@ surface_source (cairo_xlib_surface_t *dst, - - cairo_surface_reference (src); - --prepare_shm_image: - proxy = malloc (sizeof(*proxy)); - if (unlikely (proxy == NULL)) { - cairo_surface_destroy (src); -@@ -954,46 +950,47 @@ prepare_shm_image: - } - } - -- if (_cairo_surface_is_image (src)) -- format = ((cairo_image_surface_t *)src)->pixman_format; -- else -- format = _cairo_format_to_pixman_format_code (_cairo_format_from_content (src->content)); -- src = _cairo_xlib_surface_create_shm (dst, format, -- upload.width, upload.height); -- if (src == NULL) { -- if (_cairo_surface_is_image (pattern->surface)) { -- draw_x = upload.x; -- draw_y = upload.y; -- src = cairo_surface_reference (pattern->surface); -- goto skip_paint; -- } -- -- src = _cairo_image_surface_create_with_pixman_format (NULL, -- format, -- upload.width, -- upload.height, -- 0); -+ xsrc = (cairo_xlib_surface_t *) -+ _cairo_surface_create_similar_scratch (&dst->base, -+ src->content, -+ upload.width, -+ upload.height); -+ if (xsrc->base.type != CAIRO_SURFACE_TYPE_XLIB) { -+ cairo_surface_destroy (src); -+ cairo_surface_destroy (&xsrc->base); -+ return None; - } - -- _cairo_pattern_init_for_surface (&local_pattern, pattern->surface); -- cairo_matrix_init_translate (&local_pattern.base.matrix, -- upload.x, upload.y); -+ if (_cairo_surface_is_image (src)) { -+ status = _cairo_xlib_surface_draw_image (xsrc, (cairo_image_surface_t *)src, -+ upload.x, upload.y, -+ upload.width, upload.height, -+ 0, 0); -+ } else { -+ cairo_image_surface_t *image; - -- status = _cairo_surface_paint (src, -- CAIRO_OPERATOR_SOURCE, -- &local_pattern.base, -- NULL); -- _cairo_pattern_fini (&local_pattern.base); -+ image = _cairo_surface_map_to_image (&xsrc->base, NULL); - -- if (unlikely (status)) { -- cairo_surface_destroy (src); -- return _cairo_surface_create_in_error (status); -+ _cairo_pattern_init_for_surface (&local_pattern, pattern->surface); -+ cairo_matrix_init_translate (&local_pattern.base.matrix, -+ upload.x, upload.y); -+ -+ status = _cairo_surface_paint (&image->base, -+ CAIRO_OPERATOR_SOURCE, -+ &local_pattern.base, -+ NULL); -+ _cairo_pattern_fini (&local_pattern.base); -+ -+ status = _cairo_surface_unmap_image (&xsrc->base, image); -+ if (unlikely (status)) { -+ cairo_surface_destroy (src); -+ return _cairo_surface_create_in_error (status); -+ } - } - -- draw_x = draw_y = 0; --skip_paint: - _cairo_pattern_init_static_copy (&local_pattern.base, &pattern->base); - if (upload.x | upload.y) { -+ cairo_matrix_t m; - cairo_matrix_init_translate (&m, -upload.x, -upload.y); - cairo_matrix_multiply (&local_pattern.base.matrix, - &local_pattern.base.matrix, -@@ -1001,29 +998,6 @@ skip_paint: - } - - *src_x = *src_y = 0; -- if (src->device == dst->base.device && -- _cairo_xlib_shm_surface_get_pixmap (src)) { -- pattern = &local_pattern; -- goto prepare_shm_image; -- } -- -- xsrc = (cairo_xlib_surface_t *) -- _cairo_surface_create_similar_scratch (&dst->base, -- src->content, -- upload.width, -- upload.height); -- if (xsrc->base.type != CAIRO_SURFACE_TYPE_XLIB) { -- cairo_surface_destroy (src); -- cairo_surface_destroy (&xsrc->base); -- return None; -- } -- -- status = _cairo_xlib_surface_draw_image (xsrc, (cairo_image_surface_t *)src, -- draw_x, draw_y, -- upload.width, upload.height, -- 0, 0); -- cairo_surface_destroy (src); -- - _cairo_xlib_surface_ensure_picture (xsrc); - if (! picture_set_properties (xsrc->display, - xsrc->picture, --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch b/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch deleted file mode 100644 index ccc1ebf47..000000000 --- a/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch +++ /dev/null @@ -1,24 +0,0 @@ -From dd20c1f4d6419238bbb37fb93a48986f83c6e6c2 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 09 Jan 2013 12:38:09 +0000 -Subject: xlib: map-to-image requires an extents - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c -index d08052a..0689d82 100644 ---- a/src/cairo-xlib-source.c -+++ b/src/cairo-xlib-source.c -@@ -968,8 +968,9 @@ surface_source (cairo_xlib_surface_t *dst, - 0, 0); - } else { - cairo_image_surface_t *image; -+ cairo_rectangle_int_t map_extents = { 0,0, upload.width,upload.height }; - -- image = _cairo_surface_map_to_image (&xsrc->base, NULL); -+ image = _cairo_surface_map_to_image (&xsrc->base, &map_extents); - - _cairo_pattern_init_for_surface (&local_pattern, pattern->surface); - cairo_matrix_init_translate (&local_pattern.base.matrix, --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/calligra/lcms24.patch b/extra/calligra/lcms24.patch deleted file mode 100644 index b2427aff1..000000000 --- a/extra/calligra/lcms24.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h -+++ b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h -@@ -22,6 +22,8 @@ - - #include <LcmsColorSpace.h> - #include <KoColorSpaceTraits.h> -+ -+#define TYPE_XYZA_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)) - - #include <KoColorModelStandardIds.h> - - diff --git a/extra/caribou/fix-crash.patch b/extra/caribou/fix-crash.patch deleted file mode 100644 index 98e5baab9..000000000 --- a/extra/caribou/fix-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a8fb1d8fba1e9557a3370edd62501f0a866c6774 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno <ueno@unixuser.org> -Date: Fri, 02 Nov 2012 06:19:47 +0000 -Subject: Fix border-image slice values in antler's gtk CSS - -According to CSS spec, border-image slice values are not denoted -with length units. - -https://bugzilla.gnome.org/show_bug.cgi?id=687409 ---- -diff --git a/data/antler/style.css b/data/antler/style.css -index 0e830dc..7553cf6 100644 ---- a/data/antler/style.css -+++ b/data/antler/style.css -@@ -12,7 +12,7 @@ - .antler-keyboard-button { - border-width: 0px; - border-radius: 2px; -- border-image: url("dark-key-border.svg") 2px 2px 2px 2px repeat stretch; -+ border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch; - font: Sans 14px; - background-image: -gtk-gradient (linear, - left top, --- -cgit v0.9.0.2 diff --git a/extra/cdargs/PKGBUILD b/extra/cdargs/PKGBUILD deleted file mode 100644 index 89ab781e4..000000000 --- a/extra/cdargs/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 128462 2011-06-24 02:21:59Z eric $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=cdargs -pkgver=1.35 -pkgrel=3.1 -pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.skamphausen.de/cgi-bin/ska/CDargs" -depends=('ncurses' 'gcc-libs') -install=cdargs.install -source=("http://www.skamphausen.de/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('50be618d67f0b9f2439526193c69c567') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man - make - - cd contrib - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # install helper scripts - cd contrib - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/cdargs" - install $pkgname-{tcsh.csh,bash.sh} "${pkgdir}/usr/share/cdargs" -} diff --git a/extra/cdargs/cdargs.install b/extra/cdargs/cdargs.install deleted file mode 100644 index 2b29beba7..000000000 --- a/extra/cdargs/cdargs.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo "cdargs: helper scripts are in /usr/share/cdargs/" -} diff --git a/extra/cdrkit/PKGBUILD b/extra/cdrkit/PKGBUILD deleted file mode 100644 index e7cd1e615..000000000 --- a/extra/cdrkit/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 138030 2011-09-14 23:20:33Z dreisner $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> - -pkgname=cdrkit -pkgver=1.1.11 -pkgrel=2 -pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" -arch=('i686' 'x86_64') -url="http://cdrkit.org/" -license=('GPL2') -depends=('file' 'bzip2' 'perl') -makedepends=('cmake') -source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz) -md5sums=('efe08e2f3ca478486037b053acd512e9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX="$pkgdir/usr" install - - # Make symlinks for cdrtools compatibility - cd "$pkgdir/usr/bin" - ln -s wodim cdrecord - ln -s readom readcd - ln -s genisoimage mkisofs - ln -s genisoimage mkhybrid - ln -s icedax cdda2wav - - cd "$pkgdir/usr/share/man/man1" - ln -s wodim.1 cdrecord.1 - ln -s readom.1 readcd.1 - ln -s genisoimage.1 mkisofs.1 - ln -s genisoimage.1 mkhybrid.1 - ln -s icedax.1 cdda2wav.1 -} diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD deleted file mode 100644 index 56be78816..000000000 --- a/extra/chromium/PKGBUILD +++ /dev/null @@ -1,139 +0,0 @@ -# $Id: PKGBUILD 173156 2012-12-11 21:02:48Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=chromium -pkgver=23.0.1271.97 -pkgrel=1 -pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" -arch=('i686' 'x86_64') -url="http://www.chromium.org/" -license=('BSD') -depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' - 'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils' - 'hicolor-icon-theme') -makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' - 'elfutils' 'subversion' 'nacl-toolchain-newlib') -optdepends=('kdebase-kdialog: needed for file dialogs in KDE') -backup=('etc/chromium/default') -install=chromium.install -source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2 - chromium.desktop - chromium.default - chromium.sh - chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch - chromium-ppapi-r0.patch) -sha256sums=('37ba1289b7066c3206d9b8f51c0a6acde0f3f5550e716a61af32485d8d0dc2e1' - '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' - '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' - '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' - 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615' - '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd') - -build() { - cd "$srcdir/chromium-$pkgver" - - # Fix build with glibc 2.16 - patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch" - - # Fix build without NaCl glibc toolchain (patch from Gentoo) - patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch" - - # http://code.google.com/p/chromium/issues/detail?id=109527 - sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc - - # Missing gyp files in tarball (http://crbug.com/144823) - sed -i '/nacl_test_data\.gyp/d' chrome/chrome_tests.gypi - - # Use Python 2 - find . -type f -exec sed -i -r \ - -e 's|/usr/bin/python$|&2|g' \ - -e 's|(/usr/bin/python2)\.4$|\1|g' \ - {} + - # There are still a lot of relative calls which need a workaround - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" - export PATH="$srcdir/python2-path:$PATH" - - # Prepare NaCL toolchain - mkdir -p sdk native_client/toolchain/.tars - cp -a /usr/lib/nacl-toolchain-newlib sdk/nacl-sdk - tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk - rm -r sdk - - # CFLAGS are passed through release_extra_cflags below - export -n CFLAGS CXXFLAGS - - # Silence "identifier 'nullptr' is a keyword in C++11" warnings - CFLAGS+=' -Wno-c++0x-compat' - - build/gyp_chromium --depth=. \ - -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - -Dlinux_strip_binary=1 \ - -Dlinux_use_gold_binary=0 \ - -Dlinux_use_gold_flags=0 \ - -Drelease_extra_cflags="$CFLAGS" \ - -Dffmpeg_branding=Chrome \ - -Dproprietary_codecs=1 \ - -Duse_system_bzip2=1 \ - -Duse_system_ffmpeg=0 \ - -Duse_system_libevent=1 \ - -Duse_system_libjpeg=1 \ - -Duse_system_libpng=1 \ - -Duse_system_libxml=0 \ - -Duse_system_ssl=0 \ - -Duse_system_yasm=1 \ - -Duse_system_zlib=0 \ - -Duse_gconf=0 \ - -Ddisable_glibc=1 \ - -Ddisable_pnacl=1 \ - -Ddisable_sse2=1 - - make chrome chrome_sandbox BUILDTYPE=Release -} - -package() { - cd "$srcdir/chromium-$pkgver" - - install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium" - - install -Dm4755 -o root -g root out/Release/chrome_sandbox \ - "$pkgdir/usr/lib/chromium/chromium-sandbox" - - cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \ - out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \ - "$pkgdir/usr/lib/chromium/" - - if [[ $CARCH == i686 ]]; then - rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe" - fi - - # Allow users to override command-line options - install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default" - - cp -a out/Release/locales "$pkgdir/usr/lib/chromium/" - - install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" - - install -Dm644 "$srcdir/chromium.desktop" \ - "$pkgdir/usr/share/applications/chromium.desktop" - - for size in 22 24 48 64 128 256; do - install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ - "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" - done - - for size in 16 32; do - install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \ - "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" - done - - install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch b/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch deleted file mode 100644 index 1d11a390e..000000000 --- a/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ---- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300 -+++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300 -@@ -243,14 +243,13 @@ struct kernel_rusage { - long ru_nivcsw; - }; - --struct siginfo; - #if defined(__i386__) || defined(__arm__) || defined(__PPC__) - - /* include/asm-{arm,i386,mips,ppc}/signal.h */ - struct kernel_old_sigaction { - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_mask; - unsigned long sa_flags; -@@ -287,13 +286,13 @@ struct kernel_sigaction { - unsigned long sa_flags; - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - struct kernel_sigset_t sa_mask; - #else - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_flags; - void (*sa_restorer)(void); diff --git a/extra/chromium/chromium-ppapi-r0.patch b/extra/chromium/chromium-ppapi-r0.patch deleted file mode 100644 index fb7e160c2..000000000 --- a/extra/chromium/chromium-ppapi-r0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200 -+++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200 -@@ -80,7 +80,7 @@ - ], - }, - 'conditions': [ -- ['target_arch!="arm"', { -+ ['target_arch!="arm" and disable_glibc==0', { - 'variables': { - 'build_glibc': 1, - # NOTE: Use /lib, not /lib64 here; it is a symbolic link which diff --git a/extra/chromium/chromium.default b/extra/chromium/chromium.default deleted file mode 100644 index 2632024f1..000000000 --- a/extra/chromium/chromium.default +++ /dev/null @@ -1,4 +0,0 @@ -# Default settings for chromium. This file is sourced by /usr/bin/chromium - -# Options to pass to chromium -CHROMIUM_FLAGS="" diff --git a/extra/chromium/chromium.desktop b/extra/chromium/chromium.desktop deleted file mode 100644 index 18446d40f..000000000 --- a/extra/chromium/chromium.desktop +++ /dev/null @@ -1,113 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Chromium -# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. -# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. -GenericName=Web Browser -GenericName[ar]=متصŮŘ Ř§Ů„Ř´Ř¨ŮŘ© -GenericName[bg]=Уеб браŃĐ·ŃŠŃ€ -GenericName[ca]=Navegador web -GenericName[cs]=WWW prohlĂĹľeÄŤ -GenericName[da]=Browser -GenericName[de]=Web-Browser -GenericName[el]=ΠεĎιηγητής ÎąĎτού -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן ××™× ××¨× × -GenericName[hi]=वेब ब्राउज़र -GenericName[hu]=WebböngĂ©szĹ‘ -GenericName[it]=Browser Web -GenericName[ja]=ウェă–ă–ă©ă‚¦ă‚¶ -GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ -GenericName[ko]=웹 ë¸ŚëťĽěš°ě € -GenericName[lt]=Ĺ˝iniatinklio naršyklÄ— -GenericName[lv]=TÄ«mekÄĽa pÄrlĹ«ks -GenericName[ml]=വെബ് ബ്രൌസര്‍ -GenericName[mr]=वेब ब्राऊजर -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[pl]=PrzeglÄ…darka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador da Internet -GenericName[ro]=Navigator de Internet -GenericName[ru]=Веб-браŃзер -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[ta]=இணŕŻŕ®Ż உலாவி -GenericName[th]=เว็บเบราว์เซŕ¸ŕ¸ŁŕąŚ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[zh_CN]=网页浏č§ĺ™¨ -GenericName[zh_HK]=網é 瀏覽器 -GenericName[zh_TW]=網é 瀏覽器 -# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[fil]=Web Browser -GenericName[hr]=Web preglednik -GenericName[id]=Browser Web -GenericName[or]=ଓŕŤŕ¬¬ŕ‡ŕ¬¬ ବŕŤŕ¬°ŕ¬ľŕ¬‰ŕ¬śŕ¬° -GenericName[sk]=WWW prehliadaÄŤ -GenericName[sr]=Đнтернет прегледник -GenericName[te]=మహాతల అన్వేషి -GenericName[vi]=Bá»™ duyệt Web -# Gnome and KDE 3 uses Comment. -Comment=Access the Internet -Comment[ar]=الدخŮŮ„ إلى الإنترنت -Comment[bg]=ДоŃŃ‚ŃŠĐż Đ´Đľ интернет -Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করŕ§ŕ¦¨ -Comment[ca]=Accedeix a Internet -Comment[cs]=PĹ™Ăstup k internetu -Comment[da]=FĂĄ adgang til internettet -Comment[de]=Internetzugriff -Comment[el]=Î ĎĎŚĎβαĎη ĎĎ„Îż Διαδίκτυο -Comment[en_GB]=Access the Internet -Comment[es]=Accede a Internet. -Comment[et]=Pääs Internetti -Comment[fi]=Käytä internetiä -Comment[fil]=I-access ang Internet -Comment[fr]=AccĂ©der Ă Internet -Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો -Comment[he]=גישה ×ל ×”××™× ××¨× × -Comment[hi]=इंटरनेट तक पहŕĄŕ¤‚च स्थापित करें -Comment[hr]=Pristup Internetu -Comment[hu]=InternetelĂ©rĂ©s -Comment[id]=Akses Internet -Comment[it]=Accesso a Internet -Comment[ja]=イăłă‚żăĽăŤăăă«ă‚˘ă‚Żă‚»ă‚ą -Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನೠಪ್ರವೇಶಿಸಿ -Comment[ko]=인터넷 연결 -Comment[lt]=Interneto prieiga -Comment[lv]=PiekÄĽĹ«t internetam -Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യŕµŕ´• -Comment[mr]=इंटरनेटमध्ये प्रवेश करा -Comment[nb]=GĂĄ til Internett -Comment[nl]=Verbinding maken met internet -Comment[or]=ଇଣŕŤŕ¬źŕ¬°ŕŤŕ¬¨ŕ‡ŕ¬źŕŤ ପŕŤŕ¬°ŕ¬¬ŕ‡ŕ¬¶ କରନŕŤŕ¬¤ŕ -Comment[pl]=Skorzystaj z internetu -Comment[pt]=Aceder Ă Internet -Comment[pt_BR]=Acessar a internet -Comment[ro]=AccesaĹŁi Internetul -Comment[ru]=ДоŃŃ‚ŃĐż в Đнтернет -Comment[sk]=PrĂstup do siete Internet -Comment[sl]=Dostop do interneta -Comment[sr]=ПриŃŃ‚Ńпите ĐĐ˝Ń‚ĐµŃ€Đ˝ĐµŃ‚Ń -Comment[sv]=GĂĄ ut pĂĄ Internet -Comment[ta]=இணŕŻŕ®Żŕ®¤ŕŻŤŕ®¤ŕŻ அணŕŻŕ®•ŕŻŕ®¤ŕ®˛ŕŻŤ -Comment[te]=ఇంటర్నెట్‌నౠఆక్సెస్ చెయ్యండి -Comment[th]=เข้าถึงŕ¸ŕ¸´ŕ¸™ŕą€ŕ¸—ŕ¸ŕ¸ŁŕąŚŕą€ŕ¸™ŕą‡ŕ¸• -Comment[tr]=Ä°nternet'e eriĹźin -Comment[uk]=ДоŃŃ‚ŃĐż Đ´Đľ Đ†Đ˝Ń‚ĐµŃ€Đ˝ĐµŃ‚Ń -Comment[vi]=Truy cáşp Internet -Comment[zh_CN]=访问互č”网 -Comment[zh_HK]=連線ĺ°ç¶˛éš›ç¶˛č·Ż -Comment[zh_TW]=連線ĺ°ç¶˛éš›ç¶˛č·Ż -Exec=chromium %U -Terminal=false -Icon=chromium -Type=Application -Categories=GTK;Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/extra/chromium/chromium.install b/extra/chromium/chromium.install deleted file mode 100644 index d43ea7c35..000000000 --- a/extra/chromium/chromium.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/chromium/chromium.sh b/extra/chromium/chromium.sh deleted file mode 100755 index ba8a7e683..000000000 --- a/extra/chromium/chromium.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Allow users to override command-line options -# Based on Gentoo's chromium package (and by extension, Debian's) -if [[ -f /etc/chromium/default ]]; then - . /etc/chromium/default -fi - -# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/chromium/default) -CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS} - -export CHROME_WRAPPER=$(readlink -f "$0") -export CHROME_DESKTOP=chromium.desktop - -exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@" diff --git a/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch b/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch deleted file mode 100644 index 8ca3b2674..000000000 --- a/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 900875dbda261dd8a9283bdda3c3dbe551fe0f7c Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@samba.org> -Date: Wed, 18 Apr 2012 21:41:05 -0400 -Subject: [PATCH] mount.cifs: fix up some -D_FORTIFY_SOURCE=2 warnings - -...and add -D_FORTIFY_SOURCE=2 to the default $CFLAGS. - -Signed-off-by: Jeff Layton <jlayton@samba.org> ---- - Makefile.am | 2 +- - mount.cifs.c | 10 ++++++---- - mtab.c | 4 +++- - 3 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index d95142a..05729ca 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS = -Wall -Wextra -Werror -+AM_CFLAGS = -Wall -Wextra -Werror -D_FORTIFY_SOURCE=2 - ACLOCAL_AMFLAGS = -I aclocal - - root_sbindir = $(ROOTSBINDIR) -diff --git a/mount.cifs.c b/mount.cifs.c -index f0b073e..4f1ea40 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -928,9 +928,9 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) - } - } else { - /* domain/username%password */ -- const int max = MAX_DOMAIN_SIZE + -- MAX_USERNAME_SIZE + -- MOUNT_PASSWD_SIZE + 2; -+ const unsigned int max = MAX_DOMAIN_SIZE + -+ MAX_USERNAME_SIZE + -+ MOUNT_PASSWD_SIZE + 2; - if (strnlen(value, max + 1) >= max + 1) { - fprintf(stderr, "username too long\n"); - return EX_USAGE; -@@ -1603,8 +1603,10 @@ add_mtab(char *devname, char *mountpoint, unsigned long flags, const char *fstyp - mountent.mnt_passno = 0; - rc = addmntent(pmntfile, &mountent); - if (rc) { -+ int ignore __attribute__((unused)); -+ - fprintf(stderr, "unable to add mount entry to mtab\n"); -- ftruncate(fd, statbuf.st_size); -+ ignore = ftruncate(fd, statbuf.st_size); - rc = EX_FILEIO; - } - tmprc = my_endmntent(pmntfile, statbuf.st_size); -diff --git a/mtab.c b/mtab.c -index de545b7..3d42ac0 100644 ---- a/mtab.c -+++ b/mtab.c -@@ -271,8 +271,10 @@ my_endmntent(FILE *stream, off_t size) - - /* truncate file back to "size" -- best effort here */ - if (rc) { -+ int ignore __attribute__((unused)); -+ - rc = errno; -- ftruncate(fd, size); -+ ignore = ftruncate(fd, size); - } - - endmntent(stream); --- -1.7.7.6 - diff --git a/extra/cmake/fix-pkg-config.patch b/extra/cmake/fix-pkg-config.patch deleted file mode 100644 index c9390aec2..000000000 --- a/extra/cmake/fix-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef - -diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake -index 5d93ab1..39d3a76 100644 ---- a/Modules/FindPkgConfig.cmake -+++ b/Modules/FindPkgConfig.cmake -@@ -13,11 +13,10 @@ - # When the 'QUIET' argument is set, no status messages will be printed. - # - # It sets the following variables: --# PKG_CONFIG_FOUND ... true if pkg-config works on the system -+# PKG_CONFIG_FOUND ... if pkg-config executable was found - # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program - # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found - # (since CMake 2.8.8) --# PKG_CONFIG_FOUND ... if pkg-config executable was found - # - # For the following variables two sets of values exist; first one is the - # common one and has the given PREFIX. The second set contains flags -@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig - REQUIRED_VARS PKG_CONFIG_EXECUTABLE - VERSION_VAR PKG_CONFIG_VERSION_STRING) - -+# This is needed because the module name is "PkgConfig" but the name of -+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically -+# handled by FPHSA. -+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") -+ - # Unsets the given variables - macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD deleted file mode 100644 index 8a74f9597..000000000 --- a/extra/cups-filters/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 173928 2012-12-28 07:19:09Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=cups-filters -pkgver=1.0.26 -pkgrel=1 -pkgdesc="OpenPrinting CUPS Filters" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -depends=('lcms2' 'poppler>=0.20.5' 'qpdf') -makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check -optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' - 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly') -backup=(etc/fonts/conf.d/99pdftoopvp.conf) -options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz cups-browsed.service) -md5sums=('38502cb880e1f9be0618e3b2da4c7fec' - '2beb8d9cebf20ddcc6c7598aab4812a6') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --enable-avahi \ - --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - # drop static lib - rm -f ${pkgdir}/usr/lib/*.a - - # add missing systemd support - rm -rf ${pkgdir}/etc/rc.d - install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service -} diff --git a/extra/cups-filters/cups-browsed.service b/extra/cups-filters/cups-browsed.service deleted file mode 100644 index d434d82f0..000000000 --- a/extra/cups-filters/cups-browsed.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=a daemon to browse the Bonjour broadcasts - -[Service] -ExecStart=/usr/sbin/cups-browsed -PrivateTmp=yes - -[Install] -Also=cups.service avahi-daemon.service -WantedBy=printer.target diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16 deleted file mode 100644 index eb8e26473..000000000 --- a/extra/cups/PKGBUILD.16 +++ /dev/null @@ -1,147 +0,0 @@ -# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase="cups" -pkgname=('libcups' 'cups') -pkgver=1.6.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.cups.org/" -makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' - 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - cups-no-export-ssllibs.patch - cups-no-gcrypt.patch - cups-no-gzip-man.patch - cups cups.logrotate cups.pam) -#options=('!emptydirs') -md5sums=('07157b243dd11e90e3f654c4d62e7c8a' - '9b8467a1e51d360096b70e2c3c081e6c' - '3733c23e77eb503bd94cc368e02830dc' - 'c9159ba1233902ba6ddbbe6885a46b72' - '9657daa21760bb0b5fa3d8b51d5e01a1' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - # Do not export SSL libs in cups-config - patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" - - patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch" - # don't zip man pages in make install, let makepkg do that / Fedora - patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch - - # Rebuild configure script for not zipping man-pages. - aclocal -I config-scripts - autoconf -I config-scripts - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libdir=/usr/lib \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-logdir=/var/log/cups \ - --with-docdir=/usr/share/cups/doc \ - --with-cups-user=daemon \ - --with-cups-group=lp \ - --enable-pam=yes \ - --enable-raw-printing \ - --enable-dbus --with-dbusdir=/etc/dbus-1 \ - --enable-ssl=yes --enable-gnutls \ - --enable-threads \ - --enable-avahi\ - --with-php=/usr/bin/php-cgi \ - --with-optim="$CFLAGS" - make -} - -check() { - cd "$srcdir/$pkgbase-$pkgver" - #httpAddrGetList(workstation64): FAIL - #1 TESTS FAILED! - #make[1]: *** [testhttp] Error 1 - make -k check || /bin/true -} - -package_libcups() { -pkgdesc="The CUPS Printing System - client libraries and headers" -depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi') -backup=(etc/cups/client.conf) - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-headers install-libs - # put this into the libs pkg to make other software find the libs(no pkg-config file included) - mkdir -p ${pkgdir}/usr/bin - install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config - - # install client.conf man page and config file - install -dm755 ${pkgdir}/usr/share/man/man5 - #install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/ - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ - install -dm755 ${pkgdir}/etc/cups - touch ${pkgdir}/etc/cups/client.conf - echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf - echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf - chgrp lp ${pkgdir}/etc/cups/client.conf -} - -package_cups() { -pkgdesc="The CUPS Printing System - daemon package" -install=cups.install -backup=(etc/cups/cupsd.conf - etc/cups/snmp.conf - etc/cups/printers.conf - etc/cups/classes.conf - etc/cups/subscriptions.conf - etc/dbus-1/system.d/cups.conf - etc/logrotate.d/cups - etc/pam.d/cups - etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme') -optdepends=('xdg-utils: xdg .desktop file support') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-data install-exec - - # this one we ship in the libcups pkg - rm -f ${pkgdir}/usr/bin/cups-config - - # kill the sysv stuff - rm -rf ${pkgdir}/etc/rc*.d - rm -rf ${pkgdir}/etc/init.d - install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd - install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups - install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups - - # fix perms on /var/spool and /etc - chmod 755 ${pkgdir}/var/spool - chmod 755 ${pkgdir}/etc - - # install ssl directory where to store the certs, solves some samba issues - install -dm700 -g lp ${pkgdir}/etc/cups/ssl - # remove directory from package, we create it in cups rc.d file - rm -rf ${pkgdir}/var/run - - # install some more configuration files that will get filled by cupsd - touch ${pkgdir}/etc/cups/printers.conf - touch ${pkgdir}/etc/cups/classes.conf - touch ${pkgdir}/etc/cups/subscriptions.conf - chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf} - - # fix .desktop file - sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop - - # compress some driver files, adopted from Fedora - find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f - - # remove client.conf man page - rm -f ${pkgdir}/usr/share/man/man5/client.conf.5 - - # remove files now part of cups-filters - rm -v ${pkgdir}/usr/lib/cups/filter/bannertops - rm -v ${pkgdir}/usr/share/cups/banners/* - rm -v ${pkgdir}/usr/share/cups/data/testprint - # comment out all conversion rules which use any of the removed filters - perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs -} diff --git a/extra/cups/cups-avahi-1-config.patch b/extra/cups/cups-avahi-1-config.patch deleted file mode 100644 index 304cd2607..000000000 --- a/extra/cups/cups-avahi-1-config.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in ---- cups-1.5.2/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100 -+++ cups-1.5.2/config.h.in 2012-03-14 15:04:51.365347165 +0000 -@@ -390,6 +390,13 @@ - - - /* -+ * Do we have Avahi for DNS Service Discovery? -+ */ -+ -+#undef HAVE_AVAHI -+ -+ -+/* - * Do we have <sys/ioctl.h>? - */ - -diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4 ---- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100 -+++ cups-1.5.2/config-scripts/cups-dnssd.m4 2012-03-14 15:04:51.365347165 +0000 -@@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn - DNSSDLIBS="" - DNSSD_BACKEND="" - -+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], -+ [if test x$enable_avahi = xyes; then -+ AC_MSG_CHECKING(for Avahi) -+ if $PKGCONFIG --exists avahi-client; then -+ AC_MSG_RESULT(yes) -+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" -+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" -+ DNSSD_BACKEND="dnssd" -+ AC_DEFINE(HAVE_AVAHI) -+ enable_dnssd=no -+ else -+ AC_MSG_RESULT(no) -+ fi -+ fi]) -+ - if test x$enable_dnssd != xno; then - AC_CHECK_HEADER(dns_sd.h, [ - case "$uname" in
\ No newline at end of file diff --git a/extra/cups/cups-avahi-2-backend.patch b/extra/cups/cups-avahi-2-backend.patch deleted file mode 100644 index 00e12a0a3..000000000 --- a/extra/cups/cups-avahi-2-backend.patch +++ /dev/null @@ -1,1118 +0,0 @@ -diff -up cups-1.5.3/backend/dnssd.c.avahi-2-backend cups-1.5.3/backend/dnssd.c ---- cups-1.5.3/backend/dnssd.c.avahi-2-backend 2012-05-15 16:53:18.164774446 +0200 -+++ cups-1.5.3/backend/dnssd.c 2012-05-15 17:09:07.684155704 +0200 -@@ -15,14 +15,21 @@ - * - * Contents: - * -+ * next_txt_record() - Get next TXT record from a cups_txt_records_t. -+ * parse_txt_record_pair() - Read key/value pair in cups_txt_records_t. - * main() - Browse for printers. - * browse_callback() - Browse devices. - * browse_local_callback() - Browse local devices. - * compare_devices() - Compare two devices. - * exec_backend() - Execute the backend that corresponds to the - * resolved service name. -+ * device_type() - Get DNS-SD type enumeration from string. - * get_device() - Create or update a device. - * query_callback() - Process query data. -+ * avahi_client_callback() - Avahi client callback function. -+ * avahi_query_callback() - Avahi query callback function. -+ * avahi_browse_callback() - Avahi browse callback function. -+ * find_device() - Find a device from its name and domain. - * sigterm_handler() - Handle termination signals... - * unquote() - Unquote a name string. - */ -@@ -33,7 +40,18 @@ - - #include "backend-private.h" - #include <cups/array.h> --#include <dns_sd.h> -+#ifdef HAVE_DNSSD -+# include <dns_sd.h> -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+# include <avahi-common/domain.h> -+# include <avahi-common/error.h> -+# include <avahi-common/malloc.h> -+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX -+#endif /* HAVE_AVAHI */ - - - /* -@@ -53,7 +71,12 @@ typedef enum - - typedef struct - { -+#ifdef HAVE_DNSSD - DNSServiceRef ref; /* Service reference for resolve */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int resolved; /* Did we resolve the device? */ -+#endif /* HAVE_AVAHI */ - char *name, /* Service name */ - *domain, /* Domain name */ - *fullName, /* Full name */ -@@ -65,6 +88,20 @@ typedef struct - sent; /* Did we list the device? */ - } cups_device_t; - -+typedef struct -+{ -+ char key[256]; -+ char value[256]; -+ -+#ifdef HAVE_DNSSD -+ const uint8_t *data; -+ const uint8_t *datanext; -+ const uint8_t *dataend; -+#else /* HAVE_AVAHI */ -+ AvahiStringList *txt; -+#endif /* HAVE_DNSSD */ -+} cups_txt_records_t; -+ - - /* - * Local globals... -@@ -78,6 +115,7 @@ static int job_canceled = 0; - * Local functions... - */ - -+#ifdef HAVE_DNSSD - static void browse_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -95,13 +133,6 @@ static void browse_local_callback(DNSSe - const char *replyDomain, - void *context) - __attribute__((nonnull(1,5,6,7,8))); --static int compare_devices(cups_device_t *a, cups_device_t *b); --static void exec_backend(char **argv); --static cups_device_t *get_device(cups_array_t *devices, -- const char *serviceName, -- const char *regtype, -- const char *replyDomain) -- __attribute__((nonnull(1,2,3,4))); - static void query_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -111,10 +142,119 @@ static void query_callback(DNSServiceRe - const void *rdata, uint32_t ttl, - void *context) - __attribute__((nonnull(1,5,9,11))); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+static void avahi_client_callback (AvahiClient *client, -+ AvahiClientState state, -+ void *context); -+static void avahi_browse_callback (AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ -+static cups_device_t * find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey); -+static int compare_devices(cups_device_t *a, cups_device_t *b); -+static void exec_backend(char **argv); -+static cups_device_t *get_device(cups_array_t *devices, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain) -+ __attribute__((nonnull(1,2,3,4))); - static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize) - __attribute__((nonnull(1,2))); - -+#ifdef HAVE_AVAHI -+static AvahiSimplePoll *simple_poll = NULL; -+static int avahi_got_callback; -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t. -+ */ -+ -+static cups_txt_records_t * -+next_txt_record (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ txt->data = txt->datanext; -+#else /* HAVE_AVAHI */ -+ txt->txt = avahi_string_list_get_next (txt->txt); -+ if (txt->txt == NULL) -+ return NULL; -+#endif /* HAVE_DNSSD */ -+ -+ return txt; -+} -+ -+ -+/* -+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t. -+ */ -+ -+static int -+parse_txt_record_pair (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ uint8_t datalen; -+ uint8_t *data = txt->data; -+ char *ptr; -+ -+ /* -+ * Read a key/value pair starting with an 8-bit length. Since the -+ * length is 8 bits and the size of the key/value buffers is 256, we -+ * don't need to check for overflow... -+ */ -+ -+ datalen = *data++; -+ if (!datalen || (data + datalen) > txt->dataend) -+ return NULL; -+ txt->datanext = data + datalen; -+ -+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) -+ *ptr++ = *data; -+ *ptr = '\0'; -+ -+ if (data < txt->datanext && *data == '=') -+ { -+ data++; -+ -+ if (data < datanext) -+ memcpy (txt->value, data, txt->datanext - data); -+ value[txt->datanext - data] = '\0'; -+ } -+ else -+ return 1; -+#else /* HAVE_AVAHI */ -+ char *key, *value; -+ size_t len; -+ avahi_string_list_get_pair (txt->txt, &key, &value, &len); -+ if (len > sizeof (txt->value) - 1) -+ len = sizeof (txt->value) - 1; -+ -+ memcpy (txt->value, value, len); -+ txt->value[len] = '\0'; -+ len = strlen (key); -+ if (len > sizeof (txt->key) - 1) -+ len = sizeof (txt->key) - 1; -+ -+ memcpy (txt->key, key, len); -+ txt->key[len] = '\0'; -+ avahi_free (key); -+ avahi_free (value); -+#endif /* HAVE_AVAHI */ -+ -+ return 0; -+} -+ - - /* - * 'main()' - Browse for printers. -@@ -125,6 +265,13 @@ main(int argc, /* I - Number of comm - char *argv[]) /* I - Command-line arguments */ - { - const char *name; /* Backend name */ -+ cups_array_t *devices; /* Device array */ -+ cups_device_t *device; /* Current device */ -+ char uriName[1024]; /* Unquoted fullName for URI */ -+#ifdef HAVE_DNSSD -+ int fd; /* Main file descriptor */ -+ fd_set input; /* Input set for select() */ -+ struct timeval timeout; /* Timeout for select() */ - DNSServiceRef main_ref, /* Main service reference */ - fax_ipp_ref, /* IPP fax service reference */ - ipp_ref, /* IPP service reference */ -@@ -138,12 +285,11 @@ main(int argc, /* I - Number of comm - pdl_datastream_ref, /* AppSocket service reference */ - printer_ref, /* LPD service reference */ - riousbprint_ref; /* Remote IO service reference */ -- int fd; /* Main file descriptor */ -- fd_set input; /* Input set for select() */ -- struct timeval timeout; /* Timeout for select() */ -- cups_array_t *devices; /* Device array */ -- cups_device_t *device; /* Current device */ -- char uriName[1024]; /* Unquoted fullName for URI */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiClient *client; -+ int error; -+#endif /* HAVE_AVAHI */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -203,6 +349,49 @@ main(int argc, /* I - Number of comm - * Browse for different kinds of printers... - */ - -+#ifdef HAVE_AVAHI -+ if ((simple_poll = avahi_simple_poll_new ()) == NULL) -+ { -+ perror ("ERROR: Unable to create avahi simple poll object"); -+ return (1); -+ } -+ -+ client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_client_callback, NULL, &error); -+ if (!client) -+ { -+ perror ("DEBUG: Unable to create avahi client"); -+ return (0); -+ } -+ -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_fax-ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp-tls._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_pdl-datastream._tcp", -+ NULL, 0, -+ avahi_browse_callback, -+ devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_printer._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_riousbprint._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+#endif /* HAVE_AVAHI */ -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) - { - perror("ERROR: Unable to create service connection"); -@@ -263,6 +452,7 @@ main(int argc, /* I - Number of comm - riousbprint_ref = main_ref; - DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, - "_riousbprint._tcp", NULL, browse_callback, devices); -+#endif /* HAVE_DNSSD */ - - /* - * Loop until we are killed... -@@ -270,6 +460,9 @@ main(int argc, /* I - Number of comm - - while (!job_canceled) - { -+ int announce = 0; -+ -+#ifdef HAVE_DNSSD - FD_ZERO(&input); - FD_SET(fd, &input); - -@@ -289,11 +482,35 @@ main(int argc, /* I - Number of comm - } - else - { -+ announce = 1; -+ } -+#else /* HAVE_AVAHI */ -+ int r; -+ avahi_got_callback = 0; -+ r = avahi_simple_poll_iterate (simple_poll, 1); -+ if (r != 0 && r != EINTR) -+ { -+ /* -+ * We've been told to exit the loop. Perhaps the connection to -+ * avahi failed. -+ */ -+ -+ break; -+ } -+ -+ if (avahi_got_callback) -+ announce = 1; -+#endif /* HAVE_DNSSD */ -+ -+ if (announce) -+ { - /* - * Announce any devices we've found... - */ - -+#ifdef HAVE_DNSSD - DNSServiceErrorType status; /* DNS query status */ -+#endif /* HAVE_DNSSD */ - cups_device_t *best; /* Best matching device */ - char device_uri[1024]; /* Device URI */ - int count; /* Number of queries */ -@@ -307,6 +524,7 @@ main(int argc, /* I - Number of comm - if (device->sent) - sent ++; - -+#ifdef HAVE_DNSSD - if (device->ref) - count ++; - -@@ -338,14 +556,23 @@ main(int argc, /* I - Number of comm - count ++; - } - } -- else if (!device->sent) -+ else -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!device->resolved) -+ continue; -+ else -+#endif /* HAVE_AVAHI */ -+ if (!device->sent) - { -+#ifdef HAVE_DNSSD - /* - * Got the TXT records, now report the device... - */ - - DNSServiceRefDeallocate(device->ref); - device->ref = 0; -+#endif /* HAVE_DNSSD */ - - if (!best) - best = device; -@@ -406,6 +633,7 @@ main(int argc, /* I - Number of comm - } - - -+#ifdef HAVE_DNSSD - /* - * 'browse_callback()' - Browse devices. - */ -@@ -494,6 +722,7 @@ browse_local_callback( - device->fullName); - device->sent = 1; - } -+#endif /* HAVE_DNSSD */ - - - /* -@@ -574,6 +803,41 @@ exec_backend(char **argv) /* I - Comman - - - /* -+ * 'device_type()' - Get DNS-SD type enumeration from string. -+ */ -+ -+static int -+device_type (const char *regtype) -+{ -+#ifdef HAVE_AVAHI -+ if (!strcmp(regtype, "_ipp._tcp")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_ipps._tcp") || -+ !strcmp(regtype, "_ipp-tls._tcp")) -+ return (CUPS_DEVICE_IPPS); -+ else if (!strcmp(regtype, "_fax-ipp._tcp")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#else -+ if (!strcmp(regtype, "_ipp._tcp.")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_ipps._tcp.") || -+ !strcmp(regtype, "_ipp-tls._tcp.")) -+ return (CUPS_DEVICE_IPPS); -+ else if (!strcmp(regtype, "_fax-ipp._tcp.")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp.")) -+ return (CUPS_DEVICE_PRINTER); -+ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#endif /* HAVE_AVAHI */ -+ -+ return (CUPS_DEVICE_RIOUSBPRINT); -+} -+ -+ -+/* - * 'get_device()' - Create or update a device. - */ - -@@ -594,20 +858,7 @@ get_device(cups_array_t *devices, /* I - - */ - - key.name = (char *)serviceName; -- -- if (!strcmp(regtype, "_ipp._tcp.")) -- key.type = CUPS_DEVICE_IPP; -- else if (!strcmp(regtype, "_ipps._tcp.") || -- !strcmp(regtype, "_ipp-tls._tcp.")) -- key.type = CUPS_DEVICE_IPPS; -- else if (!strcmp(regtype, "_fax-ipp._tcp.")) -- key.type = CUPS_DEVICE_FAX_IPP; -- else if (!strcmp(regtype, "_printer._tcp.")) -- key.type = CUPS_DEVICE_PRINTER; -- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -- key.type = CUPS_DEVICE_PDL_DATASTREAM; -- else -- key.type = CUPS_DEVICE_RIOUSBPRINT; -+ key.type = device_type (regtype); - - for (device = cupsArrayFind(devices, &key); - device; -@@ -627,8 +878,14 @@ get_device(cups_array_t *devices, /* I - - free(device->domain); - device->domain = strdup(replyDomain); - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, device->name, regtype, - replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - free(device->fullName); - device->fullName = strdup(fullName); - } -@@ -648,6 +905,9 @@ get_device(cups_array_t *devices, /* I - - device->domain = strdup(replyDomain); - device->type = key.type; - device->priority = 50; -+#ifdef HAVE_AVAHI -+ device->resolved = 0; -+#endif /* HAVE_AVAHI */ - - cupsArrayAdd(devices, device); - -@@ -655,13 +915,20 @@ get_device(cups_array_t *devices, /* I - - * Set the "full name" of this service, which is used for queries... - */ - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - device->fullName = strdup(fullName); - - return (device); - } - - -+#ifdef HAVE_DNSSD - /* - * 'query_callback()' - Process query data. - */ -@@ -685,7 +952,7 @@ query_callback( - *ptr; /* Pointer into string */ - cups_device_t dkey, /* Search key */ - *device; /* Device */ -- -+ cups_txt_records_t txt; - - fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -719,94 +986,233 @@ query_callback( - if ((ptr = strstr(name, "._")) != NULL) - *ptr = '\0'; - -- if (strstr(fullName, "_ipp._tcp.")) -- dkey.type = CUPS_DEVICE_IPP; -- else if (strstr(fullName, "_ipps._tcp.") || -- strstr(fullName, "_ipp-tls._tcp.")) -- dkey.type = CUPS_DEVICE_IPPS; -- else if (strstr(fullName, "_fax-ipp._tcp.")) -- dkey.type = CUPS_DEVICE_FAX_IPP; -- else if (strstr(fullName, "_printer._tcp.")) -- dkey.type = CUPS_DEVICE_PRINTER; -- else if (strstr(fullName, "_pdl-datastream._tcp.")) -- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; -+ dkey.type = device_type (fullName); -+ -+ txt.data = rdata; -+ txt.dataend = rdata + rdlen; -+ device = find_device ((cups_array_t *) context, &txt, &dkey); -+ if (!device) -+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+} -+#endif /* HAVE_DNSSD */ -+ -+ -+#ifdef HAVE_AVAHI -+/* -+ * 'avahi_client_callback()' - Avahi client callback function. -+ */ -+ -+static void -+avahi_client_callback(AvahiClient *client, -+ AvahiClientState state, -+ void *context) -+{ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ { -+ fprintf (stderr, "ERROR: Avahi connection failed\n"); -+ avahi_simple_poll_quit (simple_poll); -+ } -+} -+ -+ -+/* -+ * 'avahi_query_callback()' - Avahi query callback function. -+ */ -+ -+static void -+avahi_query_callback(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client; -+ cups_device_t key, -+ *device; -+ char uqname[1024], -+ *ptr; -+ cups_txt_records_t txtr; -+ -+ client = avahi_service_resolver_get_client (resolver); -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ if (event == AVAHI_RESOLVER_FAILURE) -+ { -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ } -+ -+ avahi_service_resolver_free (resolver); -+ return; -+ } -+ -+ /* -+ * Set search key for device. -+ */ -+ -+ key.name = uqname; -+ unquote (uqname, name, sizeof (uqname)); -+ if ((ptr = strstr(name, "._")) != NULL) -+ *ptr = '\0'; -+ -+ key.domain = (char *) domain; -+ key.type = device_type (type); -+ -+ /* -+ * Find the device and the the TXT information. -+ */ -+ -+ txtr.txt = txt; -+ device = find_device ((cups_array_t *) context, &txtr, &key); -+ if (device) -+ { -+ /* -+ * Let the main loop know to announce the device. -+ */ -+ -+ device->resolved = 1; -+ avahi_got_callback = 1; -+ } - else -- dkey.type = CUPS_DEVICE_RIOUSBPRINT; -+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); - -- for (device = cupsArrayFind(devices, &dkey); -+ avahi_service_resolver_free (resolver); -+} -+ -+ -+/* -+ * 'avahi_browse_callback()' - Avahi browse callback function. -+ */ -+ -+static void -+avahi_browse_callback(AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client = avahi_service_browser_get_client (browser); -+ -+ switch (event) -+ { -+ case AVAHI_BROWSER_FAILURE: -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ avahi_simple_poll_quit (simple_poll); -+ return; -+ -+ case AVAHI_BROWSER_NEW: -+ /* -+ * This object is new on the network. -+ */ -+ -+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) -+ { -+ /* -+ * This comes from the local machine so ignore it. -+ */ -+ -+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); -+ } -+ else -+ { -+ /* -+ * Create a device entry for it if it doesn't yet exist. -+ */ -+ -+ get_device ((cups_array_t *)context, name, type, domain); -+ -+ /* -+ * Now look for a TXT entry. -+ */ -+ -+ if (avahi_service_resolver_new (client, interface, protocol, -+ name, type, domain, -+ AVAHI_PROTO_UNSPEC, 0, -+ avahi_query_callback, context) == NULL) -+ { -+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", -+ name, avahi_strerror (avahi_client_errno (client))); -+ } -+ } -+ -+ break; -+ -+ case AVAHI_BROWSER_REMOVE: -+ case AVAHI_BROWSER_ALL_FOR_NOW: -+ case AVAHI_BROWSER_CACHE_EXHAUSTED: -+ break; -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * 'find_device()' - Find a device from its name and domain. -+ */ -+ -+static cups_device_t * -+find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey) -+{ -+ cups_device_t *device; -+ char *ptr; -+ -+ for (device = cupsArrayFind(devices, dkey); - device; - device = cupsArrayNext(devices)) - { -- if (_cups_strcasecmp(device->name, dkey.name) || -- _cups_strcasecmp(device->domain, dkey.domain)) -+ if (_cups_strcasecmp(device->name, dkey->name) || -+ _cups_strcasecmp(device->domain, dkey->domain)) - { - device = NULL; - break; - } -- else if (device->type == dkey.type) -+ else if (device->type == dkey->type) - { - /* - * Found it, pull out the priority and make and model from the TXT - * record and save it... - */ - -- const uint8_t *data, /* Pointer into data */ -- *datanext, /* Next key/value pair */ -- *dataend; /* End of entire TXT record */ -- uint8_t datalen; /* Length of current key/value pair */ -- char key[256], /* Key string */ -- value[256], /* Value string */ -- make_and_model[512], -+ char make_and_model[512], - /* Manufacturer and model */ - model[256], /* Model */ -- device_id[2048];/* 1284 device ID */ -- -+ device_id[2048]; /* 1284 device ID */ - - device_id[0] = '\0'; - make_and_model[0] = '\0'; - - strcpy(model, "Unknown"); - -- for (data = rdata, dataend = data + rdlen; -- data < dataend; -- data = datanext) -+ for (;;) - { -- /* -- * Read a key/value pair starting with an 8-bit length. Since the -- * length is 8 bits and the size of the key/value buffers is 256, we -- * don't need to check for overflow... -- */ -- -- datalen = *data++; -- -- if (!datalen || (data + datalen) > dataend) -- break; -- -- datanext = data + datalen; -- -- for (ptr = key; data < datanext && *data != '='; data ++) -- *ptr++ = *data; -- *ptr = '\0'; -+ char *key; -+ char *value; - -- if (data < datanext && *data == '=') -- { -- data ++; -- -- if (data < datanext) -- memcpy(value, data, datanext - data); -- value[datanext - data] = '\0'; -+ if (parse_txt_record_pair (txt)) -+ goto next; - -- fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n", -- key, value); -- } -- else -- { -- fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n", -- key); -- continue; -- } -- -- if (!_cups_strncasecmp(key, "usb_", 4)) -+ key = txt->key; -+ value = txt->value; -+ if (!strncasecmp(key, "usb_", 4)) - { - /* - * Add USB device ID information... -@@ -861,6 +1267,10 @@ query_callback( - if (device->type == CUPS_DEVICE_PRINTER) - device->sent = 1; - } -+ -+ next: -+ if (next_txt_record (txt) == NULL) -+ break; - } - - if (device->device_id) -@@ -917,11 +1327,9 @@ query_callback( - } - } - -- if (!device) -- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+ return device; - } - -- - /* - * 'sigterm_handler()' - Handle termination signals... - */ -diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-support.c ---- cups-1.5.3/cups/http-support.c.avahi-2-backend 2012-02-15 02:06:12.000000000 +0100 -+++ cups-1.5.3/cups/http-support.c 2012-05-15 17:04:51.045944634 +0200 -@@ -43,6 +43,10 @@ - * http_copy_decode() - Copy and decode a URI. - * http_copy_encode() - Copy and encode a URI. - * http_resolve_cb() - Build a device URI for the given service name. -+ * avahi_resolve_uri_client_cb() -+ * - Avahi client callback for resolving URI. -+ * avahi_resolve_uri_resolver_cb() -+ * - Avahi resolver callback for resolving URI. - */ - - /* -@@ -60,6 +64,11 @@ - # include <sys/select.h> - # endif /* WIN32 */ - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+#endif /* HAVE_AVAHI */ - - - /* -@@ -127,6 +136,24 @@ static void DNSSD_API http_resolve_cb(DN - void *context); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void avahi_resolve_uri_client_cb(AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll); -+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ - - /* - * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1434,6 +1461,9 @@ _httpResolveURI( - - if (strstr(hostname, "._tcp")) - { -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ char *regtype, /* Pointer to type in hostname */ -+ *domain; /* Pointer to domain in hostname */ - #ifdef HAVE_DNSSD - # ifdef WIN32 - # pragma comment(lib, "dnssd.lib") -@@ -1452,6 +1482,17 @@ _httpResolveURI( - fd_set input_set; /* Input set for select() */ - struct timeval stimeout; /* Timeout value for select() */ - #endif /* HAVE_POLL */ -+#else /* HAVE_AVAHI */ -+ AvahiSimplePoll *simple_poll; -+ AvahiClient *client; -+ int error; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } user_data; -+#endif /* HAVE_DNSSD */ -+ - - if (options & _HTTP_RESOLVE_STDERR) - fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname); -@@ -1488,9 +1529,16 @@ _httpResolveURI( - if (domain) - *domain++ = '\0'; - -+#ifdef HAVE_DNSSD - uribuf.buffer = resolved_uri; - uribuf.bufsize = resolved_size; - uribuf.options = options; -+#else -+ user_data.uribuf.buffer = resolved_uri; -+ user_data.uribuf.bufsize = resolved_size; -+ user_data.uribuf.options = options; -+#endif -+ - resolved_uri[0] = '\0'; - - DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", " -@@ -1504,6 +1552,7 @@ _httpResolveURI( - - uri = NULL; - -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) - { - localref = ref; -@@ -1611,6 +1660,36 @@ _httpResolveURI( - - DNSServiceRefDeallocate(ref); - } -+#else /* HAVE_AVAHI */ -+ if ((simple_poll = avahi_simple_poll_new ()) != NULL) -+ { -+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_resolve_uri_client_cb, -+ &simple_poll, &error)) != NULL) -+ { -+ user_data.poll = simple_poll; -+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, hostname, -+ regtype, domain, AVAHI_PROTO_UNSPEC, 0, -+ avahi_resolve_uri_resolver_cb, -+ &user_data) != NULL) -+ { -+ avahi_simple_poll_loop (simple_poll); -+ -+ /* -+ * Collect the result. -+ */ -+ -+ if (resolved_uri[0]) -+ uri = resolved_uri; -+ } -+ -+ avahi_client_free (client); -+ } -+ -+ avahi_simple_poll_free (simple_poll); -+ } -+#endif /* HAVE_DNSSD */ - - if (options & _HTTP_RESOLVE_STDERR) - { -@@ -1622,13 +1701,13 @@ _httpResolveURI( - fputs("STATE: -connecting-to-device,offline-report\n", stderr); - } - --#else -+#else /* HAVE_DNSSD || HAVE_AVAHI */ - /* - * No DNS-SD support... - */ - - uri = NULL; --#endif /* HAVE_DNSSD */ -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ - - if ((options & _HTTP_RESOLVE_STDERR) && !uri) - _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer.")); -@@ -1916,6 +1995,115 @@ http_resolve_cb( - } - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+/* -+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI. -+ */ -+ -+static void -+avahi_resolve_uri_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll) -+{ -+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " -+ "simple_poll=%p)\n", client, state, simple_poll)); -+ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ avahi_simple_poll_quit (simple_poll); -+} -+ -+ -+/* -+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving -+ * URI. -+ */ -+ -+static void -+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ const char *scheme; /* URI scheme */ -+ char rp[256]; /* Remote printer */ -+ AvahiStringList *pair; -+ char *value; -+ size_t valueLen = 0; -+ char addr[AVAHI_ADDRESS_STR_MAX]; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } *poll_uribuf = context; -+ -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " -+ "interface=%d, protocol=%d, event=%d, name=\"%s\", " -+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " -+ "port=%d, txt=%p, flags=%d, context=%p)\n", -+ resolver, interface, protocol, event, name, type, domain, -+ host_name, address, port, txt, flags, context)); -+ -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ avahi_service_resolver_free (resolver); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+ return; -+ } -+ -+ /* -+ * Figure out the scheme from the full name... -+ */ -+ -+ if (strstr(type, "_ipp.")) -+ scheme = "ipp"; -+ else if (strstr(type, "_printer.")) -+ scheme = "lpd"; -+ else if (strstr(type, "_pdl-datastream.")) -+ scheme = "socket"; -+ else -+ scheme = "riousbprint"; -+ -+ /* -+ * Extract the "remote printer key from the TXT record... -+ */ -+ -+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) -+ { -+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); -+ rp[0] = '/'; -+ memcpy (rp + 1, value, valueLen); -+ rp[valueLen + 1] = '\0'; -+ } -+ else -+ rp[0] = '\0'; -+ -+ /* -+ * Assemble the final device URI... -+ */ -+ -+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); -+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, -+ poll_uribuf->uribuf.bufsize, scheme, NULL, -+ addr, port, rp); -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", -+ poll_uribuf->uribuf.buffer)); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+} -+#endif /* HAVE_AVAHI */ -+ - - /* - * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
\ No newline at end of file diff --git a/extra/cups/cups-avahi-3-timeouts.patch b/extra/cups/cups-avahi-3-timeouts.patch deleted file mode 100644 index daf852a0f..000000000 --- a/extra/cups/cups-avahi-3-timeouts.patch +++ /dev/null @@ -1,381 +0,0 @@ -diff -up cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.2/scheduler/cupsd.h ---- cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts 2011-05-11 23:17:34.000000000 +0100 -+++ cups-1.5.2/scheduler/cupsd.h 2012-03-14 15:06:36.509476983 +0000 -@@ -140,6 +140,15 @@ extern const char *cups_hstrerror(int); - - typedef void (*cupsd_selfunc_t)(void *data); - -+#ifdef HAVE_AVAHI -+/* -+ * Timeout callback function type... -+ */ -+ -+typedef struct _cupsd_timeout_s cupsd_timeout_t; -+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data); -+#endif /* HAVE_AVAHI */ -+ - - /* - * Globals... -@@ -173,6 +182,11 @@ VAR int Launchd VALUE(0); - /* Running from launchd */ - #endif /* HAVE_LAUNCH_H */ - -+#ifdef HAVE_AVAHI -+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */ -+#endif /* HAVE_AVAHI */ -+ -+ - - /* - * Prototypes... -@@ -242,6 +256,20 @@ extern void cupsdStopSelect(void); - extern void cupsdStartServer(void); - extern void cupsdStopServer(void); - -+#ifdef HAVE_AVAHI -+extern void cupsdInitTimeouts(void); -+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv, -+ cupsd_timeoutfunc_t cb, -+ void *data); -+extern cupsd_timeout_t *cupsdNextTimeout (long *delay); -+extern void cupsdRunTimeout (cupsd_timeout_t *timeout); -+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout, -+ const struct timeval *tv); -+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); -+#endif /* HAVE_AVAHI */ -+ -+extern int cupsdRemoveFile(const char *filename); -+ - - /* - * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $". -diff -up cups-1.5.2/scheduler/main.c.avahi-3-timeouts cups-1.5.2/scheduler/main.c ---- cups-1.5.2/scheduler/main.c.avahi-3-timeouts 2012-03-14 15:04:17.655305548 +0000 -+++ cups-1.5.2/scheduler/main.c 2012-03-14 15:06:36.511476986 +0000 -@@ -146,6 +146,10 @@ main(int argc, /* I - Number of comm - int launchd_idle_exit; - /* Idle exit on select timeout? */ - #endif /* HAVE_LAUNCHD */ -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */ -+ long tmo_delay; /* Time before it must be called */ -+#endif /* HAVE_AVAHI */ - - - #ifdef HAVE_GETEUID -@@ -535,6 +539,14 @@ main(int argc, /* I - Number of comm - - httpInitialize(); - -+#ifdef HAVE_AVAHI -+ /* -+ * Initialize timed callback structures. -+ */ -+ -+ cupsdInitTimeouts(); -+#endif /* HAVE_AVAHI */ -+ - cupsdStartServer(); - - /* -@@ -874,6 +886,16 @@ main(int argc, /* I - Number of comm - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * If a timed callback is due, run it. -+ */ -+ -+ tmo = cupsdNextTimeout (&tmo_delay); -+ if (tmo && tmo_delay == 0) -+ cupsdRunTimeout (tmo); -+#endif /* HAVE_AVAHI */ -+ - #ifndef __APPLE__ - /* - * Update the network interfaces once a minute... -@@ -1787,6 +1809,10 @@ select_timeout(int fds) /* I - Number - cupsd_job_t *job; /* Job information */ - cupsd_subscription_t *sub; /* Subscription information */ - const char *why; /* Debugging aid */ -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Timed callback */ -+ long tmo_delay; /* Seconds before calling it */ -+#endif /* HAVE_AVAHI */ - - - /* -@@ -1829,6 +1855,19 @@ select_timeout(int fds) /* I - Number - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * See if there are any scheduled timed callbacks to run. -+ */ -+ -+ if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL && -+ (now + tmo_delay) < timeout) -+ { -+ timeout = tmo_delay; -+ why = "run a timed callback"; -+ } -+#endif /* HAVE_AVAHI */ -+ - /* - * Check whether we are accepting new connections... - */ -diff -up cups-1.5.2/scheduler/Makefile.avahi-3-timeouts cups-1.5.2/scheduler/Makefile ---- cups-1.5.2/scheduler/Makefile.avahi-3-timeouts 2012-03-14 15:04:17.685305586 +0000 -+++ cups-1.5.2/scheduler/Makefile 2012-03-14 15:06:36.508476980 +0000 -@@ -39,7 +39,8 @@ CUPSDOBJS = \ - server.o \ - statbuf.o \ - subscriptions.o \ -- sysman.o -+ sysman.o \ -+ timeout.o - LIBOBJS = \ - filter.o \ - mime.o \ -diff -up cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts cups-1.5.2/scheduler/timeout.c ---- cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts 2012-03-14 15:06:36.552477037 +0000 -+++ cups-1.5.2/scheduler/timeout.c 2012-03-14 15:06:36.552477037 +0000 -@@ -0,0 +1,235 @@ -+/* -+ * "$Id$" -+ * -+ * Timeout functions for the Common UNIX Printing System (CUPS). -+ * -+ * Copyright (C) 2010, 2011 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh@redhat.com> -+ * -+ * 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. -+ * -+ * 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 HOLDERS 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. -+ * -+ * Contents: -+ * -+ * cupsdInitTimeouts() - Initialise timeout structure. -+ * cupsdAddTimeout() - Add a timed callback. -+ * cupsdNextTimeout() - Find the next enabled timed callback. -+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it. -+ * cupsdRemoveTimeout() - Discard a timed callback. -+ * compare_timeouts() - Compare timed callbacks for array sorting. -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include <malloc.h> -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include <avahi-common/timeval.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+struct _cupsd_timeout_s -+{ -+ struct timeval when; -+ int enabled; -+ cupsd_timeoutfunc_t callback; -+ void *data; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+/* -+ * 'compare_timeouts()' - Compare timed callbacks for array sorting. -+ */ -+ -+static int -+compare_addrs (void *p0, void *p1) -+{ -+ if (p0 == p1) -+ return (0); -+ if (p0 < p1) -+ return (-1); -+ return (1); -+} -+ -+static int -+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1) -+{ -+ int addrsdiff = compare_addrs (p0, p1); -+ int tvdiff; -+ -+ if (addrsdiff == 0) -+ return (0); -+ -+ if (!p0->enabled || !p1->enabled) -+ { -+ if (!p0->enabled && !p1->enabled) -+ return (addrsdiff); -+ -+ return (p0->enabled ? -1 : 1); -+ } -+ -+ tvdiff = avahi_timeval_compare (&p0->when, &p1->when); -+ if (tvdiff != 0) -+ return (tvdiff); -+ -+ return (addrsdiff); -+} -+ -+ -+/* -+ * 'cupsdInitTimeouts()' - Initialise timeout structures. -+ */ -+ -+void -+cupsdInitTimeouts(void) -+{ -+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL); -+} -+ -+ -+/* -+ * 'cupsdAddTimeout()' - Add a timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Timeout handle */ -+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */ -+ cupsd_timeoutfunc_t cb, /* I - Callback function */ -+ void *data) /* I - User data */ -+{ -+ cupsd_timeout_t *timeout; -+ -+ timeout = malloc (sizeof(cupsd_timeout_t)); -+ if (timeout != NULL) -+ { -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ -+ timeout->callback = cb; -+ timeout->data = data; -+ cupsArrayAdd (Timeouts, timeout); -+ } -+ -+ return timeout; -+} -+ -+ -+/* -+ * 'cupsdNextTimeout()' - Find the next enabled timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Next enabled timeout or NULL */ -+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */ -+{ -+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts); -+ struct timeval curtime; -+ -+ if (first && !first->enabled) -+ first = NULL; -+ -+ if (first && delay) -+ { -+ gettimeofday (&curtime, NULL); -+ if (avahi_timeval_compare (&curtime, &first->when) > 0) -+ { -+ *delay = 0; -+ } else { -+ *delay = 1 + first->when.tv_sec - curtime.tv_sec; -+ if (first->when.tv_usec < curtime.tv_usec) -+ (*delay)--; -+ } -+ } -+ -+ return (first); -+} -+ -+ -+/* -+ * 'cupsdRunTimeout()' - Run a timed callback. -+ */ -+ -+void -+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ if (!timeout) -+ return; -+ timeout->enabled = 0; -+ if (!timeout->callback) -+ return; -+ timeout->callback (timeout, timeout->data); -+} -+ -+/* -+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it. -+ */ -+ -+void -+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */ -+ const struct timeval *tv) /* I - Absolute time or NULL */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ cupsArrayAdd (Timeouts, timeout); -+} -+ -+ -+/* -+ * 'cupsdRemoveTimeout()' - Discard a timed callback. -+ */ -+ -+void -+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ free (timeout); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ diff --git a/extra/cups/cups-avahi-4-poll.patch b/extra/cups/cups-avahi-4-poll.patch deleted file mode 100644 index d7fa5fd56..000000000 --- a/extra/cups/cups-avahi-4-poll.patch +++ /dev/null @@ -1,529 +0,0 @@ -diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c ---- cups-1.5.2/scheduler/avahi.c.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000 -+++ cups-1.5.2/scheduler/avahi.c 2012-03-14 15:07:29.477542381 +0000 -@@ -0,0 +1,441 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010, 2011 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh@redhat.com> -+ * -+ * 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. -+ * -+ * 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 HOLDERS 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. -+ * -+ * Contents: -+ * -+ * watch_read_cb - Read callback for file descriptor -+ * watch_write_cb - Write callback for file descriptor -+ * watched_fd_add_select() - Call cupsdAddSelect() as needed -+ * watch_new() - Create a new file descriptor watch -+ * watch_free() - Free a file descriptor watch -+ * watch_update() - Update watched events for a file descriptor -+ * watch_get_events() - Get events that happened for a file descriptor -+ * timeout_cb() - Run a timed Avahi callback -+ * timeout_new() - Set a wakeup time -+ * timeout_update() - Update the expiration time for a timeout -+ * timeout_free() - Free a timeout -+ * compare_watched_fds() - Compare watched file descriptors for array sorting -+ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS -+ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS -+ * avahi_cups_poll_get() - Get the abstract poll API structure -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include <malloc.h> -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include <avahi-common/timeval.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+typedef struct -+{ -+ AvahiCupsPoll *cups_poll; -+ -+ int fd; -+ AvahiWatchEvent occurred; -+ cups_array_t *watches; -+} cupsd_watched_fd_t; -+ -+struct AvahiWatch -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ AvahiWatchEvent events; -+ AvahiWatchCallback callback; -+ void *userdata; -+}; -+ -+struct AvahiTimeout -+{ -+ AvahiCupsPoll *cups_poll; -+ AvahiTimeoutCallback callback; -+ void *userdata; -+ cupsd_timeout_t *cupsd_timeout; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+static AvahiWatch * watch_new(const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata); -+static void watch_free(AvahiWatch *watch); -+static void watch_update(AvahiWatch *watch, -+ AvahiWatchEvent events); -+static AvahiWatchEvent watch_get_events(AvahiWatch *watch); -+ -+ -+/* -+ * 'watch_read_cb' - Read callback for file descriptor -+ */ -+ -+static void -+watch_read_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_IN; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) -+ { -+ if (watch->events & watched_fd->occurred) -+ { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_IN, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_IN; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watch_write_cb' - Write callback for file descriptor -+ */ -+ -+static void -+watch_write_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_OUT; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) -+ { -+ if (watch->events & watched_fd->occurred) -+ { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_OUT, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_OUT; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed -+ */ -+ -+static int /* O - Watches? */ -+watched_fd_add_select (cupsd_watched_fd_t *watched_fd) -+{ -+ AvahiWatch *watch; -+ cupsd_selfunc_t read_cb = NULL, write_cb = NULL; -+ int any_watches = 0; -+ -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) -+ { -+ any_watches = 1; -+ if (watch->events & (AVAHI_WATCH_IN | -+ AVAHI_WATCH_ERR | -+ AVAHI_WATCH_HUP)) -+ { -+ read_cb = (cupsd_selfunc_t)watch_read_cb; -+ if (write_cb != NULL) -+ break; -+ } -+ -+ if (watch->events & AVAHI_WATCH_OUT) -+ { -+ write_cb = (cupsd_selfunc_t)watch_write_cb; -+ if (read_cb != NULL) -+ break; -+ } -+ } -+ -+ if (read_cb || write_cb) -+ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd); -+ else -+ cupsdRemoveSelect (watched_fd->fd); -+ -+ return (any_watches); -+} -+ -+/* -+ * 'watch_new' - Create a new file descriptor watch -+ */ -+ -+static AvahiWatch * -+watch_new (const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata) -+{ -+ cupsd_watched_fd_t key, *watched_fd; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ AvahiWatch *watch = malloc(sizeof(AvahiWatch)); -+ if (watch == NULL) -+ return (NULL); -+ -+ watch->events = events; -+ watch->callback = callback; -+ watch->userdata = userdata; -+ -+ key.fd = fd; -+ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key); -+ if (watched_fd == NULL) -+ { -+ watched_fd = malloc(sizeof(cupsd_watched_fd_t)); -+ if (watched_fd == NULL) -+ { -+ free (watch); -+ return (NULL); -+ } -+ -+ watched_fd->fd = fd; -+ watched_fd->occurred = 0; -+ watched_fd->cups_poll = cups_poll; -+ watched_fd->watches = cupsArrayNew (NULL, NULL); -+ cupsArrayAdd (cups_poll->watched_fds, watched_fd); -+ } -+ -+ watch->watched_fd = watched_fd; -+ cupsArrayAdd(watched_fd->watches, watch); -+ watched_fd_add_select (watched_fd); -+ return (watch); -+} -+ -+ -+/* -+ * 'watch_free' - Free a file descriptor watch -+ */ -+ -+static void -+watch_free (AvahiWatch *watch) -+{ -+ cupsd_watched_fd_t *watched_fd = watch->watched_fd; -+ AvahiCupsPoll *cups_poll = watched_fd->cups_poll; -+ -+ cupsArrayRemove (watched_fd->watches, watch); -+ free (watch); -+ -+ if (!watched_fd_add_select (watched_fd)) -+ { -+ /* No more watches */ -+ cupsArrayRemove (cups_poll->watched_fds, watched_fd); -+ free (watched_fd); -+ } -+} -+ -+ -+/* -+ * 'watch_update' - Update watched events for a file descriptor -+ */ -+ -+static void -+watch_update (AvahiWatch *watch, -+ AvahiWatchEvent events) -+{ -+ watch->events = events; -+ watched_fd_add_select (watch->watched_fd); -+} -+ -+ -+/* -+ * 'watch_get_events' - Get events that happened for a file descriptor -+ */ -+ -+static AvahiWatchEvent -+watch_get_events (AvahiWatch *watch) -+{ -+ return (watch->watched_fd->occurred); -+} -+ -+ -+/* -+ * 'timeout_cb()' - Run a timed Avahi callback -+ */ -+ -+static void -+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata) -+{ -+ AvahiTimeout *timeout = userdata; -+ (timeout->callback) (timeout, timeout->userdata); -+} -+ -+ -+/* -+ * 'timeout_new' - Set a wakeup time -+ */ -+ -+static AvahiTimeout * -+timeout_new (const AvahiPoll *api, -+ const struct timeval *tv, -+ AvahiTimeoutCallback callback, -+ void *userdata) -+{ -+ AvahiTimeout *timeout; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ -+ timeout = malloc(sizeof(AvahiTimeout)); -+ if (timeout == NULL) -+ return (NULL); -+ -+ timeout->cups_poll = cups_poll; -+ timeout->callback = callback; -+ timeout->userdata = userdata; -+ timeout->cupsd_timeout = cupsdAddTimeout (tv, -+ (cupsd_timeoutfunc_t)timeout_cb, -+ timeout); -+ cupsArrayAdd (cups_poll->timeouts, timeout); -+ return (timeout); -+} -+ -+ -+/* -+ * 'timeout_update' - Update the expiration time for a timeout -+ */ -+ -+static void -+timeout_update (AvahiTimeout *timeout, -+ const struct timeval *tv) -+{ -+ cupsdUpdateTimeout (timeout->cupsd_timeout, tv); -+} -+ -+ -+/* -+ * ' timeout_free' - Free a timeout -+ */ -+ -+static void -+timeout_free (AvahiTimeout *timeout) -+{ -+ cupsArrayRemove (timeout->cups_poll->timeouts, timeout); -+ cupsdRemoveTimeout (timeout->cupsd_timeout); -+ free (timeout); -+} -+ -+ -+/* -+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting -+ */ -+static int -+compare_watched_fds(cupsd_watched_fd_t *p0, -+ cupsd_watched_fd_t *p1) -+{ -+ /* -+ * Compare by fd (no two elements have the same fd) -+ */ -+ -+ if (p0->fd == p1->fd) -+ return 0; -+ -+ return (p0->fd < p1->fd ? -1 : 1); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS -+ */ -+ -+AvahiCupsPoll * -+avahi_cups_poll_new (void) -+{ -+ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll)); -+ if (cups_poll == NULL) -+ return (NULL); -+ -+ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds, -+ NULL); -+ cups_poll->timeouts = cupsArrayNew (NULL, NULL); -+ -+ cups_poll->api.userdata = cups_poll; -+ cups_poll->api.watch_new = watch_new; -+ cups_poll->api.watch_free = watch_free; -+ cups_poll->api.watch_update = watch_update; -+ cups_poll->api.watch_get_events = watch_get_events; -+ -+ cups_poll->api.timeout_new = timeout_new; -+ cups_poll->api.timeout_update = timeout_update; -+ cups_poll->api.timeout_free = timeout_free; -+ -+ return (cups_poll); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS -+ */ -+void -+avahi_cups_poll_free (AvahiCupsPoll *cups_poll) -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds); -+ watched_fd; -+ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)) -+ cupsArrayClear (watched_fd->watches); -+ -+ cupsArrayClear (cups_poll->watched_fds); -+ cupsArrayClear (cups_poll->timeouts); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_get' - Get the abstract poll API structure -+ */ -+ -+const AvahiPoll * -+avahi_cups_poll_get (AvahiCupsPoll *cups_poll) -+{ -+ return (&cups_poll->api); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ -diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h ---- cups-1.5.2/scheduler/avahi.h.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000 -+++ cups-1.5.2/scheduler/avahi.h 2012-03-14 15:07:29.477542381 +0000 -@@ -0,0 +1,69 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010, 2011 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh@redhat.com> -+ * -+ * 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. -+ * -+ * 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 HOLDERS 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. -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/publish.h> -+#endif /* HAVE_AVAHI */ -+ -+#ifdef HAVE_AUTHORIZATION_H -+# include <Security/Authorization.h> -+#endif /* HAVE_AUTHORIZATION_H */ -+ -+ -+#ifdef HAVE_AVAHI -+typedef struct -+{ -+ AvahiPoll api; -+ cups_array_t *watched_fds; -+ cups_array_t *timeouts; -+} AvahiCupsPoll; -+#endif /* HAVE_AVAHI */ -+ -+/* -+ * Prototypes... -+ */ -+ -+#ifdef HAVE_AVAHI -+extern AvahiCupsPoll * avahi_cups_poll_new(void); -+extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); -+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * End of "$Id$". -+ */ -diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile ---- cups-1.5.2/scheduler/Makefile.avahi-4-poll 2012-03-14 15:06:36.508476980 +0000 -+++ cups-1.5.2/scheduler/Makefile 2012-03-14 15:07:29.476542380 +0000 -@@ -17,6 +17,7 @@ include ../Makedefs - - CUPSDOBJS = \ - auth.o \ -+ avahi.o \ - banners.o \ - cert.o \ - classes.o \ diff --git a/extra/cups/cups-avahi-5-services.patch b/extra/cups/cups-avahi-5-services.patch deleted file mode 100644 index 820b3c32b..000000000 --- a/extra/cups/cups-avahi-5-services.patch +++ /dev/null @@ -1,1272 +0,0 @@ -diff -up cups-1.5.2/cgi-bin/admin.c.avahi-5-services cups-1.5.2/cgi-bin/admin.c ---- cups-1.5.2/cgi-bin/admin.c.avahi-5-services 2011-08-17 22:01:53.000000000 +0100 -+++ cups-1.5.2/cgi-bin/admin.c 2012-03-14 15:08:25.701611799 +0000 -@@ -1643,7 +1643,7 @@ do_config_server(http_t *http) /* I - H - else - local_protocols[0] = '\0'; - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if (cgiGetVariable("BROWSE_LOCAL_DNSSD")) - { - if (local_protocols[0]) -@@ -1651,7 +1651,7 @@ do_config_server(http_t *http) /* I - H - else - strcat(local_protocols, "dnssd"); - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LDAP - if (cgiGetVariable("BROWSE_LOCAL_LDAP")) -@@ -2718,9 +2718,9 @@ do_menu(http_t *http) /* I - HTTP conn - #endif /* HAVE_GSSAPI */ - cgiSetVariable("KERBEROS", ""); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cgiSetVariable("HAVE_DNSSD", "1"); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LDAP - cgiSetVariable("HAVE_LDAP", "1"); -diff -up cups-1.5.2/scheduler/avahi.h.avahi-5-services cups-1.5.2/scheduler/avahi.h ---- cups-1.5.2/scheduler/avahi.h.avahi-5-services 2012-03-14 15:07:29.477542381 +0000 -+++ cups-1.5.2/scheduler/avahi.h 2012-03-14 15:08:25.701611799 +0000 -@@ -3,7 +3,7 @@ - * - * Avahi poll implementation for the CUPS scheduler. - * -- * Copyright (C) 2010, 2011 Red Hat, Inc. -+ * Copyright (C) 2010, 2011, 2012 Red Hat, Inc. - * Authors: - * Tim Waugh <twaugh@redhat.com> - * -@@ -32,37 +32,40 @@ - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include <config.h> -+#ifndef _CUPS_AVAHI_H_ -+# define _CUPS_AVAHI_H_ - --#ifdef HAVE_AVAHI --# include <avahi-client/client.h> --# include <avahi-client/publish.h> --#endif /* HAVE_AVAHI */ -+/* -+ * Include necessary headers... -+ */ - --#ifdef HAVE_AUTHORIZATION_H --# include <Security/Authorization.h> --#endif /* HAVE_AUTHORIZATION_H */ -+# include <config.h> - -+# ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/publish.h> -+# endif /* HAVE_AVAHI */ - --#ifdef HAVE_AVAHI -+# ifdef HAVE_AVAHI - typedef struct - { - AvahiPoll api; - cups_array_t *watched_fds; - cups_array_t *timeouts; - } AvahiCupsPoll; --#endif /* HAVE_AVAHI */ -+# endif /* HAVE_AVAHI */ - - /* - * Prototypes... - */ - --#ifdef HAVE_AVAHI -+# ifdef HAVE_AVAHI - extern AvahiCupsPoll * avahi_cups_poll_new(void); - extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); - extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); --#endif /* HAVE_AVAHI */ -+# endif /* HAVE_AVAHI */ - -+#endif /* !_CUPS_AVAHI_H_ */ - - /* - * End of "$Id$". -diff -up cups-1.5.2/scheduler/client.c.avahi-5-services cups-1.5.2/scheduler/client.c ---- cups-1.5.2/scheduler/client.c.avahi-5-services 2012-01-13 23:00:22.000000000 +0000 -+++ cups-1.5.2/scheduler/client.c 2012-03-14 15:08:25.703611797 +0000 -@@ -4989,7 +4989,7 @@ valid_host(cupsd_client_t *con) /* I - - !strncmp(host, "[::1]:", 6)); - } - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * Check if the hostname is something.local (Bonjour); if so, allow it. - */ -@@ -4998,7 +4998,7 @@ valid_host(cupsd_client_t *con) /* I - - (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) || - !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8))) - return (1); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - /* - * Check if the hostname is an IP address... -diff -up cups-1.5.2/scheduler/conf.c.avahi-5-services cups-1.5.2/scheduler/conf.c ---- cups-1.5.2/scheduler/conf.c.avahi-5-services 2012-03-14 15:04:17.636305526 +0000 -+++ cups-1.5.2/scheduler/conf.c 2012-03-14 15:08:25.706611803 +0000 -@@ -652,7 +652,7 @@ cupsdReadConfiguration(void) - Browsing = CUPS_DEFAULT_BROWSING; - DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups"); - #endif /* HAVE_DNSSD */ - -diff -up cups-1.5.2/scheduler/dirsvc.c.avahi-5-services cups-1.5.2/scheduler/dirsvc.c ---- cups-1.5.2/scheduler/dirsvc.c.avahi-5-services 2012-03-14 15:04:17.674305572 +0000 -+++ cups-1.5.2/scheduler/dirsvc.c 2012-03-14 15:08:25.709611806 +0000 -@@ -27,6 +27,7 @@ - * ldap_connect() - Start new LDAP connection - * ldap_reconnect() - Reconnect to LDAP Server - * ldap_disconnect() - Disconnect from LDAP Server -+ * cupsdStartAvahiClient() - Start an Avahi client if needed - * cupsdStartBrowsing() - Start sending and receiving broadcast - * information. - * cupsdStartPolling() - Start polling servers as needed. -@@ -40,11 +41,12 @@ - * dequote() - Remote quotes from a string. - * dnssdAddAlias() - Add a DNS-SD alias name. - * dnssdBuildTxtRecord() - Build a TXT record from printer info. -- * dnssdComparePrinters() - Compare the registered names of two printers. - * dnssdDeregisterPrinter() - Stop sending broadcast information for a - * printer. - * dnssdPackTxtRecord() - Pack an array of key/value pairs into the TXT - * record format. -+ * avahiPackTxtRecord() - Pack an array of key/value pairs into an -+ * AvahiStringList. - * dnssdRegisterCallback() - DNSServiceRegister callback. - * dnssdRegisterPrinter() - Start sending broadcast information for a - * printer or update the broadcast contents. -@@ -83,6 +85,7 @@ - */ - - #include "cupsd.h" -+#include <assert.h> - #include <grp.h> - - #ifdef HAVE_DNSSD -@@ -97,6 +100,17 @@ - # endif /* HAVE_SYSTEMCONFIGURATION */ - # endif /* __APPLE__ */ - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-common/domain.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+#ifdef HAVE_DNSSD -+typedef char *cupsd_txt_record_t; -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+typedef AvahiStringList *cupsd_txt_record_t; -+#endif /* HAVE_AVAHI */ - - - /* -@@ -159,27 +173,38 @@ static void update_polling(void); - static void update_smb(int onoff); - - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, -+ int for_lpd); -+static void dnssdDeregisterPrinter(cupsd_printer_t *p); -+static void dnssdRegisterPrinter(cupsd_printer_t *p); -+static void dnssdStop(void); -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+ - #ifdef HAVE_DNSSD - # ifdef HAVE_COREFOUNDATION - static void dnssdAddAlias(const void *key, const void *value, - void *context); - # endif /* HAVE_COREFOUNDATION */ --static char *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, -- int for_lpd); --static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b); --static void dnssdDeregisterPrinter(cupsd_printer_t *p); --static char *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2], -- int count); - static void dnssdRegisterCallback(DNSServiceRef sdRef, - DNSServiceFlags flags, - DNSServiceErrorType errorCode, - const char *name, const char *regtype, - const char *domain, void *context); --static void dnssdRegisterPrinter(cupsd_printer_t *p); --static void dnssdStop(void); - static void dnssdUpdate(void); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2], -+ int count); -+static void avahi_entry_group_cb (AvahiEntryGroup *group, -+ AvahiEntryGroupState state, -+ void *userdata); -+static void avahi_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *userdata); -+#endif /* HAVE_AVAHI */ -+ - #ifdef HAVE_LDAP - static const char * const ldap_attrs[] =/* CUPS LDAP attributes */ - { -@@ -283,10 +308,10 @@ cupsdDeregisterPrinter( - ldap_dereg_printer(p); - #endif /* HAVE_LDAP */ - --#ifdef HAVE_DNSSD -- if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdDeregisterPrinter(p); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -@@ -702,10 +727,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p) - slpRegisterPrinter(p); */ - #endif /* HAVE_LIBSLP */ - --#ifdef HAVE_DNSSD -- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if ((BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdRegisterPrinter(p); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -@@ -1419,6 +1444,36 @@ ldap_disconnect(LDAP *ld) /* I - LDAP h - #endif /* HAVE_LDAP */ - - -+#ifdef HAVE_AVAHI -+/* -+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed -+ */ -+ -+void -+cupsdStartAvahiClient(void) -+{ -+ int error = 0; -+ -+ if (!AvahiCupsClient && !AvahiCupsClientConnecting) -+ { -+ if (!AvahiCupsPollHandle) -+ AvahiCupsPollHandle = avahi_cups_poll_new (); -+ -+ if (AvahiCupsPollHandle) -+ { -+ if (avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle), -+ AVAHI_CLIENT_NO_FAIL, -+ avahi_client_cb, NULL, -+ &error) != NULL) -+ AvahiCupsClientConnecting = 1; -+ else -+ cupsdLogMessage (CUPSD_LOG_WARN, "Avahi client failed: %d", error); -+ } -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+ - /* - * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information. - */ -@@ -1542,13 +1597,16 @@ cupsdStartBrowsing(void) - else - BrowseSocket = -1; - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD) - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType error; /* Error from service creation */ -+#endif /* HAVE_DNSSD */ - cupsd_listener_t *lis; /* Current listening socket */ - - -+#ifdef HAVE_DNSSD - /* - * First create a "master" connection for all registrations... - */ -@@ -1573,6 +1631,7 @@ cupsdStartBrowsing(void) - fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); - - cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL); -+#endif /* HAVE_DNSSD */ - - /* - * Then get the port we use for registrations. If we are not listening -@@ -1598,17 +1657,23 @@ cupsdStartBrowsing(void) - */ - - if (BrowseRemoteProtocols & BROWSE_DNSSD) -- DNSSDPrinters = cupsArrayNew((cups_array_func_t)dnssdComparePrinters, -- NULL); -+ DNSSDPrinters = cupsArrayNew(NULL, NULL); - - /* - * Set the computer name and register the web interface... - */ - - cupsdUpdateDNSSDName(); -+ -+#ifdef HAVE_AVAHI -+ cupsdStartAvahiClient (); -+#endif /* HAVE_AVAHI */ -+ -+#ifdef HAVE_DNSSD - } -- } - #endif /* HAVE_DNSSD */ -+ } -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LIBSLP - if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) -@@ -1834,10 +1899,10 @@ cupsdStopBrowsing(void) - BrowseSocket = -1; - } - --#ifdef HAVE_DNSSD -- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if ((BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdStop(); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LIBSLP - if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) && -@@ -1902,7 +1967,7 @@ cupsdStopPolling(void) - } - - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing... - */ -@@ -1910,8 +1975,14 @@ cupsdStopPolling(void) - void - cupsdUpdateDNSSDName(void) - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType error; /* Error from service creation */ - char webif[1024]; /* Web interface share name */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int ret; /* Error from service creation */ -+ char webif[AVAHI_LABEL_MAX]; /* Web interface share name */ -+#endif /* HAVE_AVAHI */ - # ifdef HAVE_SYSTEMCONFIGURATION - SCDynamicStoreRef sc; /* Context for dynamic store */ - CFDictionaryRef btmm; /* Back-to-My-Mac domains */ -@@ -2042,6 +2113,7 @@ cupsdUpdateDNSSDName(void) - else - strlcpy(webif, "CUPS Web Interface", sizeof(webif)); - -+#ifdef HAVE_DNSSD - if (WebIFRef) - DNSServiceRefDeallocate(WebIFRef); - -@@ -2054,9 +2126,45 @@ cupsdUpdateDNSSDName(void) - NULL)) != kDNSServiceErr_NoError) - cupsdLogMessage(CUPSD_LOG_ERROR, - "DNS-SD web interface registration failed: %d", error); -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+ if (!AvahiCupsClient) -+ /* -+ * Client not yet running. -+ */ -+ return; -+ -+ if (AvahiWebIFGroup) -+ avahi_entry_group_reset (AvahiWebIFGroup); -+ else -+ AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient, -+ avahi_entry_group_cb, -+ NULL); -+ -+ if (AvahiWebIFGroup) -+ { -+ ret = avahi_entry_group_add_service (AvahiWebIFGroup, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, /* flags */ -+ webif, /* name */ -+ "_http._tcp", /* type */ -+ NULL, /* domain */ -+ NULL, /* host */ -+ DNSSDPort, /* port */ -+ "path=/", NULL); -+ if (ret == 0) -+ ret = avahi_entry_group_commit (AvahiWebIFGroup); -+ -+ if (ret != 0) -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Avahi web interface registration failed: %d", ret); -+ } -+#endif /* HAVE_AVAHI */ - } - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - - #ifdef HAVE_LDAP -@@ -2334,13 +2442,15 @@ dnssdAddAlias(const void *key, /* I - K - "Bad Back to My Mac domain in dynamic store!"); - } - # endif /* HAVE_COREFOUNDATION */ -+#endif /* HAVE_DNSSD */ - - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info. - */ - --static char * /* O - TXT record */ -+static cupsd_txt_record_t /* O - TXT record */ - dnssdBuildTxtRecord( - int *txt_len, /* O - TXT record length */ - cupsd_printer_t *p, /* I - Printer information */ -@@ -2379,7 +2489,12 @@ dnssdBuildTxtRecord( - keyvalue[i ][0] = "ty"; - keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown"; - -- snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName); -+ snprintf(admin_hostname, sizeof(admin_hostname), -+ "%s.local" -+#ifdef HAVE_DNSSD -+ "." /* terminating dot no good for Avahi */ -+#endif /* HAVE_DNSSD */ -+ , DNSSDHostName); - httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str), - "http", NULL, admin_hostname, DNSSDPort, "/%s/%s", - (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", -@@ -2462,19 +2577,12 @@ dnssdBuildTxtRecord( - * Then pack them into a proper txt record... - */ - -+#ifdef HAVE_DNSSD - return (dnssdPackTxtRecord(txt_len, keyvalue, i)); --} -- -- --/* -- * 'dnssdComparePrinters()' - Compare the registered names of two printers. -- */ -- --static int /* O - Result of comparison */ --dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */ -- cupsd_printer_t *b)/* I - Second printer */ --{ -- return (_cups_strcasecmp(a->reg_name, b->reg_name)); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ return (avahiPackTxtRecord(keyvalue, i)); -+#endif /* HAVE_AVAHI */ - } - - -@@ -2489,6 +2597,10 @@ dnssdDeregisterPrinter( - { - cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name); - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+ - /* - * Closing the socket deregisters the service - */ -@@ -2524,6 +2636,24 @@ dnssdDeregisterPrinter( - free(p->printer_txt); - p->printer_txt = NULL; - } -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+ if (p->avahi_group) -+ { -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ -+ if (p->ipp_txt) -+ avahi_string_list_free (p->ipp_txt); -+ -+ if (p->printer_txt) -+ avahi_string_list_free (p->printer_txt); -+ -+ p->ipp_txt = p->printer_txt = NULL; -+ } -+#endif /* HAVE_AVAHI */ - - /* - * Remove the printer from the array of DNS-SD printers, then clear the -@@ -2533,8 +2663,10 @@ dnssdDeregisterPrinter( - cupsArrayRemove(DNSSDPrinters, p); - cupsdClearString(&p->reg_name); - } -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - -+#ifdef HAVE_DNSSD - /* - * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the - * TXT record format. -@@ -2644,8 +2776,10 @@ dnssdRegisterCallback( - LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED; - } - } -+#endif /* HAVE_DNSSD */ - - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer - * or update the broadcast contents. -@@ -2654,20 +2788,40 @@ dnssdRegisterCallback( - static void - dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType se; /* dnssd errors */ - char *ipp_txt, /* IPP TXT record buffer */ - *printer_txt, /* LPD TXT record buffer */ -- name[1024], /* Service name */ -- *nameptr; /* Pointer into name */ -+ name[1024]; /* Service name */ - int ipp_len, /* IPP TXT record length */ - printer_len, /* LPD TXT record length */ - printer_port; /* LPD port number */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int ret; /* Error code */ -+ AvahiStringList *ipp_txt, /* IPP TXT record */ -+ *printer_txt; /* LPD TXT record */ -+ char name[AVAHI_LABEL_MAX], /* Service name */ -+ fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */ -+ char *regtype_copy, /* Writeable copy of reg type */ -+ *subtype, /* Current service sub type */ -+ *nextsubtype; /* Next service sub type */ -+#endif /* HAVE_AVAHI */ -+ char *nameptr; /* Pointer into name */ - const char *regtype; /* Registration type */ - - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, - !p->ipp_ref ? "new" : "update"); -- -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, -+ !p->avahi_group ? "new" : "update"); -+#endif /* HAVE_AVAHI */ - /* - * If per-printer sharing was just disabled make sure we're not - * registered before returning. -@@ -2686,12 +2840,36 @@ dnssdRegisterPrinter(cupsd_printer_t *p) - if (p->info && strlen(p->info) > 0) - { - if (DNSSDComputerName) -- snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName); -+ { -+ /* -+ * Make sure there is room for at least 15 characters of -+ * DNSSDComputerName. -+ */ -+ -+ assert(sizeof(name) >= 15 + 4); -+ nameptr = name + strlcpy(name, p->info, -+ sizeof(name) - 4 - -+ strnlen(DNSSDComputerName, 15)); -+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name)); -+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name)); -+ } - else - strlcpy(name, p->info, sizeof(name)); - } - else if (DNSSDComputerName) -- snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName); -+ { -+ /* -+ * Make sure there is room for at least 15 characters of -+ * DNSSDComputerName. -+ */ -+ -+ assert(sizeof(name) >= 15 + 4); -+ nameptr = name + strlcpy(name, p->info, -+ sizeof(name) - 4 - -+ strnlen(DNSSDComputerName, 15)); -+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name)); -+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name)); -+ } - else - strlcpy(name, p->name, sizeof(name)); - -@@ -2712,6 +2890,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p) - * Register IPP and (optionally) LPD... - */ - -+#ifdef HAVE_DNSSD - ipp_len = 0; /* anti-compiler-warning-code */ - ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0); - -@@ -2884,6 +3063,209 @@ dnssdRegisterPrinter(cupsd_printer_t *p) - - if (printer_txt) - free(printer_txt); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!AvahiCupsClient) -+ /* -+ * Client not running yet. The client callback will call us again later. -+ */ -+ return; -+ -+ ipp_txt = dnssdBuildTxtRecord(NULL, p, 0); -+ printer_txt = dnssdBuildTxtRecord(NULL, p, 1); -+ regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType; -+ -+ if (p->avahi_group && p->ipp_txt && ipp_txt && -+ !avahi_string_list_equal (p->ipp_txt, ipp_txt)) -+ { -+ /* -+ * Update the existing registration... -+ */ -+ -+ avahi_string_list_free (p->ipp_txt); -+ -+ if (p->printer_txt) -+ avahi_string_list_free (p->printer_txt); -+ -+ /* -+ * Update the service group entry. -+ */ -+ -+ regtype_copy = strdup (regtype); -+ subtype = strchr (regtype_copy, ','); -+ if (subtype) -+ *subtype = '\0'; -+ -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Updating TXT record for %s (%s)", name, regtype_copy); -+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ regtype_copy, -+ NULL, ipp_txt); -+ free (regtype_copy); -+ -+ if (ret < 0) -+ goto update_failed; -+ -+ p->ipp_txt = ipp_txt; -+ ipp_txt = NULL; -+ -+ if (BrowseLocalProtocols & BROWSE_LPD) -+ { -+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ "_printer._tcp", NULL, -+ printer_txt); -+ if (ret < 0) -+ goto update_failed; -+ -+ p->printer_txt = printer_txt; -+ printer_txt = NULL; -+ } -+ -+ ret = avahi_entry_group_commit (p->avahi_group); -+ if (ret < 0) -+ { -+ update_failed: -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Failed to update TXT record for %s: %d", -+ name, ret); -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ ipp_txt = p->ipp_txt; -+ p->ipp_txt = NULL; -+ } -+ } -+ -+ if (!p->avahi_group) -+ { -+ /* -+ * Initial registration. Use the _fax subtype for fax queues... -+ */ -+ -+ p->avahi_group = avahi_entry_group_new (AvahiCupsClient, -+ avahi_entry_group_cb, -+ p); -+ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "Registering Avahi printer %s with name \"%s\" and " -+ "type \"%s\"", p->name, name, regtype); -+ -+ if (!p->avahi_group) -+ { -+ ret = 0; -+ goto add_failed; -+ } -+ -+ /* -+ * Add each service type (DNSSDRegType may contain several, -+ * separated by commas). -+ */ -+ -+ subtype = regtype_copy = strdup (regtype); -+ while (subtype && *subtype) -+ { -+ nextsubtype = strchr (subtype, ','); -+ if (nextsubtype) -+ *nextsubtype++ = '\0'; -+ -+ if (subtype == regtype_copy) -+ { -+ /* -+ * Main type entry. -+ */ -+ -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Adding TXT record for %s (%s)", name, regtype_copy); -+ ret = avahi_entry_group_add_service_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, regtype_copy, -+ NULL, NULL, -+ DNSSDPort, -+ ipp_txt); -+ } -+ else -+ { -+ /* -+ * Sub-type entry. -+ */ -+ -+ snprintf (fullsubtype, sizeof(fullsubtype), -+ "%s._sub.%s", subtype, regtype_copy); -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Adding TXT record for %s (%s)", name, fullsubtype); -+ ret = avahi_entry_group_add_service_subtype (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ regtype_copy, -+ NULL, fullsubtype); -+ } -+ -+ if (ret < 0) -+ { -+ free (regtype_copy); -+ goto add_failed; -+ } -+ -+ subtype = nextsubtype; -+ } -+ -+ free (regtype_copy); -+ p->ipp_txt = ipp_txt; -+ ipp_txt = NULL; -+ -+ if (BrowseLocalProtocols & BROWSE_LPD) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "Registering Avahi printer %s with name \"%s\" and " -+ "type \"_printer._tcp\"", p->name, name); -+ -+ ret = avahi_entry_group_add_service_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ "_printer._tcp", NULL, NULL, -+ 515, -+ printer_txt); -+ if (ret < 0) -+ goto add_failed; -+ -+ p->printer_txt = printer_txt; -+ printer_txt = NULL; -+ } -+ -+ ret = avahi_entry_group_commit (p->avahi_group); -+ -+ if (ret < 0) -+ { -+ add_failed: -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Failed to add Avahi entry for %s: %d", -+ name, ret); -+ if (p->avahi_group) -+ { -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ } -+ ipp_txt = p->ipp_txt; -+ p->ipp_txt = NULL; -+ } -+ } -+ -+ if (ipp_txt) -+ avahi_string_list_free (ipp_txt); -+ -+ if (printer_txt) -+ avahi_string_list_free (printer_txt); -+#endif /* HAVE_AVAHI */ - } - - -@@ -2896,6 +3278,10 @@ dnssdStop(void) - { - cupsd_printer_t *p; /* Current printer */ - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+#endif /* HAVE_DNSSD */ - - /* - * De-register the individual printers -@@ -2910,12 +3296,23 @@ dnssdStop(void) - * Shutdown the rest of the service refs... - */ - -+#ifdef HAVE_DNSSD - if (WebIFRef) - { - DNSServiceRefDeallocate(WebIFRef); - WebIFRef = NULL; - } -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (AvahiWebIFGroup) -+ { -+ avahi_entry_group_reset (AvahiWebIFGroup); -+ avahi_entry_group_free (AvahiWebIFGroup); -+ AvahiWebIFGroup = NULL; -+ } -+#endif /* HAVE_AVAHI */ - -+#ifdef HAVE_DNSSD - if (RemoteRef) - { - DNSServiceRefDeallocate(RemoteRef); -@@ -2926,14 +3323,17 @@ dnssdStop(void) - - DNSServiceRefDeallocate(DNSSDRef); - DNSSDRef = NULL; -+#endif /* HAVE_DNSSD */ - - cupsArrayDelete(DNSSDPrinters); - DNSSDPrinters = NULL; - - DNSSDPort = 0; - } -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - -+#ifdef HAVE_DNSSD - /* - * 'dnssdUpdate()' - Handle DNS-SD queries. - */ -@@ -2955,6 +3355,153 @@ dnssdUpdate(void) - #endif /* HAVE_DNSSD */ - - -+#ifdef HAVE_AVAHI -+/* -+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an -+ * AvahiStringList. -+ */ -+ -+static AvahiStringList * /* O - new string list */ -+avahiPackTxtRecord(char *keyvalue[][2], /* I - Table of key value pairs */ -+ int count) /* I - Number of items in table */ -+{ -+ AvahiStringList *strlst = NULL; -+ char **elements; -+ size_t len; -+ int i = 0; -+ -+ elements = malloc ((1 + count) * sizeof (char *)); -+ if (!elements) -+ goto cleanup; -+ -+ for (i = 0; i < count; i++) -+ { -+ len = (1 + strlen (keyvalue[i][0]) + -+ (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1)); -+ elements[i] = malloc (len * sizeof (char)); -+ if (!elements[i]) -+ goto cleanup; -+ -+ snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]); -+ } -+ -+ strlst = avahi_string_list_new_from_array ((const char **) elements, count); -+ -+cleanup: -+ while (--i >= 0) -+ free (elements[i]); -+ -+ free (elements); -+ return (strlst); -+} -+ -+ -+/* -+ * 'avahi_entry_group_cb()' - Avahi entry group callback function. -+ */ -+static void -+avahi_entry_group_cb (AvahiEntryGroup *group, -+ AvahiEntryGroupState state, -+ void *userdata) -+{ -+ char *name; -+ -+ if (userdata) -+ name = ((cupsd_printer_t *) userdata)->reg_name; -+ else -+ name = "CUPS web interface"; -+ -+ switch (state) -+ { -+ case AVAHI_ENTRY_GROUP_UNCOMMITED: -+ case AVAHI_ENTRY_GROUP_REGISTERING: -+ break; -+ -+ case AVAHI_ENTRY_GROUP_ESTABLISHED: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Avahi entry group established for %s", name); -+ break; -+ -+ default: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Avahi entry group %s has state %d", -+ name, state); -+ break; -+ } -+} -+ -+ -+/* -+ * 'avahi_client_cb()' - Avahi client callback function. -+ */ -+static void -+avahi_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *userdata) -+{ -+ cupsd_printer_t *printer; -+ switch (state) -+ { -+ case AVAHI_CLIENT_S_RUNNING: -+ /* -+ * Avahi client started successfully. -+ */ -+ AvahiCupsClient = client; -+ AvahiCupsClientConnecting = 0; -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started"); -+ -+ cupsdUpdateDNSSDName (); -+ -+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers); -+ printer; -+ printer = (cupsd_printer_t *)cupsArrayNext(Printers)) -+ if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) && -+ (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT | -+ CUPS_PRINTER_SCANNER))) && printer->shared) -+ dnssdRegisterPrinter (printer); -+ -+ break; -+ -+ case AVAHI_CLIENT_CONNECTING: -+ /* -+ * No Avahi daemon, client is waiting. -+ */ -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting"); -+ break; -+ -+ case AVAHI_CLIENT_S_REGISTERING: -+ /* -+ * Not yet registered. -+ */ -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client registering"); -+ break; -+ -+ case AVAHI_CLIENT_FAILURE: -+ /* -+ * Avahi client failed, close it to allow a clean restart. -+ */ -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Avahi client failed, " -+ "closing client to allow a clean restart"); -+ -+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers); -+ printer; -+ printer = (cupsd_printer_t *)cupsArrayNext(Printers)) -+ dnssdDeregisterPrinter (printer); -+ -+ avahi_client_free(client); -+ AvahiCupsClientConnecting = 0; -+ AvahiCupsClient = NULL; -+ -+ break; -+ -+ default: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state); -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+ - /* - * 'get_auth_info_required()' - Get the auth-info-required value to advertise. - */ -diff -up cups-1.5.2/scheduler/dirsvc.h.avahi-5-services cups-1.5.2/scheduler/dirsvc.h ---- cups-1.5.2/scheduler/dirsvc.h.avahi-5-services 2011-03-21 02:12:14.000000000 +0000 -+++ cups-1.5.2/scheduler/dirsvc.h 2012-03-14 15:08:25.711611808 +0000 -@@ -31,6 +31,10 @@ - # endif /* HAVE_LDAP_SSL_H */ - #endif /* HAVE_LDAP */ - -+#ifdef HAVE_AVAHI -+# include <avahi-client/publish.h> -+#endif /* HAVE_AVAHI */ -+ - /* - * Browse protocols... - */ -@@ -131,19 +135,22 @@ VAR int PollPipe VALUE(0); - VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL); - /* Status buffer for pollers */ - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - VAR char *DNSSDComputerName VALUE(NULL), - /* Computer/server name */ - *DNSSDHostName VALUE(NULL), - /* Hostname */ - *DNSSDRegType VALUE(NULL); - /* Bonjour registration type */ --VAR cups_array_t *DNSSDAlias VALUE(NULL); -- /* List of dynamic ServerAlias's */ - VAR int DNSSDPort VALUE(0); - /* Port number to register */ - VAR cups_array_t *DNSSDPrinters VALUE(NULL); - /* Printers we have registered */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+ -+#ifdef HAVE_DNSSD -+VAR cups_array_t *DNSSDAlias VALUE(NULL); -+ /* List of dynamic ServerAlias's */ - VAR DNSServiceRef DNSSDRef VALUE(NULL), - /* Master DNS-SD service reference */ - WebIFRef VALUE(NULL), -@@ -152,6 +159,17 @@ VAR DNSServiceRef DNSSDRef VALUE(NULL), - /* Remote printer browse reference */ - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+VAR AvahiCupsPoll *AvahiCupsPollHandle VALUE(NULL); -+ /* AvahiCupsPoll object */ -+VAR AvahiClient *AvahiCupsClient VALUE(NULL); -+ /* AvahiClient object */ -+VAR int AvahiCupsClientConnecting VALUE(0); -+ /* Is AvahiClient object connecting? */ -+VAR AvahiEntryGroup *AvahiWebIFGroup VALUE(NULL); -+ /* Web interface entry group */ -+#endif /* HAVE_AVAHI */ -+ - #ifdef HAVE_LIBSLP - VAR SLPHandle BrowseSLPHandle VALUE(NULL); - /* SLP API handle */ -@@ -195,13 +213,14 @@ extern void cupsdRegisterPrinter(cupsd_p - extern void cupsdRestartPolling(void); - extern void cupsdSaveRemoteCache(void); - extern void cupsdSendBrowseList(void); -+extern void cupsdStartAvahiClient(void); - extern void cupsdStartBrowsing(void); - extern void cupsdStartPolling(void); - extern void cupsdStopBrowsing(void); - extern void cupsdStopPolling(void); --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - extern void cupsdUpdateDNSSDName(void); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - #ifdef HAVE_LDAP - extern void cupsdUpdateLDAPBrowse(void); - #endif /* HAVE_LDAP */ -diff -up cups-1.5.2/scheduler/ipp.c.avahi-5-services cups-1.5.2/scheduler/ipp.c ---- cups-1.5.2/scheduler/ipp.c.avahi-5-services 2012-03-14 15:04:17.665305560 +0000 -+++ cups-1.5.2/scheduler/ipp.c 2012-03-14 15:08:25.715611813 +0000 -@@ -6099,7 +6099,7 @@ copy_printer_attrs( - ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time", - ippTimeToDate(curtime)); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if (!ra || cupsArrayFind(ra, "printer-dns-sd-name")) - { - if (printer->reg_name) -@@ -6109,7 +6109,7 @@ copy_printer_attrs( - ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE, - "printer-dns-sd-name", 0); - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - if (!ra || cupsArrayFind(ra, "printer-error-policy")) - ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME, -diff -up cups-1.5.2/scheduler/main.c.avahi-5-services cups-1.5.2/scheduler/main.c ---- cups-1.5.2/scheduler/main.c.avahi-5-services 2012-03-14 15:06:36.511476986 +0000 -+++ cups-1.5.2/scheduler/main.c 2012-03-14 15:08:25.718611817 +0000 -@@ -120,6 +120,10 @@ main(int argc, /* I - Number of comm - cupsd_listener_t *lis; /* Current listener */ - time_t current_time, /* Current time */ - activity, /* Client activity timer */ -+#ifdef HAVE_AVAHI -+ avahi_client_time, /* Time for next Avahi client -+ check */ -+#endif /* HAVE_AVAHI */ - browse_time, /* Next browse send time */ - senddoc_time, /* Send-Document time */ - expire_time, /* Subscription expire time */ -@@ -672,6 +676,9 @@ main(int argc, /* I - Number of comm - */ - - current_time = time(NULL); -+#ifdef HAVE_AVAHI -+ avahi_client_time = current_time; -+#endif /* HAVE_AVAHI */ - browse_time = current_time; - event_time = current_time; - expire_time = current_time; -@@ -894,6 +901,16 @@ main(int argc, /* I - Number of comm - tmo = cupsdNextTimeout (&tmo_delay); - if (tmo && tmo_delay == 0) - cupsdRunTimeout (tmo); -+ -+ /* -+ * Try to restart the Avahi client every 10 seconds if needed... -+ */ -+ -+ if ((current_time - avahi_client_time) >= 10) -+ { -+ avahi_client_time = current_time; -+ cupsdStartAvahiClient(); -+ } - #endif /* HAVE_AVAHI */ - - #ifndef __APPLE__ -diff -up cups-1.5.2/scheduler/printers.c.avahi-5-services cups-1.5.2/scheduler/printers.c ---- cups-1.5.2/scheduler/printers.c.avahi-5-services 2012-03-14 15:04:17.646305537 +0000 -+++ cups-1.5.2/scheduler/printers.c 2012-03-14 15:08:25.720611819 +0000 -@@ -883,9 +883,9 @@ cupsdDeletePrinter( - cupsdClearString(&p->alert); - cupsdClearString(&p->alert_description); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdClearString(&p->pdl); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - cupsArrayDelete(p->filetypes); - -@@ -3787,7 +3787,7 @@ add_printer_formats(cupsd_printer_t *p) - attr->values[i].string.text = _cupsStrAlloc(mimetype); - } - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - { - char pdl[1024]; /* Buffer to build pdl list */ - mime_filter_t *filter; /* MIME filter looping var */ -@@ -3843,7 +3843,7 @@ add_printer_formats(cupsd_printer_t *p) - - cupsdSetString(&p->pdl, pdl); - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -diff -up cups-1.5.2/scheduler/printers.h.avahi-5-services cups-1.5.2/scheduler/printers.h ---- cups-1.5.2/scheduler/printers.h.avahi-5-services 2011-03-18 18:42:46.000000000 +0000 -+++ cups-1.5.2/scheduler/printers.h 2012-03-14 15:08:25.721611820 +0000 -@@ -16,6 +16,9 @@ - #ifdef HAVE_DNSSD - # include <dns_sd.h> - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include "avahi.h" -+#endif /* HAVE_AVAHI */ - #include <cups/pwg-private.h> - - -@@ -95,16 +98,23 @@ struct cupsd_printer_s - time_t marker_time; /* Last time marker attributes were updated */ - _ppd_cache_t *pc; /* PPD cache and mapping data */ - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - char *reg_name, /* Name used for service registration */ -- *pdl, /* pdl value for TXT record */ -- *ipp_txt, /* IPP TXT record contents */ -+ *pdl; /* pdl value for TXT record */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+#ifdef HAVE_DNSSD -+ char *ipp_txt, /* IPP TXT record contents */ - *printer_txt; /* LPD TXT record contents */ - int ipp_len, /* IPP TXT record length */ - printer_len; /* LPD TXT record length */ - DNSServiceRef ipp_ref, /* Reference for _ipp._tcp,_cups */ - printer_ref; /* Reference for _printer._tcp */ - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiStringList *ipp_txt, /* IPP TXT record */ -+ *printer_txt; /* LPD TXT record */ -+ AvahiEntryGroup *avahi_group; /* Avahi entry group */ -+#endif /* HAVE_AVAHI */ - }; - - diff --git a/extra/cups/cups-no-gzip-man.patch.16 b/extra/cups/cups-no-gzip-man.patch.16 deleted file mode 100644 index 69899b9cb..000000000 --- a/extra/cups/cups-no-gzip-man.patch.16 +++ /dev/null @@ -1,18 +0,0 @@ -diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4 ---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man 2011-05-12 07:21:56.000000000 +0200 -+++ cups-1.5b1/config-scripts/cups-manpages.m4 2011-05-23 17:25:50.000000000 +0200 -@@ -69,10 +69,10 @@ case "$uname" in - ;; - Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and OS X -- MAN1EXT=1.gz -- MAN5EXT=5.gz -- MAN7EXT=7.gz -- MAN8EXT=8.gz -+ MAN1EXT=1 -+ MAN5EXT=5 -+ MAN7EXT=7 -+ MAN8EXT=8 - MAN8DIR=8 - ;; - *) diff --git a/extra/cvsps/call-cvs-q-option.patch b/extra/cvsps/call-cvs-q-option.patch deleted file mode 100644 index a754b7c60..000000000 --- a/extra/cvsps/call-cvs-q-option.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 49d7a3e44b54f18b0e2762d8dbb087ad4c2f0276 Mon Sep 17 00:00:00 2001 -From: Yann Dirson <ydirson@altern.org> -Date: Thu, 15 Jun 2006 09:48:08 +0200 -Subject: [PATCH] Call cvs with -q flag when fetching the log - -This gets rid of the neverending output polution cvs sends to stderr, -which is mostly useless and has a strong potential to hide real problem -reports ---- - cvsps.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cvsps.c b/cvsps.c -index d94dfe0..be700ba 100644 ---- a/cvsps.c -+++ b/cvsps.c -@@ -301,12 +301,12 @@ static void load_from_cvs() - * which is necessary to fill in the pre_rev stuff for a - * PatchSetMember - */ -- snprintf(cmd, BUFSIZ, "cvs %s %s %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff); -+ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff); - } - else - { - date_str[0] = 0; -- snprintf(cmd, BUFSIZ, "cvs %s %s %s %s", compress_arg, norc, ltype, use_rep_buff); -+ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s %s", compress_arg, norc, ltype, use_rep_buff); - } - - debug(DEBUG_STATUS, "******* USING CMD %s", cmd); --- -1.6.5.GIT - diff --git a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch deleted file mode 100644 index 2a82cd4e0..000000000 --- a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- cvsps-2.2b1/cvsps.c 2010-09-07 18:13:42.760727491 +0200 -+++ cvsps-2.2b1_/cvsps.c 2010-09-07 18:05:11.083729441 +0200 -@@ -1065,17 +1065,16 @@ static CvsFile * parse_file(const char * - { - CvsFile * retval; - char fn[PATH_MAX]; -- int len = strlen(buff + 10); -+ size_t len = strlen(buff + 10); - char * p; - - /* once a single file has been parsed ok we set this */ - static int path_ok; -- -+ - /* chop the ",v" string and the "LF" */ - len -= 3; - memcpy(fn, buff + 10, len); - fn[len] = 0; -- - if (strncmp(fn, strip_path, strip_path_len) != 0) - { - /* if the very first file fails the strip path, -@@ -1096,10 +1095,10 @@ static CvsFile * parse_file(const char * - - while ((p = strstr(p, repository_path))) - lastp = p++; -- -+ - if (lastp) - { -- int len = strlen(repository_path); -+ size_t len = strlen(repository_path); - memcpy(strip_path, fn, lastp - fn + len + 1); - strip_path_len = lastp - fn + len + 1; - strip_path[strip_path_len] = 0; -@@ -1114,16 +1113,26 @@ static CvsFile * parse_file(const char * - * - * For now just ignore such files - */ -- debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", -+ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", - fn, strip_path); - return NULL; - } - - ok: -- path_ok = 1; -- -+ /* -+ fix for rhbz#576076 -+ ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS -+ */ -+ if(len <= strip_path_len) -+ { -+ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", -+ fn, strip_path); -+ return NULL; -+ } - /* remove from beginning the 'strip_path' string */ - len -= strip_path_len; -+ path_ok = 1; -+ - memmove(fn, fn + strip_path_len, len); - fn[len] = 0; - diff --git a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch deleted file mode 100644 index 03e4e7672..000000000 --- a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch +++ /dev/null @@ -1,133 +0,0 @@ -# From: http://ydirson.free.fr/soft/git/cvsps.git - -commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50 -Author: David D. Kilzer <ddkilzer@kilzer.net> -Date: Mon Jun 20 01:04:34 2005 +0200 - - Dynamically allocate the log buffer to prevent warning messages - - On anoncvs.opensource.apple.com (Apple's anonymous CVS server for - WebKit), some very long log entries were included in CVS. I got tired - of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be - dynamically allocated. - -diff --git i/cache.c w/cache.c -index 4c51cf7..01a8ed3 100644 ---- i/cache.c -+++ w/cache.c -@@ -108,10 +108,19 @@ time_t read_cache() - int tag_flags = 0; - char branchbuff[LOG_STR_MAX] = ""; - int branch_add = 0; -- char logbuff[LOG_STR_MAX] = ""; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - time_t cache_date = -1; - int read_version; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ -+ logbuff[0] = 0; -+ - if (!(fp = cache_open("r"))) - goto out; - -@@ -299,8 +308,19 @@ time_t read_cache() - else - { - /* Make sure we have enough in the buffer */ -- if (strlen(logbuff)+strlen(buff)<LOG_STR_MAX) -- strcat(logbuff, buff); -+ int len = strlen(buff); -+ if (strlen(logbuff) + len >= LOG_STR_MAX) -+ { -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; -+ } -+ strcat(logbuff, buff); - } - break; - case CACHE_NEED_PS_MEMBERS: -@@ -332,6 +352,7 @@ time_t read_cache() - out_close: - fclose(fp); - out: -+ free(logbuff); - return cache_date; - } - -diff --git i/cvsps.c w/cvsps.c -index f0e7d29..db28d7c 100644 ---- i/cvsps.c -+++ w/cvsps.c -@@ -269,7 +269,8 @@ static void load_from_cvs() - PatchSetMember * psm = NULL; - char datebuff[26]; - char authbuff[AUTH_STR_MAX]; -- char logbuff[LOG_STR_MAX + 1]; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - int loglen = 0; - int have_log = 0; - char cmd[BUFSIZ]; -@@ -277,6 +278,12 @@ static void load_from_cvs() - char use_rep_buff[PATH_MAX]; - char * ltype; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ - if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG)) - { - ltype = "rlog"; -@@ -484,25 +491,22 @@ static void load_from_cvs() - */ - if (have_log || !is_revision_metadata(buff)) - { -- /* if the log buffer is full, that's it. -- * -- * Also, read lines (fgets) always have \n in them -- * (unless truncation happens) -- * which we count on. So if truncation happens, -- * be careful to put a \n on. -- * -- * Buffer has LOG_STR_MAX + 1 for room for \0 if -- * necessary -- */ -- if (loglen < LOG_STR_MAX) -+ /* If the log buffer is full, try to reallocate more. */ -+ if (loglen < logbufflen) - { - int len = strlen(buff); - -- if (len >= LOG_STR_MAX - loglen) -+ if (len >= logbufflen - loglen) - { -- debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log"); -- len = LOG_STR_MAX - loglen; -- buff[len - 1] = '\n'; -+ debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename); -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; - } - - debug(DEBUG_STATUS, "appending %s to log", buff); diff --git a/extra/cvsps/cvsps-2.2b1-man.patch b/extra/cvsps/cvsps-2.2b1-man.patch deleted file mode 100644 index 3e6816fd5..000000000 --- a/extra/cvsps/cvsps-2.2b1-man.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up cvsps-2.2b1/cvsps.1~ cvsps-2.2b1/cvsps.1 ---- cvsps-2.2b1/cvsps.1~ 2008-04-02 04:18:44.000000000 +0300 -+++ cvsps-2.2b1/cvsps.1 2010-05-18 21:10:39.000000000 +0300 -@@ -11,7 +11,7 @@ to a collection of files, and all commit - single 'cvs commit' command). This information is valuable to seeing the - big picture of the evolution of a cvs project. While cvs tracks revision - information, it is often difficult to see what changes were committed --'atomically' to the repository. -+\'atomically' to the repository. - .SH OPTIONS - .TP - .B \-h -@@ -83,7 +83,7 @@ some hacks which are not generally appli - disable the use of rlog internally. Note: rlog is - required for stable PatchSet numbering. Use with care. - .TP --.B \-\-diffs\-opts <option string> -+.B \-\-diff\-opts <option string> - send a custom set of options to diff, for example to increase - the number of context lines, or change the diff format. - .TP -@@ -103,6 +103,7 @@ Override the setting of CVSROOT (overrid - .TP - .B \-q - Be quiet about warnings. -+.TP - .B \-A - Show ancestor branch when a new branch is found. - .TP diff --git a/extra/cvsps/cvsps-buffer-overflow.patch b/extra/cvsps/cvsps-buffer-overflow.patch deleted file mode 100644 index e34fd6ee3..000000000 --- a/extra/cvsps/cvsps-buffer-overflow.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur cvsps-3.2.orig/cvsps.c cvsps-3.2/cvsps.c ---- cvsps-3.2.orig/cvsps.c 2012-12-24 19:23:24.000000000 +0000 -+++ cvsps-3.2/cvsps.c 2012-12-27 03:28:24.698076155 +0000 -@@ -1078,17 +1078,16 @@ - static CvsFile * parse_rcs_file(const char * buff) - { - char fn[PATH_MAX]; -- int len = strlen(buff + 10); -+ size_t len = strlen(buff + 10); - char * p; - - /* once a single file has been parsed ok we set this */ - static bool path_ok; -- -+ - /* chop the ",v" string and the "LF" */ - len -= 3; - memcpy(fn, buff + 10, len); - fn[len] = 0; -- - if (strncmp(fn, strip_path, strip_path_len) != 0) - { - /* if the very first file fails the strip path, -@@ -1109,10 +1108,10 @@ - - while ((p = strstr(p, repository_path))) - lastp = p++; -- -+ - if (lastp) - { -- int len = strlen(repository_path); -+ size_t len = strlen(repository_path); - memcpy(strip_path, fn, lastp - fn + len + 1); - strip_path_len = lastp - fn + len + 1; - strip_path[strip_path_len] = 0; -@@ -1136,16 +1135,26 @@ - * - * For now just ignore such files - */ -- debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", -+ debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", - fn, strip_path); - return NULL; - } - - ok: -- path_ok = true; -- -+ /* -+ fix for rhbz#576076 -+ ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS -+ */ -+ if(len <= strip_path_len) -+ { -+ debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", -+ fn, strip_path); -+ return NULL; -+ } - /* remove from beginning the 'strip_path' string */ - len -= strip_path_len; -+ path_ok = true; -+ - memmove(fn, fn + strip_path_len, len); - fn[len] = 0; - diff --git a/extra/cvsps/seperate-CPPFLAGS.patch b/extra/cvsps/seperate-CPPFLAGS.patch deleted file mode 100644 index a29923b49..000000000 --- a/extra/cvsps/seperate-CPPFLAGS.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5991e8b0acf1dbe3487c1f246a1d215b346a61f0 Mon Sep 17 00:00:00 2001 -From: Yann Dirson <ydirson@altern.org> -Date: Sat, 17 Jun 2006 00:03:41 +0200 -Subject: [PATCH] Separate CPPFLAGS from CFLAGS - -This allows to set CGLAGS on command-line without interfering with -preprocessor options ---- - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 2e34ec6..05ca856 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,8 @@ - MAJOR=2 - MINOR=1 - CC?=gcc --CFLAGS?=-g -O2 -Wall --CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\" -+CFLAGS?=-g -O2 -Wall -+CPPFLAGS?=-I. -DVERSION=\"$(MAJOR).$(MINOR)\" - prefix?=/usr/local - OBJS=\ - cbtcommon/debug.o\ --- -1.6.5.GIT - diff --git a/extra/cvsps/use-INADDR_NONE-define.patch b/extra/cvsps/use-INADDR_NONE-define.patch deleted file mode 100644 index a1a529187..000000000 --- a/extra/cvsps/use-INADDR_NONE-define.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c498733b4283b3987bdca6949a5e304244b64cfc Mon Sep 17 00:00:00 2001 -From: Pavel Roskin <proski@gnu.org> -Date: Tue, 13 Jun 2006 00:32:33 -0400 -Subject: [PATCH] Use INADDR_NONE instead of -1 to check inet_addr() result - -INADDR_NONE is not equal to -1 on 64-bit systems. - -Signed-off-by: Pavel Roskin <proski@gnu.org> ---- - cbtcommon/tcpsocket.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c -index a174007..f31060e 100644 ---- a/cbtcommon/tcpsocket.c -+++ b/cbtcommon/tcpsocket.c -@@ -198,7 +198,7 @@ convert_address(long *dest, const char *addr_str) - memcpy(dest, &ip.s_addr, sizeof(ip.s_addr)); - } - #else -- if ( (*dest = inet_addr(addr_str)) != -1) -+ if ( (*dest = inet_addr(addr_str)) != INADDR_NONE) - { - /* nothing */ - } --- -1.6.5.GIT - diff --git a/extra/cvsps/use-__linux__-define.patch b/extra/cvsps/use-__linux__-define.patch deleted file mode 100644 index 132629593..000000000 --- a/extra/cvsps/use-__linux__-define.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4598349e81068d4af9a893c6433958cf9b4fa835 Mon Sep 17 00:00:00 2001 -From: Pavel Roskin <proski@gnu.org> -Date: Tue, 13 Jun 2006 00:32:31 -0400 -Subject: [PATCH] Use __linux__ conditional, not LINUX. - -__linux__ is defined automatically, LINUX is not. - -Signed-off-by: Pavel Roskin <proski@gnu.org> ---- - cbtcommon/tcpsocket.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c -index 27cc13a..a174007 100644 ---- a/cbtcommon/tcpsocket.c -+++ b/cbtcommon/tcpsocket.c -@@ -185,14 +185,14 @@ tcp_connect(int sockfd, const char *rem_addr, unsigned short port) - int - convert_address(long *dest, const char *addr_str) - { --#ifdef LINUX -+#ifdef __linux__ - struct in_addr ip; - #endif - int retval = 0; - char errstr[256]; - - /* first try converting "numbers and dots" notation */ --#ifdef LINUX -+#ifdef __linux__ - if ( inet_aton(addr_str, &ip) ) - { - memcpy(dest, &ip.s_addr, sizeof(ip.s_addr)); --- -1.6.5.GIT - diff --git a/extra/cvsps/use-offsetof-macro.patch b/extra/cvsps/use-offsetof-macro.patch deleted file mode 100644 index ff2961f07..000000000 --- a/extra/cvsps/use-offsetof-macro.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4fad63b82746ea571edc2ec1100ad3208cf5af08 Mon Sep 17 00:00:00 2001 -From: Eric Hopper <hopper@omnifarious.org> -Date: Fri, 29 Jun 2007 01:30:09 -0700 -Subject: [PATCH] Use offsetof macro instead of unportable pointer arithmetic. - ---- - cbtcommon/list.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/cbtcommon/list.h b/cbtcommon/list.h -index 4ee245d..cf4b3ed 100644 ---- a/cbtcommon/list.h -+++ b/cbtcommon/list.h -@@ -23,6 +23,7 @@ - */ - - #include "inline.h" -+#include <stddef.h> - - struct list_head { - struct list_head *next, *prev; -@@ -107,6 +108,6 @@ static INLINE void list_splice(struct list_head *list, struct list_head *head) - } - - #define list_entry(ptr, type, member) \ -- ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) -+ ((type *)((char *)(ptr)-offsetof(type, member))) - - #endif /* _COMMON_LIST_H */ --- -1.6.5.GIT - diff --git a/extra/cx_freeze/FreezePython.sh b/extra/cx_freeze/FreezePython.sh deleted file mode 100644 index 5bba21cac..000000000 --- a/extra/cx_freeze/FreezePython.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd /usr/share/cx-freeze -./FreezePython "$@" diff --git a/extra/cx_freeze/PKGBUILD b/extra/cx_freeze/PKGBUILD deleted file mode 100644 index 538710a6a..000000000 --- a/extra/cx_freeze/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 151178 2012-02-25 07:00:37Z pierre $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Roberto Alsina <ralsina@kde.org> - -pkgname=cx_freeze -_tarname=cx_Freeze -pkgver=4.2.3 -pkgrel=2.1 -pkgdesc="A set of utilities for freezing Python scripts into executables" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.python.net/crew/atuining/cx_Freeze/" -license=('custom') -depends=('python2') -provides=('cxfreeze') -source=("http://downloads.sourceforge.net/cx-freeze/$_tarname-$pkgver.tar.gz" - 'FreezePython.sh') -md5sums=('a524cfd23de5d37e0ec9400ba1ccd6ad' - '5cc60d1644eba12a57c22cc1348a4afd') - -package() { - cd "$srcdir/$_tarname-$pkgver" - - python2 setup.py install --root "$pkgdir/" --optimize 1 - - install -d "$pkgdir"/usr/share/cx-freeze/{bases,initscripts} - install -m755 source/bases/* "$pkgdir/usr/share/cx-freeze/bases" - install -m644 initscripts/* "$pkgdir/usr/share/cx-freeze/initscripts" - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/cx_freeze/COPYING" -} diff --git a/extra/dcfldd/PKGBUILD b/extra/dcfldd/PKGBUILD deleted file mode 100644 index bf1732979..000000000 --- a/extra/dcfldd/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 137724 2011-09-10 14:16:18Z pierre $ -# Contributor: Paul Mattal <pjmattal@elys.com> -# Maintainer: Paul Mattal <pjmattal@elys.com> - -pkgname=dcfldd -pkgver=1.3.4.1 -pkgrel=3.1 -pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing" -arch=('i686' 'x86_64' 'mips64el') -url="http://dcfldd.sourceforge.net/" -license=('GPL') -depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz") -md5sums=('952026c872f11b53ce0ec6681a3eef0a') -sha1sums=('fb1c55f107a6af5ef8703a44d33476e508815913') - -build() { - cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" - make DESTDIR="$pkgdir" install -} diff --git a/extra/dcraw/dcraw.install b/extra/dcraw/dcraw.install deleted file mode 100644 index 26359645a..000000000 --- a/extra/dcraw/dcraw.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - cat << EOF - -NOTE for dcraw: ----- - ==> dcraw provides the simple commandline tools for raw conversion. If you - ==> are looking for a more sophisticated way consider gimp-ufraw, which - ==> provides a gimp-plugin and a standalone application that can even convert - ==> to 16-bit tiff files (which you can use in cinepaint eg.) So please do a - ==> 'pacman -S gimp-ufraw' to get it. - -EOF -} diff --git a/extra/dcraw/license.txt b/extra/dcraw/license.txt deleted file mode 100644 index 5803cf601..000000000 --- a/extra/dcraw/license.txt +++ /dev/null @@ -1,16 +0,0 @@ -This is a command-line ANSI C program to convert raw photos from -any digital camera on any computer running any operating system. - -No license is required to download and use dcraw.c. However, -to lawfully redistribute this code, you must either (a) include -full source code* for all executable files containing RESTRICTED -functions, (b) remove all RESTRICTED functions, re-implement them, -or copy them from an earlier, unrestricted Revision of dcraw.c, -or (c) purchase a license from the author. - -The functions that process Foveon images have been RESTRICTED -since Revision 1.237. All other code remains free for all uses. - -*If you have not modified dcraw.c in any way, a link to my -homepage qualifies as "full source code". - diff --git a/extra/devilspie/PKGBUILD b/extra/devilspie/PKGBUILD deleted file mode 100644 index f6b10f601..000000000 --- a/extra/devilspie/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 150942 2012-02-24 09:37:23Z pierre $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=devilspie -pkgver=0.22 -pkgrel=5.1 -pkgdesc="x11 window matching utility" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.burtonini.com/blog/computers/devilspie" -license=('GPL') -depends=('libwnck') -makedepends=('pkgconfig' 'intltool' 'gnome-common') -source=("http://www.burtonini.com/computing/$pkgname-$pkgver.tar.gz") -md5sums=('4190e12f99ab92c0427e457d9fbfe231') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am - export LIBS="-lX11" - ./autogen.sh - - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - # Make and install blank config - mkdir -p $pkgdir/etc/devilspie - echo '(debug)' > $pkgdir/etc/devilspie/example.ds -} diff --git a/extra/dhcp/ChangeLog b/extra/dhcp/ChangeLog deleted file mode 100644 index 9cffaa9d0..000000000 --- a/extra/dhcp/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ - -2010-07-16 kevin <kevin@archlinux.org> - * dhcp 4.2.0-1 - -2009-07-19 kevin <kevin@archlinux.org> - * dhcp 4.1.0.p1-1 - * Adopted RedHat patch to fix bug where dhcpd won't start if ipv6 module - is not loaded. Fixes FS#12792. - * Added /etc/conf.d/dhcp feature contributed by Fabiano Furtado Pessoa - Coelho <fusca14@gmail.com> - diff --git a/extra/digikam/boost148.patch b/extra/digikam/boost148.patch deleted file mode 100644 index 6d3ff585b..000000000 --- a/extra/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/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch deleted file mode 100644 index 535387b92..000000000 --- a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-03 02:32:41.000000000 +0200 -+++ digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-05 03:18:16.291639995 +0200 -@@ -831,7 +831,7 @@ - { - foreach(T* t, list) - { -- append(AlbumPointer<T>(t)); -+ this->append(AlbumPointer<T>(t)); - } - return *this; - } ---- digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-03 02:32:26.000000000 +0200 -+++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 03:01:56.965609602 +0200 -@@ -1362,7 +1362,7 @@ - template <typename VertexType, typename GraphType> - void discover_vertex(VertexType u, const GraphType&) const - { -- record(u); -+ this->record(u); - } - }; - -@@ -1373,7 +1373,7 @@ - template <typename VertexType, typename GraphType> - void discover_vertex(VertexType u, const GraphType&) const - { -- record(u); -+ this->record(u); - } - }; - ---- digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-03 02:32:04.000000000 +0200 -+++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-05 01:22:34.009352997 +0200 -@@ -30,6 +30,7 @@ - extern "C" - { - #include <utime.h> -+#include <unistd.h> - } - - // C++ includes ---- digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-03 02:31:42.000000000 +0200 -+++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-05 02:35:01.061054821 +0200 -@@ -78,7 +78,7 @@ - public: - WizardPage(KAssistantDialog* dialog, const QString& title) - : QWidget(dialog) { -- setupUi(this); -+ this->setupUi(this); - layout()->setMargin(0); - mPage = dialog->addPage(this, title); - } ---- digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-03 02:31:34.000000000 +0200 -+++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-05 02:17:15.249914790 +0200 -@@ -88,7 +88,7 @@ - WizardPage ( KAssistantDialog* dialog, const QString& title ) - : QWidget ( dialog ) - { -- setupUi ( this ); -+ this->setupUi ( this ); - layout()->setMargin ( 0 ); - mPage = dialog->addPage ( this, title ); - } diff --git a/extra/digikam/libkipi140.patch b/extra/digikam/libkipi140.patch deleted file mode 100644 index a221b5847..000000000 --- a/extra/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/extra/djvulibre/djvulibre.install b/extra/djvulibre/djvulibre.install deleted file mode 100644 index 3e9bb5c49..000000000 --- a/extra/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/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 7bc08e012..94831bda8 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176804 2013-01-31 17:39:45Z andyrtr $ +# $Id: PKGBUILD 177806 2013-02-09 09:15:39Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.1.14 +pkgver=2.1.15 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -23,11 +23,9 @@ provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} - dovecot.sh dovecot.tmpfilesd) -md5sums=('fad7544d7c6d09f9533106e53bfbd243' - 'a6c15d4e1991900dcfb5eb42d0c030d1' - '587159e84e2da6f83d70b3c706ba87cc' +md5sums=('8ce198c5ee22f4fe8ab525b9bd753d56' + 'd8d1bad3cdcaf88644db7dca0e30715e' '342a28251d40f983c98c0d1f1bf3d07d') build() { @@ -70,9 +68,6 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - # install the launch script - install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname - # install example conf files and ssl.conf install -d -m755 ${pkgdir}/etc/dovecot/conf.d install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/dovecot.conf.sample diff --git a/extra/dovecot/dovecot.sh b/extra/dovecot/dovecot.sh deleted file mode 100755 index e8966bd55..000000000 --- a/extra/dovecot/dovecot.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -daemon_name=dovecot - -. /etc/rc.conf -. /etc/rc.d/functions -#. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [[ -z $PID ]]; then - [[ -f /var/run/$daemon_name.pid ]] && - rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name - # - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [[ -n $PID ]] && kill $PID &> /dev/null - # - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD deleted file mode 100644 index e3be37d2f..000000000 --- a/extra/dvdrip/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 143731 2011-11-28 17:39:01Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> - -pkgname=dvdrip -pkgver=0.98.11 -pkgrel=10 -pkgdesc="A Gtk frontend for transcode writen in Perl" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.exit1.org/dvdrip/" -install=${pkgname}.install -depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' - 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') -optdepends=('ogmtools: for ogm/odd video creation' - 'lsdvd: fast reading of DVD table' - 'fping: for cluster support') -source=("http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz" - 'dvdrip.desktop') -options=('!emptydirs' '!makeflags') -md5sums=('6dfa4199d451757a37eea233a07da4c0' - 'e91cf411928fd0500d07a0022b4ef546') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete - - install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/dvdrip/dvdrip.desktop b/extra/dvdrip/dvdrip.desktop deleted file mode 100644 index dd19b4aae..000000000 --- a/extra/dvdrip/dvdrip.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=dvd::rip -Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs -Exec=/usr/bin/vendor_perl/dvdrip -Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm -Terminal=false -Type=Application -Categories=Application;AudioVideo;Video; diff --git a/extra/dvdrip/dvdrip.install b/extra/dvdrip/dvdrip.install deleted file mode 100644 index e111ef946..000000000 --- a/extra/dvdrip/dvdrip.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/efibootmgr/efibootmgr_after_0.5.4_git.patch b/extra/efibootmgr/efibootmgr_after_0.5.4_git.patch deleted file mode 100755 index 5b9b6f825..000000000 --- a/extra/efibootmgr/efibootmgr_after_0.5.4_git.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c -index 5db0d9e..199af39 100644 ---- a/src/efibootmgr/efibootmgr.c -+++ b/src/efibootmgr/efibootmgr.c -@@ -328,6 +328,7 @@ add_to_boot_order(uint16_t num) - /* Now new_data has what we need */ - memcpy(&(boot_order.Data), new_data, new_data_size); - boot_order.DataSize = new_data_size; -+ free(new_data); - return create_or_edit_variable(&boot_order); - } - -diff --git a/src/include/disk.h b/src/include/disk.h -index eb93d10..8aa37d7 100644 ---- a/src/include/disk.h -+++ b/src/include/disk.h -@@ -65,6 +65,9 @@ enum _interface_type {interface_type_unknown, - ata, atapi, scsi, usb, - i1394, fibre, i2o, md}; - -+ -+unsigned int lcm(unsigned int x, unsigned int y); -+ - int disk_get_pci(int fd, - unsigned char *bus, - unsigned char *device, -diff --git a/src/lib/disk.c b/src/lib/disk.c -index 883864f..8ad590b 100644 ---- a/src/lib/disk.c -+++ b/src/lib/disk.c -@@ -55,7 +55,7 @@ disk_info_from_fd(int fd, - return 1; - } - major = buf.st_dev >> 8; -- minor = buf.st_dev && 0xFF; -+ minor = buf.st_dev & 0xFF; - - /* IDE disks can have up to 64 partitions, or 6 bits worth, - * and have one bit for the disk number. -@@ -420,6 +420,27 @@ get_sector_size(int filedes) - return sector_size; - } - -+/************************************************************ -+ * lcm -+ * Requires: -+ * - numbers of which to find the lowest common multiple -+ * Modifies: nothing -+ * Returns: -+ * lowest common multiple of x and y -+ ************************************************************/ -+unsigned int -+lcm(unsigned int x, unsigned int y) -+{ -+ unsigned int m = x, n = y, o; -+ -+ while ((o = m % n)) { -+ m = n; -+ n = o; -+ } -+ -+ return (x / n) * y; -+} -+ - /** - * disk_get_partition_info() - * @fd - open file descriptor to disk -@@ -442,26 +463,27 @@ disk_get_partition_info (int fd, - uint8_t *mbr_type, uint8_t *signature_type) - { - legacy_mbr *mbr; -- void *mbr_unaligned; -+ void *mbr_sector; -+ size_t mbr_size; - off_t offset; - int this_bytes_read = 0; - int gpt_invalid=0, mbr_invalid=0; - int rc=0; - int sector_size = get_sector_size(fd); - -- if (sizeof(*mbr) != sector_size) -- return 1; -- mbr_unaligned = malloc(sizeof(*mbr)+sector_size-1); -- mbr = (legacy_mbr *) -- (((unsigned long)mbr_unaligned + sector_size - 1) & -- ~(unsigned long)(sector_size-1)); -- memset(mbr, 0, sizeof(*mbr)); -+ -+ mbr_size = lcm(sizeof(*mbr), sector_size); -+ if ((rc = posix_memalign(&mbr_sector, sector_size, mbr_size)) != 0) -+ goto error; -+ memset(mbr_sector, '\0', mbr_size); -+ - offset = lseek(fd, 0, SEEK_SET); -- this_bytes_read = read(fd, mbr, sizeof(*mbr)); -+ this_bytes_read = read(fd, mbr_sector, mbr_size); - if (this_bytes_read < sizeof(*mbr)) { - rc=1; - goto error_free_mbr; - } -+ mbr = (legacy_mbr *)mbr_sector; - gpt_invalid = gpt_disk_get_partition_info(fd, num, - start, size, - signature, -@@ -479,7 +501,8 @@ disk_get_partition_info (int fd, - } - } - error_free_mbr: -- free(mbr_unaligned); -+ free(mbr_sector); -+ error: - return rc; - } - -diff --git a/src/lib/gpt.c b/src/lib/gpt.c -index d90ddaf..83e7a94 100644 ---- a/src/lib/gpt.c -+++ b/src/lib/gpt.c -@@ -215,26 +215,24 @@ read_lastoddsector(int fd, uint64_t lba, void *buffer, size_t count) - static ssize_t - read_lba(int fd, uint64_t lba, void *buffer, size_t bytes) - { -- int sector_size = get_sector_size(fd); -- off_t offset = lba * sector_size; -+ int sector_size = get_sector_size(fd); -+ off_t offset = lba * sector_size; - ssize_t bytesread; -- void *aligned; -- void *unaligned; -- -- if (bytes % sector_size) -- return EINVAL; -+ void *iobuf; -+ size_t iobuf_size; -+ int rc; - -- unaligned = malloc(bytes+sector_size-1); -- aligned = (void *) -- (((unsigned long)unaligned + sector_size - 1) & -- ~(unsigned long)(sector_size-1)); -- memset(aligned, 0, bytes); -+ iobuf_size = lcm(bytes, sector_size); -+ rc = posix_memalign(&iobuf, sector_size, iobuf_size); -+ if (rc) -+ return rc; -+ memset(iobuf, 0, bytes); - - -- lseek(fd, offset, SEEK_SET); -- bytesread = read(fd, aligned, bytes); -- memcpy(buffer, aligned, bytesread); -- free(unaligned); -+ lseek(fd, offset, SEEK_SET); -+ bytesread = read(fd, iobuf, iobuf_size); -+ memcpy(buffer, iobuf, bytes); -+ free(iobuf); - - /* Kludge. This is necessary to read/write the last - block of an odd-sized disk, until Linux 2.5.x kernel fixes. diff --git a/extra/efibootmgr/efibootmgr_default_to_grub2.patch b/extra/efibootmgr/efibootmgr_default_to_grub2.patch deleted file mode 100755 index 35207298f..000000000 --- a/extra/efibootmgr/efibootmgr_default_to_grub2.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c -index 199af39..3826e03 100644 ---- a/src/efibootmgr/efibootmgr.c -+++ b/src/efibootmgr/efibootmgr.c -@@ -18,7 +18,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -- This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi -+ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/arch_grub/grubx64.efi - The EFI_DEVICE_PATH will look something like: - ACPI device path, length 12 bytes - Hardware Device Path, PCI, length 6 bytes -@@ -26,7 +26,7 @@ - Media Device Path, Hard Drive, partition XX, length 30 bytes - Media Device Path, File Path, length ?? - End of Hardware Device Path, length 4 -- Arguments passed to elilo, as UCS-2 characters, length ?? -+ Arguments passed to grub2, as UCS-2 characters, length ?? - - */ - -@@ -780,8 +780,8 @@ usage() - printf("\t-g | --gpt force disk with invalid PMBR to be treated as GPT\n"); - printf("\t-H | --acpi_hid XXXX set the ACPI HID (used with -i)\n"); - printf("\t-i | --iface name create a netboot entry for the named interface\n"); -- printf("\t-l | --loader name (defaults to \\elilo.efi)\n"); -- printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n"); -+ printf("\t-l | --loader name (defaults to \\EFI\\arch_grub\\grubx64.efi)\n"); -+ printf("\t-L | --label label Boot manager display label (defaults to \"Arch Linux (GRUB2)\")\n"); - printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); - printf("\t-N | --delete-bootnext delete BootNext\n"); - printf("\t-o | --bootorder XXXX,YYYY,ZZZZ,... explicitly set BootOrder (hex)\n"); -@@ -808,8 +808,8 @@ set_default_opts() - opts.active = -1; /* Don't set it */ - opts.timeout = -1; /* Don't set it */ - opts.edd10_devicenum = 0x80; -- opts.loader = "\\elilo.efi"; -- opts.label = "Linux"; -+ opts.loader = "\\EFI\\arch_grub\\grubx64.efi"; -+ opts.label = "Arch Linux (GRUB2)"; - opts.disk = "/dev/sda"; - opts.iface = NULL; - opts.part = 1; - diff --git a/extra/ekiga/gcc47.patch b/extra/ekiga/gcc47.patch deleted file mode 100644 index f12c37524..000000000 --- a/extra/ekiga/gcc47.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001 -From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> -Date: Sat, 24 Mar 2012 09:17:40 +0000 -Subject: Fix compile error with gcc 4.7 - ---- -diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h -index e16848e..b0a8775 100644 ---- a/lib/engine/account/bank-impl.h -+++ b/lib/engine/account/bank-impl.h -@@ -203,7 +203,7 @@ template<typename AccountType> - void - Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account) - { -- add_object (account); -+ this->add_object (account); - - account->questions.connect (boost::ref (questions)); - } -@@ -213,7 +213,7 @@ template<typename AccountType> - void - Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account) - { -- remove_object (account); -+ this->remove_object (account); - } - - #endif -diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h -index 711d8d9..4fea7d5 100644 ---- a/lib/engine/addressbook/book-impl.h -+++ b/lib/engine/addressbook/book-impl.h -@@ -204,7 +204,7 @@ void - Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact) - { - contact->questions.connect (boost::ref (questions)); -- add_object (contact); -+ this->add_object (contact); - } - - -@@ -212,7 +212,7 @@ template<typename ContactType> - void - Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact) - { -- remove_object (contact); -+ this->remove_object (contact); - } - - #endif -diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h -index a30cd03..630236f 100644 ---- a/lib/engine/addressbook/source-impl.h -+++ b/lib/engine/addressbook/source-impl.h -@@ -206,7 +206,7 @@ template<typename BookType> - void - Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book) - { -- add_object (book); -+ this->add_object (book); - - add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1))); - -diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h -index 245a7c6..92074a8 100644 ---- a/lib/engine/presence/cluster-impl.h -+++ b/lib/engine/presence/cluster-impl.h -@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap) - - add_connection (heap, heap->questions.connect (boost::ref (questions))); - -- add_object (heap); -+ this->add_object (heap); - } - - template<typename HeapType> -diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h -index d63c491..15fe86f 100644 ---- a/lib/engine/presence/heap-impl.h -+++ b/lib/engine/presence/heap-impl.h -@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp - { - presentity->questions.connect (boost::ref (questions)); - -- add_object (presentity); -+ this->add_object (presentity); - } - - template<typename PresentityType> - void - Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity) - { -- remove_object (presentity); -+ this->remove_object (presentity); - } - - #endif --- -cgit v0.9.0.2 diff --git a/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch deleted file mode 100644 index 06dba1ea6..000000000 --- a/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh -index 8aca9e1..d449416 100755 ---- a/tests/run-elflint-self.sh -+++ b/tests/run-elflint-self.sh -@@ -51,4 +51,4 @@ runtest ../libebl/libebl_sh.so - runtest ../libebl/libebl_sparc.so - runtest ../libebl/libebl_x86_64.so - --exit $status -+test $status == 0 || echo "binutils PR ld/13621 workaround" diff --git a/extra/emacs/emacs-23.3-xgselect_init.patch b/extra/emacs/emacs-23.3-xgselect_init.patch deleted file mode 100644 index f3168e0e2..000000000 --- a/extra/emacs/emacs-23.3-xgselect_init.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up emacs-23.3/src/xgselect.c.xgselect_init emacs-23.3/src/xgselect.c ---- emacs-23.3/src/xgselect.c.xgselect_init 2011-01-08 18:45:14.000000000 +0100 -+++ emacs-23.3/src/xgselect.c 2011-11-11 13:00:53.211765255 +0100 -@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti - do { - if (n_gfds > gfds_size) - { -+ if (gfds_size == 0) -+ xgselect_initialize (); -+ - while (n_gfds > gfds_size) - gfds_size *= 2; - xfree (gfds); diff --git a/extra/emacs/emacs-subversion17.patch b/extra/emacs/emacs-subversion17.patch deleted file mode 100644 index e7969de81..000000000 --- a/extra/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/extra/emelfm2/PKGBUILD b/extra/emelfm2/PKGBUILD deleted file mode 100644 index 899956829..000000000 --- a/extra/emelfm2/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 174286 2013-01-03 23:03:36Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: contrasutra - -pkgname=emelfm2 -pkgver=0.8.2 -pkgrel=1 -pkgdesc="A file manager that implements the popular two-pane design" -arch=('i686' 'x86_64' 'mips64el') -url="http://emelfm2.net/" -depends=('gtk2') -license=('GPL3') -source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d4498285ae77f0d524ce9be11d50a0aae9569e5f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX="${pkgdir}/usr" install install_i18n - - install -m 755 "${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png" \ - "${pkgdir}/usr/share/pixmaps/emelfm2.png" - sed -e '/Icon=/ s^emelfm2/emelfm2_48.png^emelfm2.png^' \ - -e '/Categories=/ s^;$^;Application;Utility;^' \ - -i "${pkgdir}/usr/share/applications/emelfm2.desktop" -} diff --git a/extra/evilwm/LICENSE b/extra/evilwm/LICENSE deleted file mode 100644 index 6778ede8c..000000000 --- a/extra/evilwm/LICENSE +++ /dev/null @@ -1,40 +0,0 @@ -LICENCE - -evilwm 1.1 -Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk> - -This is free software. You can do what you want to it, but if it -breaks something, you get to pay for the counselling. The code was -originally based on aewm, so this is distributed under the same terms, -which follow. - - -AEWM LICENCE - -Copyright (c) 1998-2000 Decklin Foster. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS -OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE -HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM. - -You are granted permission to copy, publish, distribute, and/or sell -copies of this program and any modified versions or derived works, -provided that this copyright and notice are not removed or altered. - -Portions of the code were based on 9wm, which contains this license: - -> 9wm is free software, and is Copyright (c) 1994 by David Hogan. -> Permission is granted to all sentient beings to use this software, -> to make copies of it, and to distribute those copies, provided -> that: -> -> (1) the copyright and licence notices are left intact -> (2) the recipients are aware that it is free software -> (3) any unapproved changes in functionality are either -> (i) only distributed as patches -> or (ii) distributed as a new program which is not called 9wm -> and whose documentation gives credit where it is due -> (4) the author is not held responsible for any defects -> or shortcomings in the software, or damages caused by it. -> -> There is no warranty for this software. Have a nice day. diff --git a/extra/evilwm/PKGBUILD b/extra/evilwm/PKGBUILD deleted file mode 100644 index 15425740c..000000000 --- a/extra/evilwm/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136041 2011-08-22 00:36:55Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=evilwm -pkgver=1.1.0 -pkgrel=1.1 -pkgdesc="A minimalist but usable window manager for the X Window System." -arch=('i686' 'x86_64' 'mips64el') -url="http://evilwm.sourceforge.net" -license=('custom') -depends=('libxrandr') -source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('5f14cc3019320860c85bb07c60a76bd7' - '0941ad3e96597ef75c6310f43a0342a0') - -build() { - cd "$srcdir"/$pkgname-$pkgver - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install - install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} diff --git a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch deleted file mode 100644 index a9edca3d7..000000000 --- a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evangelos@foutrelis.com> -Date: Sun, 23 Dec 2012 00:09:34 +0200 -Subject: [PATCH] Drop HAVE_GIO_UNIX ifdef and load gio-unix-2.0 pkg - -This restores exo-open's .desktop file launching functionality. ---- - configure.ac.in | 1 + - exo-open/main.c | 9 --------- - 2 files changed, 1 insertion(+), 9 deletions(-) - -diff --git a/configure.ac.in b/configure.ac.in -index 0c8b3a1..ec9be67 100644 ---- a/configure.ac.in -+++ b/configure.ac -@@ -159,6 +159,7 @@ dnl *** Check for required packages *** - dnl *********************************** - XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) - XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) -+XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0]) - XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) - XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) - XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) -diff --git a/exo-open/main.c b/exo-open/main.c -index 059fad4..da78f6a 100644 ---- a/exo-open/main.c -+++ b/exo-open/main.c -@@ -32,9 +32,7 @@ - - #include <glib/gstdio.h> - #include <gio/gio.h> --#ifdef HAVE_GIO_UNIX - #include <gio/gdesktopappinfo.h> --#endif - #include <exo/exo.h> - - -@@ -143,7 +141,6 @@ usage (void) - static gboolean - exo_open_launch_desktop_file (const gchar *arg) - { --#ifdef HAVE_GIO_UNIX - GFile *gfile; - gchar *contents; - gsize length; -@@ -191,12 +188,6 @@ exo_open_launch_desktop_file (const gchar *arg) - #endif - - return result; --#else /* !HAVE_GIO_UNIX */ -- g_critical (_("Launching desktop files is not supported when %s is compiled " -- "without GIO-Unix features."), g_get_prgname ()); -- -- return FALSE; --#endif - } - - --- -1.8.0.2 - diff --git a/extra/expect/ChangeLog b/extra/expect/ChangeLog deleted file mode 100644 index f0432ba02..000000000 --- a/extra/expect/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -2011-01-01 Allan McRae <allan@archlinux.org> - - * expect 5.45-2 - - Package signing rebuild - -2011-01-01 kevin <kevin@archlinux.org> - - * expect 5.45-1 - - Added upgrade message about expectk being removed - - Have expect conflict with expectk - -2010-03-27 kevin <kevin@archlinux.org> - - * expect 5.44.1.15-1 - - Source on sourceforge now and maintained mostly by ActiveState - - Added symlink to fix FS#18686 - libexpect.so is not found diff --git a/extra/expect/expect.install b/extra/expect/expect.install deleted file mode 100644 index 2847848a1..000000000 --- a/extra/expect/expect.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "`vercmp $2 5.45`" -lt 0 ]; then - echo " - expectk has been removed. Use tclsh instead" - fi -} diff --git a/extra/faac/PKGBUILD b/extra/faac/PKGBUILD deleted file mode 100644 index e56599e5d..000000000 --- a/extra/faac/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 159954 2012-05-27 10:22:19Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=faac -pkgver=1.28 -pkgrel=4 -pkgdesc="An AAC audio encoder" -arch=('i686' 'x86_64') -url="http://www.audiocoding.com/" -license=('GPL' 'custom') -depends=('libmp4v2' 'glibc') -options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'altivec.patch' 'mp4v2-1.9.patch' 'mp4v2-2.0.0.patch') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i ../mp4v2-1.9.patch - patch -p0 -i ../mp4v2-2.0.0.patch - patch -p0 -i ../altivec.patch - find . -type f -print0 | xargs -0 sed -i 's/\r//g' - ./bootstrap - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \ - "${pkgdir}"/usr/share/licenses/faac/LICENSE -} -md5sums=('80763728d392c7d789cde25614c878f6' - 'e1ee422ab524fb1f78d178700c3a0e7f' - '9d52a17e68fa15ca94e88e1457b94b74' - '979ff4f13f36217cb15c92df9fd75f0c') diff --git a/extra/faac/altivec.patch b/extra/faac/altivec.patch deleted file mode 100644 index ae461efc3..000000000 --- a/extra/faac/altivec.patch +++ /dev/null @@ -1,40 +0,0 @@ -http://bugs.gentoo.org/306881 - ---- configure.in -+++ configure.in -@@ -33,7 +33,12 @@ - AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], - AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, - external_mp4v2=no, -lstdc++), -- external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) -+ external_mp4v2=no, [ -+ #if defined(__ALTIVEC__) -+ #undef bool -+ #endif -+ #include <mp4v2/mp4v2.h> -+ ]) - - if test x$external_mp4v2 = xyes; then - AC_MSG_NOTICE([*** Building with external mp4v2 ***]) ---- frontend/main.c -+++ frontend/main.c -@@ -30,6 +30,9 @@ - #endif - - #ifdef HAVE_LIBMP4V2 -+#if defined(__ALTIVEC__) -+# undef bool -+#endif - # include <mp4v2/mp4v2.h> - #endif - ---- common/mp4v2/mpeg4ip.h -+++ common/mp4v2/mpeg4ip.h -@@ -123,7 +123,6 @@ - #ifdef __cplusplus - extern "C" { - #endif --char *strcasestr(const char *haystack, const char *needle); - #ifdef __cplusplus - } - #endif diff --git a/extra/faac/mp4v2-1.9.patch b/extra/faac/mp4v2-1.9.patch deleted file mode 100644 index 54a63347b..000000000 --- a/extra/faac/mp4v2-1.9.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in ---- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200 -+++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +0300 -@@ -28,14 +28,17 @@ - AC_CHECK_LIB(gnugetopt, getopt_long) - - AM_CONDITIONAL(WITH_MP4V2, false) -+AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) - - AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], - AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, - external_mp4v2=no, -lstdc++), -- external_mp4v2=no, [#include <mp4.h>]) -+ external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) - - if test x$external_mp4v2 = xyes; then - AC_MSG_NOTICE([*** Building with external mp4v2 ***]) -+ MY_DEFINE(HAVE_LIBMP4V2) -+ AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) - else - if test x$WITHMP4V2 = xyes; then - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) -diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c ---- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.000000000 +0200 -+++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +0300 -@@ -30,7 +30,7 @@ - #endif - - #ifdef HAVE_LIBMP4V2 --# include <mp4.h> -+# include <mp4v2/mp4v2.h> - #endif - - #define DEFAULT_TNS 0 -diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am ---- faac-1.28.orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200 -+++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +0300 -@@ -8,5 +8,9 @@ - LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ - else - INCLUDES = -I$(top_srcdir)/include -+if WITH_EXTERNAL_MP4V2 -+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2 -+else - LDADD = $(top_builddir)/libfaac/libfaac.la -lm - endif -+endif diff --git a/extra/faac/mp4v2-2.0.0.patch b/extra/faac/mp4v2-2.0.0.patch deleted file mode 100644 index f4ac8e6d4..000000000 --- a/extra/faac/mp4v2-2.0.0.patch +++ /dev/null @@ -1,138 +0,0 @@ -http://bugs.gentoo.org/397575 -http://sourceforge.net/tracker/?func=detail&aid=3476707&group_id=704&atid=100704 - ---- configure.in -+++ configure.in -@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long) - AM_CONDITIONAL(WITH_MP4V2, false) - AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) - --AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], -- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, -+AC_CHECK_DECLS([MP4Create], -+ AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes, - external_mp4v2=no, -lstdc++), - external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) - -@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then - AC_MSG_NOTICE([*** Building with external mp4v2 ***]) - MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2) - AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) -+ AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include <mp4v2/mp4v2.h>]) - else - if test x$WITHMP4V2 = xyes; then - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) ---- frontend/main.c -+++ frontend/main.c -@@ -873,8 +873,12 @@ int main(int argc, char *argv[]) - if (!faacEncSetConfiguration(hEncoder, myFormat)) { - fprintf(stderr, "Unsupported output format!\n"); - #ifdef HAVE_LIBMP4V2 -+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ -+ if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0); -+#else - if (container == MP4_CONTAINER) MP4Close(MP4hFile); - #endif -+#endif - return 1; - } - -@@ -885,12 +889,10 @@ int main(int argc, char *argv[]) - unsigned long ASCLength = 0; - char *version_string; - --#ifdef MP4_CREATE_EXTENSIBLE_FORMAT -- /* hack to compile against libmp4v2 >= 1.0RC3 -- * why is there no version identifier in mp4.h? */ -+#ifdef MP4_DETAILS_ERROR /* r453 fix */ - MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0); - #else -- MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0); -+ MP4hFile = MP4Create(aacFileName, 0); - #endif - if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) { - fprintf(stderr, "Couldn't create output file %s\n", aacFileName); -@@ -905,12 +907,22 @@ int main(int argc, char *argv[]) - free(ASC); - - /* set metadata */ -+#if HAVE_DECL_MP4TAGSALLOC -+ const MP4Tags* tags; -+ tags = MP4TagsAlloc(); -+ MP4TagsFetch( tags, MP4hFile ); -+#endif - version_string = malloc(strlen(faac_id_string) + 6); - strcpy(version_string, "FAAC "); - strcpy(version_string + 5, faac_id_string); -+#if !HAVE_DECL_MP4TAGSALLOC - MP4SetMetadataTool(MP4hFile, version_string); -+#else -+ MP4TagsSetEncodingTool(tags, version_string); -+#endif - free(version_string); - -+#if !HAVE_DECL_MP4TAGSALLOC - if (artist) MP4SetMetadataArtist(MP4hFile, artist); - if (writer) MP4SetMetadataWriter(MP4hFile, writer); - if (title) MP4SetMetadataName(MP4hFile, title); -@@ -923,8 +935,40 @@ int main(int argc, char *argv[]) - if (comment) MP4SetMetadataComment(MP4hFile, comment); - if (artSize) { - MP4SetMetadataCoverArt(MP4hFile, art, artSize); -+#else -+ if (artist) MP4TagsSetArtist(tags, artist); -+ if (writer) MP4TagsSetComposer(tags, writer); -+ if (title) MP4TagsSetName(tags, title); -+ if (album) MP4TagsSetAlbum(tags, album); -+ if (trackno > 0) { -+ MP4TagTrack tt; -+ tt.index = trackno; -+ tt.total = ntracks; -+ MP4TagsSetTrack(tags, &tt); -+ } -+ if (discno > 0) { -+ MP4TagDisk td; -+ td.index = discno; -+ td.total = ndiscs; -+ MP4TagsSetDisk(tags, &td); -+ } -+ if (compilation) MP4TagsSetCompilation(tags, compilation); -+ if (year) MP4TagsSetReleaseDate(tags, year); -+ if (genre) MP4TagsSetGenre(tags, genre); -+ if (comment) MP4TagsSetComments(tags, comment); -+ if (artSize) { -+ MP4TagArtwork mp4art; -+ mp4art.data = art; -+ mp4art.size = artSize; -+ mp4art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2 -+ MP4TagsAddArtwork( tags, &mp4art ); -+#endif - free(art); - } -+#if HAVE_DECL_MP4TAGSALLOC -+ MP4TagsStore( tags, MP4hFile ); -+ MP4TagsFree( tags ); -+#endif - } - else - { -@@ -1141,11 +1185,19 @@ int main(int argc, char *argv[]) - /* clean up */ - if (container == MP4_CONTAINER) - { -+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ -+ MP4Close(MP4hFile, 0); -+#else - MP4Close(MP4hFile); -+#endif - if (optimizeFlag == 1) - { - fprintf(stderr, "\n\nMP4 format optimization... "); -+#ifdef MP4_DETAILS_ERROR /* r453 fix */ - MP4Optimize(aacFileName, NULL, 0); -+#else -+ MP4Optimize(aacFileName, NULL); -+#endif - fprintf(stderr, "Done!"); - } - } else diff --git a/extra/farstream/vp8.patch b/extra/farstream/vp8.patch deleted file mode 100644 index 67009a8ad..000000000 --- a/extra/farstream/vp8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences ---- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100 -+++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100 -@@ -41,6 +41,8 @@ feedback:nack/pli= - [video/H263] - feedback:nack/pli= - -+[video/VP8-DRAFT-IETF-01] -+ - [video/THEORA] - #feedback:tfrc= - feedback:nack/pli= diff --git a/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch deleted file mode 100644 index 37e65b059..000000000 --- a/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libffmpegthumbnailer/moviedecoder.cpp.old 2012-05-20 11:57:04.503450287 +0200 -+++ libffmpegthumbnailer/moviedecoder.cpp 2012-05-20 11:57:14.633450566 +0200 -@@ -58,19 +58,26 @@ - void MovieDecoder::initialize(const string& filename) - { - av_register_all(); -- avcodec_init(); - avcodec_register_all(); - - string inputFile = filename == "-" ? "pipe:" : filename; - m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0); -- -+ -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0) -+#else -+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0) -+#endif - { - destroy(); - throw logic_error(string("Could not open input file: ") + filename); - } - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (av_find_stream_info(m_pFormatContext) < 0) -+#else -+ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0) -+#endif - { - destroy(); - throw logic_error(string("Could not find stream information")); -@@ -90,8 +97,12 @@ - - if ((!m_FormatContextWasGiven) && m_pFormatContext) - { -+#if LIBAVCODEC_VERSION_MAJOR < 53 - av_close_input_file(m_pFormatContext); - m_pFormatContext = NULL; -+#else -+ avformat_close_input(&m_pFormatContext); -+#endif - } - - if (m_pPacket) -@@ -159,7 +170,11 @@ - - m_pVideoCodecContext->workaround_bugs = 1; - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0) -+#else -+ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0) -+#endif - { - throw logic_error("Could not open video codec"); - } diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop deleted file mode 100644 index 79203e5bc..000000000 --- a/extra/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/extra/figlet/PKGBUILD b/extra/figlet/PKGBUILD deleted file mode 100644 index c702dc589..000000000 --- a/extra/figlet/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 160446 2012-06-02 01:31:54Z eric $ -# Maintainer: Eric BĂ©langer <eric@archlinux.org> - -pkgname=figlet -pkgver=2.2.5 -pkgrel=1 -pkgdesc="A program for making large letters out of ordinary text" -arch=('i686' 'x86_64') -url="http://www.figlet.org/" -license=('BSD') -depends=('glibc' 'sh') -source=(ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz) -sha1sums=('dda696958c161bd71d6590152c94c4f705415727') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DEFAULTFONTDIR=/usr/share/figlet/fonts all -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \ - DEFAULTFONTDIR=/usr/share/figlet/fonts install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD deleted file mode 100644 index dde6d1e84..000000000 --- a/extra/file-roller/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 172925 2012-12-06 20:48:57Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=file-roller -pkgver=3.6.3 -pkgrel=1 -pkgdesc="Archive manipulator for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify') -makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'itstool' 'docbook-xsl') -optdepends=('unrar: the RAR uncompression program' - 'zip: creates PKZIP-compatible .zip files' - 'p7zip: 7zip compression utility' - 'arj: ARJ archiver' - 'unace: extraction tool for the proprietary ace archive format') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -install=file-roller.install -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6d99d7be243d442484ba46505df5e52ffb4e46ea5cd754daba865eccc22c8402') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/file-roller \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/extra/file-roller/file-roller.install b/extra/file-roller/file-roller.install deleted file mode 100644 index 8b17fa3d4..000000000 --- a/extra/file-roller/file-roller.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - 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/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD deleted file mode 100644 index fe9da598a..000000000 --- a/extra/firefox/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# $Id: PKGBUILD 172184 2012-12-01 13:09:12Z foutrelis $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Jakub Schmidtke <sjakub@gmail.com> - -pkgname=firefox -pkgver=17.0.1 -pkgrel=1 -pkgdesc="Standalone web browser from mozilla.org" -arch=('i686' 'x86_64') -license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' - 'libnotify' 'desktop-file-utils' 'hicolor-icon-theme' - 'libvpx' 'libevent' 'nss>=3.13.3' 'hunspell' 'sqlite') -makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' - 'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake') -optdepends=('wireless_tools: Location detection via available WiFi networks') -url="http://www.mozilla.org/projects/firefox" -install=firefox.install -options=(!emptydirs) -source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 - mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch) -md5sums=('13d616028eb77de927c29b6655c832c9' - '5644c7b42f51013e2023787938fa955e' - 'eb56667bc1919f2ed93e34bdfc21f7d6' - '150ac0fb3ac7b2114c8e8851a9e0516c' - '0d053487907de4376d67d8f499c5502b' - '52e52f840a49eb1d14be1c0065b03a93') - -build() { - cd mozilla-release - - cp ../mozconfig .mozconfig - patch -Np1 -i ../firefox-install-dir.patch - patch -Np1 -i ../shared-libs.patch - - # Fix PRE_RELEASE_SUFFIX - sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ - browser/base/Makefile.in - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox" - export PYTHON="/usr/bin/python2" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS - - # Enable PGO - export MOZ_PGO=1 - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - - make -f client.mk build || _fail=1 - - kill $! || true - return $_fail -} - -package() { - cd mozilla-release - make -j1 -f client.mk DESTDIR="$pkgdir" install - - install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/defaults/preferences/vendor.js" - - for i in 16 22 24 32 48 256; do - install -Dm644 browser/branding/official/default$i.png \ - "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png" - done - - install -Dm644 ../firefox.desktop \ - "$pkgdir/usr/share/applications/firefox.desktop" - - # Use system-provided dictionaries - rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl} - - #workaround for now - #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" -} diff --git a/extra/firefox/firefox-install-dir.patch b/extra/firefox/firefox-install-dir.patch deleted file mode 100644 index 9c115f0eb..000000000 --- a/extra/firefox/firefox-install-dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk ---- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 -+++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk ---- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 -+++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 -@@ -1,7 +1,7 @@ - INCLUDED_AUTOCONF_MK = 1 - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - ifneq (,$(filter /%,$(TOP_DIST))) - DIST = $(TOP_DIST) diff --git a/extra/firefox/firefox.desktop b/extra/firefox/firefox.desktop deleted file mode 100644 index 45005dc0f..000000000 --- a/extra/firefox/firefox.desktop +++ /dev/null @@ -1,121 +0,0 @@ -[Desktop Entry] -Name=Firefox -Name[bn]=ফায়ারফক্স -Name[eo]=Fajrovulpo -Name[fi]=Firefox -Name[pa]=ਫਾਇਰਫੋਕਸ -Name[tg]=Рӯбоҳи отаŃин -GenericName=Web Browser -GenericName[af]=Web Blaaier -GenericName[ar]=متصŮŘ Ůيب -GenericName[az]=Veb SÉ™yyahı -GenericName[bg]=БраŃĐ·ŃŠŃ€ -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[br]=Furcher ar Gwiad -GenericName[bs]=WWW Preglednik -GenericName[ca]=Fullejador web -GenericName[cs]=WWW prohlĂĹľeÄŤ -GenericName[cy]=Porydd Gwe -GenericName[da]=Browser -GenericName[de]=Web-Browser -GenericName[el]=ΠεĎιηγητής ΙĎτού -GenericName[eo]=TTT-legilo -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fa]=مرŮرگر Ůب -GenericName[fi]=WWW-selain -GenericName[fo]=AlnĂłtsfar -GenericName[fr]=Navigateur web -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן ××™× ××¨× × -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=WebböngĂ©szĹ‘ -GenericName[is]=Vafri -GenericName[it]=Browser Web -GenericName[ja]=ウェă–ă–ă©ă‚¦ă‚¶ -GenericName[ko]=웹 ë¸ŚëťĽěš°ě € -GenericName[lo]=ເວັບບຣາວເຊີ -GenericName[lt]=Ĺ˝iniatinklio naršyklÄ— -GenericName[lv]=Web PÄrlĹ«ks -GenericName[mk]=ПрелиŃŃ‚Ńвач на Đнтернет -GenericName[mn]=Веб-Хөтөч -GenericName[nb]=Nettleser -GenericName[nds]=Nettkieker -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[nso]=Seinyakisi sa Web -GenericName[pa]=ਵŕ©ŕ¨¬ ਝਲਕਾਰਾ -GenericName[pl]=PrzeglÄ…darka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator de web -GenericName[ru]=Веб-браŃзер -GenericName[se]=Fierpmádatlogan -GenericName[sk]=WebovĂ˝ prehliadaÄŤ -GenericName[sl]=Spletni brskalnik -GenericName[sr]=Веб претраживач -GenericName[sr@Latn]=Veb pretraĹľivaÄŤ -GenericName[ss]=Ibrawuza yeWeb -GenericName[sv]=Webbläsare -GenericName[ta]=வல௠உலாவி -GenericName[tg]=ТафŃиргари вэб -GenericName[th]=เว็บบราวเซŕ¸ŕ¸ŁŕąŚ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[uz]=Веб-браŃзер -GenericName[ven]=Buronza ya Webu -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[xh]=Umkhangeli zincwadi we Web -GenericName[zh_CN]=网页浏č§ĺ™¨ -GenericName[zh_TW]=網é 瀏覽器 -GenericName[zu]=Umcingi we-Web -Comment=Browse the World Wide Web -Comment[ar]=تصŮŘ Ř§Ů„Ř´Ř¨ŮŘ© العنŮبŮŘŞŮŠŘ© العالمية -Comment[ast]=Restola pela Rede -Comment[bn]=ইন্টারনেট ব্রাউজ করŕ§ŕ¦¨ -Comment[ca]=Navegueu per la web -Comment[cs]=ProhlĂĹľenĂ stránek World Wide Webu -Comment[da]=Surf pĂĄ internettet -Comment[de]=Im Internet surfen -Comment[el]=ΜποĎείτε να πεĎιηγηθείτε ĎĎ„Îż διαδίκτυο (Web) -Comment[es]=Navegue por la web -Comment[et]=Lehitse veebi -Comment[fa]=صŮŘات شبکه جهانی اینترنت را مرŮر نمایید -Comment[fi]=Selaa Internetin WWW-sivuja -Comment[fr]=Naviguer sur le Web -Comment[gl]=Navegar pola rede -Comment[he]=גלישה ברחבי ×”××™× ××¨× × -Comment[hr]=PretraĹľite web -Comment[hu]=A világhálĂł böngĂ©szĂ©se -Comment[it]=Esplora il web -Comment[ja]=ウェă–を閲覧ă—ăľă™ -Comment[ko]=웹을 돌아 다닙ë‹ë‹¤ -Comment[ku]=Li torĂŞ bigere -Comment[lt]=Naršykite internete -Comment[nb]=Surf pĂĄ nettet -Comment[nl]=Verken het internet -Comment[nn]=Surf pĂĄ nettet -Comment[no]=Surf pĂĄ nettet -Comment[pl]=PrzeglÄ…danie stron WWW -Comment[pt]=Navegue na Internet -Comment[pt_BR]=Navegue na Internet -Comment[ro]=NavigaČ›i pe Internet -Comment[ru]=ДоŃŃ‚ŃĐż в Đнтернет -Comment[sk]=Prehliadanie internetu -Comment[sl]=Brskajte po spletu -Comment[sv]=Surfa pĂĄ webben -Comment[ug]=دۇنيادىŮى ŘŞŮربەتلەرنى Ůۆرگىلى بŮلىدۇ -Comment[uk]=Перегляд Ńторінок Đ†Đ˝Ń‚ĐµŃ€Đ˝ĐµŃ‚Ń -Comment[vi]=Äá» duyệt các trang web -Comment[zh_CN]=浏č§äş’č”网 -Comment[zh_TW]=瀏覽網際網路 -Exec=firefox %u -Icon=firefox -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -StartupNotify=true -Categories=Network;WebBrowser; diff --git a/extra/firefox/firefox.install b/extra/firefox/firefox.install deleted file mode 100644 index 1a1f4b16b..000000000 --- a/extra/firefox/firefox.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/extra/firefox/mozconfig b/extra/firefox/mozconfig deleted file mode 100644 index c13380e32..000000000 --- a/extra/firefox/mozconfig +++ /dev/null @@ -1,38 +0,0 @@ -. $topsrcdir/browser/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-official-branding -ac_add_options --enable-startup-notification -ac_add_options --enable-gio -#ac_add_options --enable-gstreamer - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-installer - -# PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' - -# Needed to enable breakpad in application.ini -export MOZILLA_OFFICIAL=1 diff --git a/extra/firefox/shared-libs.patch b/extra/firefox/shared-libs.patch deleted file mode 100644 index 1f22b2b0d..000000000 --- a/extra/firefox/shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in ---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/extra/firefox/vendor.js b/extra/firefox/vendor.js deleted file mode 100644 index d8d606bc1..000000000 --- a/extra/firefox/vendor.js +++ /dev/null @@ -1,9 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default browser checking. -pref("browser.shell.checkDefaultBrowser", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); diff --git a/extra/flashplugin/PKGBUILD b/extra/flashplugin/PKGBUILD deleted file mode 100644 index 7698203e9..000000000 --- a/extra/flashplugin/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 173213 2012-12-13 12:39:25Z stephane $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=flashplugin -_licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf' -pkgver=11.2.202.258 -pkgrel=1 -pkgdesc='Adobe Flash Player' -url='http://get.adobe.com/flashplayer' -arch=('i686' 'x86_64') -depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme') -optdepends=('libvdpau: GPU acceleration on Nvidia card') -provides=('flashplayer') -license=('custom') -options=(!strip) -install=flashplugin.install -backup=(etc/adobe/mms.cfg) - -if [ "$CARCH" = "i686" ]; then - source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz" - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" - mms.cfg) - md5sums=('ed48f0db80969b1df1e9aab9a9276b8a' - '94ca2aecb409abfe36494d1a7ec7591d' - 'f34aae6279b40e0bd2abfb0d9963d7b8') -elif [ "$CARCH" = "x86_64" ]; then - source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz" - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" - mms.cfg) - md5sums=('999fec504e6d85b1b995264d796d49bf' - '94ca2aecb409abfe36494d1a7ec7591d' - 'f34aae6279b40e0bd2abfb0d9963d7b8') -fi - -package () { - install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so" - if [ "$CARCH" = x86_64 ]; then - install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so" - else - install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so" - fi - install -Dm755 usr/bin/flash-player-properties "$pkgdir/usr/bin/flash-player-properties" - for i in 16x16 22x22 24x24 32x32 48x48; do - install -Dm644 usr/share/icons/hicolor/$i/apps/flash-player-properties.png \ - "$pkgdir/usr/share/icons/hicolor/$i/apps/flash-player-properties.png" - done - install -Dm644 usr/share/applications/flash-player-properties.desktop "$pkgdir/usr/share/applications/flash-player-properties.desktop" - install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "$pkgdir/usr/share/kde4/services/kcm_adobe_flash_player.desktop" - install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf" - install -Dm644 "$srcdir/mms.cfg" "$pkgdir/etc/adobe/mms.cfg" -} diff --git a/extra/flashplugin/flashplugin.install b/extra/flashplugin/flashplugin.install deleted file mode 100644 index 8018fcba2..000000000 --- a/extra/flashplugin/flashplugin.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo " >> " - echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips," - echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg." - echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version." - echo " >> " -} - -post_upgrade() { - if [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then - post_install $1 - fi -} diff --git a/extra/flashplugin/mms.cfg b/extra/flashplugin/mms.cfg deleted file mode 100644 index 716525dd0..000000000 --- a/extra/flashplugin/mms.cfg +++ /dev/null @@ -1,2 +0,0 @@ -#Hardware video decoding -#EnableLinuxHWVideoDecode=1 diff --git a/extra/fluidsynth/fluidsynthd b/extra/fluidsynth/fluidsynthd deleted file mode 100644 index ca1e8fa6e..000000000 --- a/extra/fluidsynth/fluidsynthd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth - -PID=`pidof -o %PPID /usr/bin/fluidsynth` -case "$1" in - start) - stat_busy "Starting Fluidsynth soundfont synthesizer" - [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 & - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/fluidsynth.pid - add_daemon fluidsynth - stat_done - fi - ;; - stop) - stat_busy "Stopping Fluidsynth soundfont synthesizer" - [ ! -z "$PID" ] && kill $PID &> /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/fluidsynth.pid - rm_daemon fluidsynth - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/fontconfig/30-urw-aliases.patch b/extra/fontconfig/30-urw-aliases.patch deleted file mode 100644 index 8077b869e..000000000 --- a/extra/fontconfig/30-urw-aliases.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/conf.d/30-urw-aliases.conf 2009-08-06 16:23:57.000000000 +0100 -+++ b/conf.d/30-urw-aliases.conf 2009-08-06 16:25:07.000000000 +0100 -@@ -29,6 +29,10 @@ - <family>Zapf Dingbats</family> - <accept><family>Dingbats</family></accept> - </alias> -+ <alias binding="same"> -+ <family>ZapfDingbats</family> -+ <accept><family>Dingbats</family></accept> -+ </alias> - <match target="pattern"> - <test name="family"> - <string>Symbol</string> diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD deleted file mode 100644 index a40138ff3..000000000 --- a/extra/foomatic/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 163470 2012-07-12 17:32:05Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase="foomatic" -pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree') -arch=('i686' 'x86_64') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120712 -_filtersver=4.0.17 -_enginever=4.0.8 -pkgver=${_filtersver}_${_snapdate} -pkgrel=1 -epoch=1 -makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') -_url1=http://www.openprinting.org/download/foomatic/ -_url2=ftp://ftp.archlinux.org/other/foomatic/ -source=(${_url1}/$pkgbase-filters-${_filtersver}.tar.gz - ${_url1}/$pkgbase-db-engine-${_enginever}.tar.gz - ${_url2}/$pkgbase-db-4.0-${_snapdate}.tar.gz # switch after build url1 -> url2 - ${_url2}/$pkgbase-db-nonfree-${_snapdate}.tar.gz) # switch after build url1 -> url2 -url="http://www.linuxprinting.org/foomatic.html" -options=('!emptydirs') -md5sums=('b05f5dcbfe359f198eef3df5b283d896' - '5283cd5125a96dc0b35d896326512b1a' - '7ea8ed6c34495e237d8071ab5821e871' - 'da4fbbb3556f56d2f5f922af3face539') - -package_foomatic-db() { - - pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files." -# arch=('any') - license=('GPL' 'custom') - depends=('perl' 'libxml2') - replaces=('foomatic-db-ppd' 'foomatic-db-hpijs') - conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs') - provides=('foomatic-db-hpijs') - - cd ${srcdir}/${pkgname}-${_snapdate} - ./configure --prefix=/usr - make DESTDIR=${pkgdir} install - install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} - -package_foomatic-filters() { - - pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format." -# arch=('i686' 'x86_64') - license=('GPL') - backup=(etc/foomatic/filter.conf) - depends=('glibc' 'dbus-core') - optdepends=('perl: for the "beh" Backend End Handler used by cups' - 'net-snmp: certain (mostly HP) printers need it to work') - - cd ${srcdir}/foomatic-filters-${_filtersver} - ./configure --prefix=/usr --sysconfdir=/etc - make - make DESTDIR=${pkgdir} install -} - -package_foomatic-db-engine() { - - pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs." -# arch=(i686 x86_64) - license=('GPL') - depends=('perl' 'libxml2' 'foomatic-filters' 'bash') - - cd ${srcdir}/foomatic-db-engine-${_enginever} - ./configure --prefix=/usr - make - eval `perl -V:archname` - make DESTDIR=${pkgdir} \ - INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \ - INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \ - INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install - /usr/bin/find ${pkgdir} -name '.packlist' -delete - # fix permissions - chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl} -} - -package_foomatic-db-nonfree() { - - pkgdesc="Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses" -# arch=('any') - license=('custom') - depends=('perl' 'libxml2' "foomatic-db-engine" 'foomatic-db') - - cd ${srcdir}/foomatic-db-nonfree-${_snapdate} - ./configure --prefix=/usr - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/extra/freetype2/bug35833.patch b/extra/freetype2/bug35833.patch deleted file mode 100644 index 69ad25402..000000000 --- a/extra/freetype2/bug35833.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 9a55cb7a71286154cb62e947ed1c183450a8004d Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Wed, 14 Mar 2012 13:40:03 +0000 -Subject: Fix Savannah bug #35833. - -Based on the patch given in the bug report. - -* src/type1/t1load.c (IS_INCREMENTAL): New macro. -(read_binary_data): Add parameter `incremental'. -Update all callers using `IS_INCREMENTAL'. ---- -diff --git a/src/type1/t1load.c b/src/type1/t1load.c -index a0adfd4..4385417 100644 ---- a/src/type1/t1load.c -+++ b/src/type1/t1load.c -@@ -71,6 +71,13 @@ - #include "t1errors.h" - - -+#ifdef FT_CONFIG_OPTION_INCREMENTAL -+#define IS_INCREMENTAL ( face->root.internal->incremental_interface != 0 ) -+#else -+#define IS_INCREMENTAL 0 -+#endif -+ -+ - /*************************************************************************/ - /* */ - /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ -@@ -1030,7 +1037,8 @@ - static int - read_binary_data( T1_Parser parser, - FT_Long* size, -- FT_Byte** base ) -+ FT_Byte** base, -+ FT_Bool incremental ) - { - FT_Byte* cur; - FT_Byte* limit = parser->root.limit; -@@ -1065,8 +1073,12 @@ - } - } - -- FT_ERROR(( "read_binary_data: invalid size field\n" )); -- parser->root.error = T1_Err_Invalid_File_Format; -+ if( !incremental ) -+ { -+ FT_ERROR(( "read_binary_data: invalid size field\n" )); -+ parser->root.error = T1_Err_Invalid_File_Format; -+ } -+ - return 0; - } - -@@ -1396,7 +1408,7 @@ - - idx = T1_ToInt( parser ); - -- if ( !read_binary_data( parser, &size, &base ) ) -+ if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) ) - return; - - /* The binary string is followed by one token, e.g. `NP' */ -@@ -1582,7 +1594,7 @@ - cur++; /* skip `/' */ - len = parser->root.cursor - cur; - -- if ( !read_binary_data( parser, &size, &base ) ) -+ if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) ) - return; - - /* for some non-standard fonts like `Optima' which provides */ -@@ -1871,7 +1883,7 @@ - - - parser->root.cursor = start_binary; -- if ( !read_binary_data( parser, &s, &b ) ) -+ if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) ) - return T1_Err_Invalid_File_Format; - have_integer = 0; - } -@@ -1884,7 +1896,7 @@ - - - parser->root.cursor = start_binary; -- if ( !read_binary_data( parser, &s, &b ) ) -+ if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) ) - return T1_Err_Invalid_File_Format; - have_integer = 0; - } -@@ -2160,9 +2172,7 @@ - type1->subrs_len = loader.subrs.lengths; - } - --#ifdef FT_CONFIG_OPTION_INCREMENTAL -- if ( !face->root.internal->incremental_interface ) --#endif -+ if ( !IS_INCREMENTAL ) - if ( !loader.charstrings.init ) - { - FT_ERROR(( "T1_Open_Face: no `/CharStrings' array in face\n" )); --- -cgit v0.9.0.2 diff --git a/extra/freetype2/bug35847.patch b/extra/freetype2/bug35847.patch deleted file mode 100644 index 683cbc37e..000000000 --- a/extra/freetype2/bug35847.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b43e0f4413b2aafb88be8cb3fb7aaa84ac0b9102 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Sat, 17 Mar 2012 06:42:43 +0000 -Subject: [type1] Fix Savannah bug #35847. - -* src/type1/t1load.c (parse_subrs): Fix the loop exit condition; -we want to exit when we have run out of data. ---- -diff --git a/src/type1/t1load.c b/src/type1/t1load.c -index 4385417..5803fde 100644 ---- a/src/type1/t1load.c -+++ b/src/type1/t1load.c -@@ -1399,9 +1399,10 @@ - FT_Byte* base; - - -- /* If the next token isn't `dup' we are done. */ -- if ( parser->root.cursor + 4 < parser->root.limit && -- ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 ) -+ /* If we are out of data, or if the next token isn't `dup', */ -+ /* we are done. */ -+ if ( parser->root.cursor + 4 >= parser->root.limit || -+ ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 ) - break; - - T1_Skip_PS_Token( parser ); /* `dup' */ --- -cgit v0.9.0.2 diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD index ac9038cbc..58e29e0bf 100644 --- a/extra/fsarchiver/PKGBUILD +++ b/extra/fsarchiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160593 2012-06-02 18:42:56Z eric $ +# $Id: PKGBUILD 177799 2013-02-09 02:58:49Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=fsarchiver -pkgver=0.6.15 +pkgver=0.6.16 pkgrel=1 pkgdesc="A safe and flexible file-system backup and deployment tool" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://www.fsarchiver.org/" license=('GPL2') depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('f55a9022ab692c394b366161c52db0700956e0b2') +sha1sums=('2844a2c8c08181148ee5e05d03b781030b2b67f4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fssos-nsvs/PKGBUILD b/extra/fssos-nsvs/PKGBUILD deleted file mode 100644 index 8ead4af7b..000000000 --- a/extra/fssos-nsvs/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 167367 2012-10-01 15:08:26Z tomegun $ -# Maintainer: Dale Blount <dale@archlinux.org> - -pkgname=fssos-nsvs -pkgver=0.5 -pkgrel=9 -pkgdesc="NSVS for FSSOS" -arch=('i686' 'x86_64' 'mips64el') -url="http://fssos.sourceforge.net/" -license=('GPL') -depends=('bash' 'mysql') -backup=('etc/nsvsd.conf') -options=('!libtool' '!makeflags') -install=$pkgname.install -source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz" - 'nsvsd' - 'nsvsd.service') - -build() { - cd $srcdir/nsvs-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc - make CFLAGS="${CFLAGS} -D_GNU_SOURCE" -} - -package() { - cd $srcdir/nsvs-$pkgver - make DESTDIR=$pkgdir install - install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd" - install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service" -} -md5sums=('3f17c2f6339f1a322b712b467023d825' - '4dfd9dc0d69b375587e39ab2621d9ea9' - '61e970d0704875b1da83cb4e9fc0eef5') diff --git a/extra/fssos-nsvs/fssos-nsvs.install b/extra/fssos-nsvs/fssos-nsvs.install deleted file mode 100644 index 253ae64d2..000000000 --- a/extra/fssos-nsvs/fssos-nsvs.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - if [ -z "`grep '^nsvsd::' /etc/group`" ]; then - groupadd -g 83 nsvsd - fi - if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then - useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - userdel nsvsd &> /dev/null - groupdel nsvsd &> /dev/null -} diff --git a/extra/fssos-nsvs/nsvsd b/extra/fssos-nsvs/nsvsd deleted file mode 100755 index f9b4845ab..000000000 --- a/extra/fssos-nsvs/nsvsd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting nsvsd" - /usr/sbin/nsvsd -f /etc/nsvsd.conf - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nsvsd - stat_done - fi - ;; - stop) - stat_busy "Stopping nsvsd" - kill `cat /var/run/nsvsd.pid` &>/dev/null - rm -f /var/run/nsvsd.pid - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nsvsd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/fssos-nsvs/nsvsd.service b/extra/fssos-nsvs/nsvsd.service deleted file mode 100644 index 0df5444ab..000000000 --- a/extra/fssos-nsvs/nsvsd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Name Service Via Sockets Daemon - -[Service] -ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf - -[Install] -WantedBy=multi-user.target diff --git a/extra/gdm/gdm b/extra/gdm/gdm deleted file mode 100755 index c3e635a6d..000000000 --- a/extra/gdm/gdm +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting GDM" - /usr/sbin/gdm & - if [ $? -gt 0 ]; then - stat_fail - else - - add_daemon gdm - stat_done - fi - ;; - stop) - stat_busy "Stopping GDM" - [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gdm - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/gdm/gdm-autologin.pam b/extra/gdm/gdm-autologin.pam deleted file mode 100644 index bc0193df0..000000000 --- a/extra/gdm/gdm-autologin.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_permit.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/extra/gdm/gdm-fingerprint.pam b/extra/gdm/gdm-fingerprint.pam deleted file mode 100644 index 38fab5782..000000000 --- a/extra/gdm/gdm-fingerprint.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_fprintd.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam deleted file mode 100644 index eed5e1003..000000000 --- a/extra/gdm/gdm-password.pam +++ /dev/null @@ -1,22 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_unix.so nullok -auth optional pam_gnome_keyring.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_unix.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start diff --git a/extra/gdm/gdm-smartcard.pam b/extra/gdm/gdm-smartcard.pam deleted file mode 100644 index c5c29e73f..000000000 --- a/extra/gdm/gdm-smartcard.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_pkcs11.so wait_for_card card_only - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_access.so -account required pam_time.so -account required pam_unix.so - -password required pam_pkcs11.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/extra/gdm/gdm-vt-allocation-hack.patch b/extra/gdm/gdm-vt-allocation-hack.patch deleted file mode 100644 index 56fa5a151..000000000 --- a/extra/gdm/gdm-vt-allocation-hack.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 39def47..03488fd 100644 ---- a/daemon/gdm-server.c -+++ b/daemon/gdm-server.c -@@ -33,6 +33,8 @@ - #include <grp.h> - #include <signal.h> - #include <sys/resource.h> -+#include <sys/ioctl.h> -+#include <sys/vt.h> - - #include <glib.h> - #include <glib/gi18n.h> -@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) - return out; - } - -+#ifndef O_NOCTTY -+# define O_NOCTTY 0 -+#endif -+ -+static int -+open_vt (int vtno) -+{ -+ char *vtname; -+ int fd; -+ -+ vtname = g_strdup_printf ("/dev/tty%d", vtno); -+ -+ do { -+ errno = 0; -+ fd = open (vtname, O_RDWR | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ g_free (vtname); -+ return fd; -+} -+ -+static gint -+find_first_probably_free_vt (void) -+{ -+ int fd, fdv; -+ int vtno; -+ unsigned short vtmask; -+ struct vt_stat vtstat; -+ guint v_state; -+ -+ fdv = -1; -+ -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { -+ v_state = vtstat.v_state; -+ } else { -+ close (fd); -+ v_state = 0; -+ fd = -1; -+ } -+ } else { -+ v_state = 0; -+ } -+ -+ if (fd < 0) { -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) -+ v_state = vtstat.v_state; -+ } -+ } -+ -+ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { -+ /* Is this console in use? */ -+ if (v_state & vtmask) -+ continue; -+ -+ /* No, try to open it */ -+ fdv = open_vt (vtno); -+ if (fdv >= 0) -+ break; -+ -+ /* If we're here, kernel indicated that the console was free, -+ * but we failed to open it. Just go on to higher VTs. */ -+ } -+ -+ if (fdv >= 0) -+ close (fdv); -+ else -+ vtno = -1; -+ -+ if (fd >= 0) -+ close (fd); -+ -+ return vtno; -+} -+ - char * - gdm_server_get_display_device (GdmServer *server) - { -@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, - - if (vtarg != NULL && ! gotvtarg) { - argv[len++] = g_strdup (vtarg); -+ } else if (!query_in_arglist && !gotvtarg) { -+ gint vtnum = find_first_probably_free_vt (); -+ -+ if (vtnum > 0) -+ argv [len++] = g_strdup_printf ("vt%d", vtnum); - } - - argv[len++] = NULL; diff --git a/extra/gdm/gdm-welcome.pam b/extra/gdm/gdm-welcome.pam deleted file mode 100644 index cc3811c19..000000000 --- a/extra/gdm/gdm-welcome.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so - -account required pam_nologin.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke diff --git a/extra/gdm/gdm.pam b/extra/gdm/gdm.pam deleted file mode 100644 index 655299cb7..000000000 --- a/extra/gdm/gdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -auth optional pam_gnome_keyring.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -password required pam_unix.so diff --git a/extra/gdm/gdm.service b/extra/gdm/gdm.service deleted file mode 100644 index 0125934d6..000000000 --- a/extra/gdm/gdm.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Gnome Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/gdm -nodaemon -Restart=always - -[Install] -Alias=display-manager.service diff --git a/extra/ghc/silence-gen_contents_index.diff b/extra/ghc/silence-gen_contents_index.diff deleted file mode 100644 index 6d835f8fb..000000000 --- a/extra/ghc/silence-gen_contents_index.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ghc-7.4.2/libraries/gen_contents_index.original 2012-06-10 22:23:28.810059378 +0000 -+++ ghc-7.4.2/libraries/gen_contents_index 2012-06-10 22:24:00.289814576 +0000 -@@ -47,7 +47,6 @@ - esac - - # Now create the combined contents and index pages --echo $HADDOCK_ARGS - $HADDOCK --gen-index --gen-contents -o . \ - -t "Haskell Hierarchical Libraries" \ - -p "prologue.txt" \ diff --git a/extra/ghostscript/PKGBUILD b/extra/ghostscript/PKGBUILD deleted file mode 100644 index 959fc1186..000000000 --- a/extra/ghostscript/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 165016 2012-08-08 19:40:49Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgname=ghostscript -pkgver=9.06 -pkgrel=1 -pkgdesc="An interpreter for the PostScript language" -arch=('i686' 'x86_64') -license=('GPL3' 'custom') -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? -makedepends=('gtk2' 'gnutls') -optdepends=('texlive-core: needed for dvipdf' - 'gtk2: needed for gsx') -url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) -options=('!libtool' '!makeflags') -md5sums=('46f9ebe40dc52755287b30704270db11') - -build() { - cd ${srcdir}/ghostscript-${pkgver} - - # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff lcms freetype - - ./configure --prefix=/usr \ - --enable-dynamic \ - --with-ijs \ - --with-jbig2dec \ - --with-omni \ - --with-x \ - --with-drivers=ALL\ - --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --with-install-cups \ - --enable-fontconfig \ - --enable-freetype \ - --without-luratech \ - --with-system-libtiff \ - --disable-compile-inits #--help # needed for linking with system-zlib - make - - # Build IJS - cd ${srcdir}/ghostscript-${pkgver}/ijs - ./autogen.sh - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ${srcdir}/ghostscript-${pkgver} - make DESTDIR=${pkgdir} \ - cups_serverroot=${pkgdir}/etc/cups \ - cups_serverbin=${pkgdir}/usr/lib/cups install soinstall - - # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/ - - mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ - - # remove unwanted localized man-pages - rm -rf $pkgdir/usr/share/man/[^man1]* - - # install IJS - cd ${srcdir}/ghostscript-${pkgver}/ijs - make DESTDIR=${pkgdir} install -} diff --git a/extra/ghostscript/svn_rev11948.diff b/extra/ghostscript/svn_rev11948.diff deleted file mode 100644 index 92abb0d98..000000000 --- a/extra/ghostscript/svn_rev11948.diff +++ /dev/null @@ -1,16 +0,0 @@ -Modified: trunk/gs/base/gximag3x.c -=================================================================== ---- trunk/gs/base/gximag3x.c 2010-12-10 19:50:53 UTC (rev 11947) -+++ trunk/gs/base/gximag3x.c 2010-12-11 23:02:25 UTC (rev 11948) -@@ -241,7 +241,9 @@ - const gs_image3x_mask_t *pixm = - (i == 0 ? &pim->Opacity : &pim->Shape); - -- *(gs_data_image_t *)&mask[i].image = pixm->MaskDict; -+ /* Use memcpy because direct assignment breaks ANSI aliasing */ -+ /* rules and causes SEGV with gcc 4.5.1 */ -+ memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict)); - mask[i].image.type = type1; - mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent; - } - diff --git a/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD deleted file mode 100644 index 478388e45..000000000 --- a/extra/gimp-dbp/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 148736 2012-02-05 11:48:41Z ibiru $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gimp-dbp -pkgver=1.1.9 -pkgrel=3.1 -pkgdesc="David's batch processor for the GIMP" -arch=(i686 x86_64 'mips64el') -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/extra/gimp-gap/PKGBUILD b/extra/gimp-gap/PKGBUILD deleted file mode 100644 index 2662f85ba..000000000 --- a/extra/gimp-gap/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 138172 2011-09-18 06:56:19Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gimp-gap -pkgver=2.6.0 -pkgrel=3.2 -pkgdesc="A Plug-In collection to edit and create animations for the Gimp" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.gimp.org/downloads/" -depends=('gimp' 'xvidcore' 'bash' 'libjpeg') -makedepends=('intltool') -options=('!makeflags') -source=(ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/$pkgname-$pkgver.tar.bz2) -md5sums=('249ed829de8b78675c0fe4ef4212089f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - [ "$CARCH" != "i686" ] && CFLAGS+=" -fPIC" - sed -ri 's/^gap_(plugins|morph)_LDADD .+$/& -lm/' gap/Makefile.in - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/extra/gimp-ufraw/PKGBUILD b/extra/gimp-ufraw/PKGBUILD deleted file mode 100644 index 2880e7ba7..000000000 --- a/extra/gimp-ufraw/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 164834 2012-08-06 23:07:20Z andrea $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> - -pkgname=gimp-ufraw -pkgver=0.18 -pkgrel=5 -pkgdesc="Standalone or gimp plugin converter for raw files" -url="http://ufraw.sourceforge.net/" -arch=('i686' 'x86_64' 'mips64el') -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/extra/gimp-ufraw/gimp-ufraw.install b/extra/gimp-ufraw/gimp-ufraw.install deleted file mode 100644 index 80312d4a6..000000000 --- a/extra/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/extra/git/ChangeLog b/extra/git/ChangeLog deleted file mode 100644 index f0c15233e..000000000 --- a/extra/git/ChangeLog +++ /dev/null @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee <dan@archlinux.org> - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee <dan@archlinux.org> - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee <dan@archlinux.org> - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee <dan@archlinux.org> - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae <allan@archlinux.org> - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee <dan@archlinux.org> - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee <dan@archlinux.org> - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee <dan@archlinux.org> - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee <dan@archlinux.org> - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee <dan@archlinux.org> - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche <kevin@archlinux.org> - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger <eric@archlinux.org> - Version 1.5.3.5-2 - * Fix Perl module location diff --git a/extra/git/fix-git-build-python.patch b/extra/git/fix-git-build-python.patch deleted file mode 100644 index 11618a49a..000000000 --- a/extra/git/fix-git-build-python.patch +++ /dev/null @@ -1,109 +0,0 @@ -Date: Wed, 2 Jan 2013 03:59:35 -0500
-From: Jeff King <peff@peff.net>
-To: Junio C Hamano <gitster@pobox.com>
-Cc: Dan McGee <dan@archlinux.org>, GIT Mailing-list <git@vger.kernel.org>,
- Florian Achleitner <florian.achleitner.2.6.31@gmail.com>,
- David Michael Barr <b@rr-dav.id.au>,
- "Eric S. Raymond" <esr@thyrsus.com>
-Subject: Re: Test failures with python versions when building git 1.8.1
-Message-ID: <20130102085935.GB9328@sigill.intra.peff.net>
-References: <CAEik5nOqge8ix4WGf-h+0Dmz1CanH_XtQdB-CxvPsggSu1-LzQ@mail.gmail.com>
- <7va9ss5fhq.fsf@alter.siamese.dyndns.org>
- <20130102065345.GA8685@sigill.intra.peff.net>
- <7v1ue459yh.fsf@alter.siamese.dyndns.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Disposition: inline
-In-Reply-To: <7v1ue459yh.fsf@alter.siamese.dyndns.org>
-
-On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
-
-> Jeff King <peff@peff.net> writes:
->
-> > [1] This symlink is doubly wrong, because any use of symbolic links
-> > in the test scripts needs to depend on the SYMLINKS prereq, and this
-> > does not.
->
-> Yeah, I think we have discussed this once already in
->
-> http://thread.gmane.org/gmane.comp.version-control.git/210688/focus=210714
-
-Thanks for the pointer; it looks like nothing productive came of the
-earlier discussion. To give a hat trick of failure to this line of code,
-I notice that the existing code also does not properly put quotes around
-$GIT_BUILD_DIR.
-
-> > [2] In both the current code and what I showed above, the test scripts
-> > depend on things in contrib/. This is probably a bad idea in
-> > general, as the quality of what goes into contrib is not as closely
-> > watched (especially with respect to things like portability).
-> > Certainly I would not have known to look more carefully at a patch
-> > to contrib/svn-fe for breakage to the test suite.
->
-> As long as such tests are made skippable with appropriate
-> prerequisites, I do not think it is bad to have their tests in t/; I
-> would say it is rather better than having them in contrib/ and leave
-> it not run by anybody, which happened to some of the stuff in
-> contrib/ already.
-
-Good point. While my sense of decorum wants to keep contrib totally
-split out, from a practical point of view, it is better to have more
-people run the tests and report failures than not.
-
-Whether we end up doing something with contrib and tests or not, the
-patch below gives a minimal fix in the meantime. Dan, does it fix your
-problem?
-
--- >8 --
-Subject: [PATCH] t9020: don't run python from $PATH
-
-In t9020, we symlink in a python script from contrib to help
-with the testing. However, we don't munge its #!-line, which
-means we may run the wrong python (we want the one in
-PYTHON_PATH). On top of this, we use a symlink without
-checking the SYMLINKS prereq, and we fail to properly quote
-GIT_BUILD_DIR, which may have spaces.
-
-Instead of symlinking, let's just write a small script which
-will feed the contrib script to PYTHON_PATH. To avoid
-quoting issues, we just export the variables the script
-needs to run.
-
-Signed-off-by: Jeff King <peff@peff.net>
----
- t/t9020-remote-svn.sh | 5 ++++-
- t/test-lib.sh | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
-index 4f2dfe0..416623b 100755
---- a/t/t9020-remote-svn.sh
-+++ b/t/t9020-remote-svn.sh
-@@ -14,7 +14,10 @@ export PATH="$HOME:$PATH"
-
- # We override svnrdump by placing a symlink to the svnrdump-emulator in .
- export PATH="$HOME:$PATH"
--ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
-+export GIT_BUILD_DIR
-+write_script svnrdump <<\EOF
-+exec "$PYTHON_PATH" "$GIT_BUILD_DIR"/contrib/svn-fe/svnrdump_sim.py "$@"
-+EOF
-
- init_git () {
- rm -fr .git &&
-diff --git a/t/test-lib.sh b/t/test-lib.sh
-index f50f834..c17db19 100644
---- a/t/test-lib.sh
-+++ b/t/test-lib.sh
-@@ -45,7 +45,7 @@ fi
- fi
-
- . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
--export PERL_PATH SHELL_PATH
-+export PERL_PATH SHELL_PATH PYTHON_PATH
-
- # if --tee was passed, write the output not only to the terminal, but
- # additionally to the file test-results/$BASENAME.out, too.
---
-1.8.1.rc3.4.gf3a2f57
-
diff --git a/extra/gmpc/PKGBUILD b/extra/gmpc/PKGBUILD deleted file mode 100644 index 284c69467..000000000 --- a/extra/gmpc/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136735 2011-08-31 19:33:21Z eric $ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Kieslich <tobias@archlinux.org> - -pkgname=gmpc -pkgver=11.8.16 -pkgrel=1.1 -pkgdesc="A GTK2 client for MPD" -arch=('i686' 'x86_64' 'mips64el') -url="http://gmpclient.org/home" -license=('GPL') -depends=('libunique' 'libmpd' 'libsoup' 'sqlite3' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('gob2' 'intltool' 'vala') -options=('!libtool') -install=gmpc.install -source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) -md5sums=('223aeb000e41697d8fdf54ccedee89d5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' data/gmpc.desktop.in - sed -ri 's/(^gmpc_LDADD.*)/\1 -lm/' src/Makefile.in - ./configure --prefix=/usr LDADD="-lm" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/gmpc/gmpc.install b/extra/gmpc/gmpc.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/gmpc/gmpc.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/gnome-control-center/systemd-fallback.patch b/extra/gnome-control-center/systemd-fallback.patch deleted file mode 100644 index 709e54019..000000000 --- a/extra/gnome-control-center/systemd-fallback.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit 9873a7536844f5c38c2a123be58175c2774e5dcc -Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -Date: Mon Mar 12 01:12:11 2012 +0100 - - Fallback to CK if systemd is not available - - Be nice to distributions where systemd is optional. This will select - the code path at runtime depending on whether the system was booted - using systemd. - -diff --git a/configure.ac b/configure.ac -index aee97ac..867f061 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd], - [with_systemd=$enableval], - [with_systemd=no]) - if test "$with_systemd" = "yes" ; then -- SYSTEMD=libsystemd-login -+ SYSTEMD="libsystemd-login libsystemd-daemon" - AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available]) - else - SYSTEMD= -diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c -index f027754..5ebbe29 100644 ---- a/panels/user-accounts/um-user.c -+++ b/panels/user-accounts/um-user.c -@@ -37,6 +37,11 @@ - - #include <gio/gunixoutputstream.h> - -+#ifdef HAVE_SYSTEMD -+# include <systemd/sd-login.h> -+# include <systemd/sd-daemon.h> -+#endif -+ - #include "um-user.h" - #include "um-account-type.h" - #include "um-utils.h" -@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user, - } - } - --#ifdef HAVE_SYSTEMD -- --#include <systemd/sd-login.h> -- - gboolean - um_user_is_logged_in (UmUser *user) - { -- int n_sessions; -- -- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0; -- -- return n_sessions > 0; --} -+#ifdef HAVE_SYSTEMD -+ if (sd_booted () > 0) { -+ int n_sessions; - --#else -+ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL); - --gboolean --um_user_is_logged_in (UmUser *user) --{ -+ return n_sessions > 0; -+ } -+#endif - GVariant *result; - GVariantIter *iter; - gint n_sessions; -@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user) - return n_sessions > 0; - } - --#endif -- - void - um_user_set_automatic_login (UmUser *user, - gboolean enabled) diff --git a/extra/gnome-keyring/gpg-agent-fix-encoding.patch b/extra/gnome-keyring/gpg-agent-fix-encoding.patch deleted file mode 100644 index e6a7412b3..000000000 --- a/extra/gnome-keyring/gpg-agent-fix-encoding.patch +++ /dev/null @@ -1,86 +0,0 @@ -From d31a26df7ce8d9c084b9c66fe00458683dde9864 Mon Sep 17 00:00:00 2001 -From: Stef Walter <stefw@gnome.org> -Date: Thu, 28 Jun 2012 15:51:54 +0200 -Subject: [PATCH] gpg-agent: Encode passwords when --data was requested - - * Use URI encoding to return passwords when gnupg calls us with - a --data argument. - -https://bugzilla.gnome.org/show_bug.cgi?id=678771 ---- - daemon/gpg-agent/gkd-gpg-agent-ops.c | 41 ++++++++++++++++++++++++++++++---- - 1 file changed, 37 insertions(+), 4 deletions(-) - -diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c -index be6c4d3..a1a21ff 100644 ---- a/daemon/gpg-agent/gkd-gpg-agent-ops.c -+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c -@@ -632,11 +632,12 @@ command_has_option (gchar *command, gchar *option) - return has_option; - } - -+static const char HEXC[] = "0123456789abcdef"; -+ - /* Encode a password in hex */ - static gchar* --encode_password (const gchar *pass) -+hex_encode_password (const gchar *pass) - { -- static const char HEXC[] = "0123456789abcdef"; - int j, c; - gchar *enc, *k; - -@@ -656,6 +657,36 @@ encode_password (const gchar *pass) - return enc; - } - -+static gchar* -+uri_encode_password (const gchar *value) -+{ -+ gchar *p; -+ gchar *result; -+ -+ /* Just allocate for worst case */ -+ result = egg_secure_alloc ((strlen (value) * 3) + 1); -+ -+ /* Now loop through looking for escapes */ -+ p = result; -+ while (*value) { -+ -+ /* These characters we let through verbatim */ -+ if (*value && (g_ascii_isalnum (*value) || strchr ("_-.", *value) != NULL)) { -+ *(p++) = *(value++); -+ -+ /* All others get encoded */ -+ } else { -+ *(p++) = '%'; -+ *(p++) = HEXC[((unsigned char)*value) >> 4]; -+ *(p++) = HEXC[((unsigned char)*value) & 0x0F]; -+ ++value; -+ } -+ } -+ -+ *p = 0; -+ return result; -+} -+ - /* ---------------------------------------------------------------------------------- - * OPERATIONS - */ -@@ -737,10 +768,12 @@ gkd_gpg_agent_ops_getpass (GkdGpgAgentCall *call, gchar *args) - if (password == NULL) { - gkd_gpg_agent_send_reply (call, FALSE, "111 cancelled"); - } else if (flags & GKD_GPG_AGENT_PASS_AS_DATA) { -- gkd_gpg_agent_send_data (call, password); -+ encoded = uri_encode_password (password); -+ gkd_gpg_agent_send_data (call, encoded); - gkd_gpg_agent_send_reply (call, TRUE, NULL); -+ egg_secure_strfree (encoded); - } else { -- encoded = encode_password (password); -+ encoded = hex_encode_password (password); - gkd_gpg_agent_send_reply (call, TRUE, encoded); - egg_secure_strfree (encoded); - } --- -1.7.10.2
\ No newline at end of file diff --git a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch deleted file mode 100644 index 2200f9dcf..000000000 --- a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2877c3a41b7e8feeb6eb6d6f718f4556ffb0161c Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger <dimstar@opensuse.org> -Date: Mon, 05 Dec 2011 08:10:59 +0000 -Subject: Bug 665309: Adapt to gnome-bluetooth 3.3 API - ---- -diff --git a/configure.in b/configure.in -index 101a77f..d0a7651 100644 ---- a/configure.in -+++ b/configure.in -@@ -13,7 +13,7 @@ dnl Initialize libtool - AM_PROG_LIBTOOL - - GNOKII_REQS="gnokii >= 0.6.28" --GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0" -+GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.3" - - AC_PROG_CC - AC_PROG_INSTALL -diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c -index 9ebac12..fecc367 100644 ---- a/gnome-bluetooth/phonemgr.c -+++ b/gnome-bluetooth/phonemgr.c -@@ -44,7 +44,7 @@ get_type (const char *address) - gboolean cont; - - client = bluetooth_client_new (); -- model = bluetooth_client_get_device_model (client, NULL); -+ model = bluetooth_client_get_device_model (client); - if (model == NULL) { - g_object_unref (client); - return type; --- -cgit v0.9.0.2 diff --git a/extra/gnome-settings-daemon/screensaver.patch b/extra/gnome-settings-daemon/screensaver.patch deleted file mode 100644 index bbcfe3430..000000000 --- a/extra/gnome-settings-daemon/screensaver.patch +++ /dev/null @@ -1,145 +0,0 @@ -From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001 -From: Rui Matos <tiagomatos@gmail.com> -Date: Wed, 17 Oct 2012 22:44:54 +0000 -Subject: power: Add a watchdog to keep X's builtin screen saver disabled - -X's builtin screen saver may activate DPMS. Since we want to activate -DPMS ourselves according to our own policy we must make sure that X's -screen saver remains disabled. - -This code is a copy of the original found in gs-watcher-x11.c from -gnome-screensaver which stopped being used in GNOME 3.6. - -https://bugzilla.gnome.org/show_bug.cgi?id=686339 ---- -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 0e06495..070cf32 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -27,6 +27,7 @@ - #include <stdio.h> - #include <sys/wait.h> - #include <glib/gi18n.h> -+#include <gdk/gdkx.h> - #include <gtk/gtk.h> - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> -@@ -80,6 +81,8 @@ - /* Keep this in sync with gnome-shell */ - #define SCREENSAVER_FADE_TIME 10 /* seconds */ - -+#define XSCREENSAVER_WATCHDOG_TIMEOUT 120 /* seconds */ -+ - enum { - GSD_POWER_IDLETIME_NULL_ID, - GSD_POWER_IDLETIME_DIM_ID, -@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate - GsdPowerIdleMode current_idle_mode; - guint lid_close_safety_timer_id; - GtkStatusIcon *status_icon; -+ guint xscreensaver_watchdog_timer_id; - }; - - enum { -@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session, - idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); - } - -+/* This timer goes off every few minutes, whether the user is idle or not, -+ to try and clean up anything that has gone wrong. -+ -+ It calls disable_builtin_screensaver() so that if xset has been used, -+ or some other program (like xlock) has messed with the XSetScreenSaver() -+ settings, they will be set back to sensible values (if a server extension -+ is in use, messing with xlock can cause the screensaver to never get a wakeup -+ event, and could cause monitor power-saving to occur, and all manner of -+ heinousness.) -+ -+ This code was originally part of gnome-screensaver, see -+ http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530 -+ */ -+static gboolean -+disable_builtin_screensaver (gpointer unused) -+{ -+ int current_server_timeout, current_server_interval; -+ int current_prefer_blank, current_allow_exp; -+ int desired_server_timeout, desired_server_interval; -+ int desired_prefer_blank, desired_allow_exp; -+ -+ XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -+ ¤t_server_timeout, -+ ¤t_server_interval, -+ ¤t_prefer_blank, -+ ¤t_allow_exp); -+ -+ desired_server_timeout = current_server_timeout; -+ desired_server_interval = current_server_interval; -+ desired_prefer_blank = current_prefer_blank; -+ desired_allow_exp = current_allow_exp; -+ -+ desired_server_interval = 0; -+ -+ /* I suspect (but am not sure) that DontAllowExposures might have -+ something to do with powering off the monitor as well, at least -+ on some systems that don't support XDPMS? Who know... */ -+ desired_allow_exp = AllowExposures; -+ -+ /* When we're not using an extension, set the server-side timeout to 0, -+ so that the server never gets involved with screen blanking, and we -+ do it all ourselves. (However, when we *are* using an extension, -+ we tell the server when to notify us, and rather than blanking the -+ screen, the server will send us an X event telling us to blank.) -+ */ -+ desired_server_timeout = 0; -+ -+ if (desired_server_timeout != current_server_timeout -+ || desired_server_interval != current_server_interval -+ || desired_prefer_blank != current_prefer_blank -+ || desired_allow_exp != current_allow_exp) { -+ -+ g_debug ("disabling server builtin screensaver:" -+ " (xset s %d %d; xset s %s; xset s %s)", -+ desired_server_timeout, -+ desired_server_interval, -+ (desired_prefer_blank ? "blank" : "noblank"), -+ (desired_allow_exp ? "expose" : "noexpose")); -+ -+ XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -+ desired_server_timeout, -+ desired_server_interval, -+ desired_prefer_blank, -+ desired_allow_exp); -+ -+ XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); -+ } -+ -+ return TRUE; -+} -+ - gboolean - gsd_power_manager_start (GsdPowerManager *manager, - GError **error) -@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - /* set the initial dim time that can adapt for the user */ - refresh_idle_dim_settings (manager); - -+ manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT, -+ disable_builtin_screensaver, -+ NULL); - gnome_settings_profile_end (NULL); - return TRUE; - } -@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) - - g_clear_object (&manager->priv->idletime); - g_clear_object (&manager->priv->status_icon); -+ -+ if (manager->priv->xscreensaver_watchdog_timer_id > 0) { -+ g_source_remove (manager->priv->xscreensaver_watchdog_timer_id); -+ manager->priv->xscreensaver_watchdog_timer_id = 0; -+ } - } - - static void --- -cgit v0.9.0.2 diff --git a/extra/gnome-settings-daemon/systemd-fallback.patch b/extra/gnome-settings-daemon/systemd-fallback.patch deleted file mode 100644 index da0496623..000000000 --- a/extra/gnome-settings-daemon/systemd-fallback.patch +++ /dev/null @@ -1,154 +0,0 @@ -commit b9ded09387f0b99ece97baee18595eb9e86a5b9b -Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -Date: Mon Mar 12 01:52:54 2012 +0100 - - Fallback to CK if systemd is not available - - Be nice to distributions where systemd is optional. This will select - the code path at runtime depending on whether the system was booted - using systemd. - -diff --git a/configure.ac b/configure.ac -index 3b4789f..d522852 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd], - [with_systemd=$enableval], - [with_systemd=no]) - if test "$with_systemd" = "yes" ; then -- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) -+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) - AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) - SESSION_TRACKING=systemd - else -diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c -index 5786300..83fe21e 100644 ---- a/gnome-settings-daemon/gnome-settings-session.c -+++ b/gnome-settings-daemon/gnome-settings-session.c -@@ -30,6 +30,7 @@ - #include "gnome-settings-session.h" - - #ifdef HAVE_SYSTEMD -+#include <systemd/sd-daemon.h> - #include <systemd/sd-login.h> - - typedef struct -@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate - { - #ifdef HAVE_SYSTEMD - GSource *sd_source; --#else -+#endif - GDBusProxy *proxy_session; - GCancellable *cancellable; --#endif - gchar *session_id; - GnomeSettingsSessionState state; - }; -@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data) - return TRUE; - } - --#else /* HAVE_SYSTEMD */ -+#endif /* HAVE_SYSTEMD */ - - static void - gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy, -@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d - g_object_unref (proxy_manager); - } - --#endif /* HAVE_SYSTEMD */ -- - static void - gnome_settings_session_init (GnomeSettingsSession *session) - { - session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session); - - #ifdef HAVE_SYSTEMD -- sd_pid_get_session (getpid(), &session->priv->session_id); -+ session->priv->sd_source = NULL; -+ -+ if (sd_booted () > 0) { -+ sd_pid_get_session (getpid(), &session->priv->session_id); - -- session->priv->sd_source = sd_source_new (); -- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); -- g_source_attach (session->priv->sd_source, NULL); -+ session->priv->sd_source = sd_source_new (); -+ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); -+ g_source_attach (session->priv->sd_source, NULL); - -- sessions_changed (session); --#else -+ sessions_changed (session); -+ return; -+ } -+#endif - session->priv->cancellable = g_cancellable_new (); - - /* connect to ConsoleKit */ -@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session) - session->priv->cancellable, - got_manager_proxy_cb, - session); --#endif - } - - static void -@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object) - if (session->priv->sd_source != NULL) { - g_source_destroy (session->priv->sd_source); - g_source_unref (session->priv->sd_source); -+ goto out; - } --#else -+#endif -+ - g_cancellable_cancel (session->priv->cancellable); - - if (session->priv->proxy_session != NULL) - g_object_unref (session->priv->proxy_session); - g_object_unref (session->priv->cancellable); --#endif - -+out: - G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object); - } - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 8db04e5..9883d76 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -2031,7 +2031,7 @@ systemd_stop (void) - g_object_unref (bus); - } - --#else -+#endif - - static void - consolekit_stop_cb (GObject *source_object, -@@ -2081,7 +2081,6 @@ consolekit_stop (void) - consolekit_stop_cb, NULL); - g_object_unref (proxy); - } --#endif - - static void - upower_sleep_cb (GObject *source_object, -@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager, - * hibernate is not available and is marginally better - * than just powering down the computer mid-write */ - #ifdef HAVE_SYSTEMD -- systemd_stop (); --#else -- consolekit_stop (); -+ if (sd_booted () > 0) -+ systemd_stop (); -+ else - #endif -+ consolekit_stop (); - break; - case GSD_POWER_ACTION_BLANK: - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, diff --git a/extra/gnome-shell/recorder.patch b/extra/gnome-shell/recorder.patch deleted file mode 100644 index 41134a31a..000000000 --- a/extra/gnome-shell/recorder.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001 -From: Rui Matos <tiagomatos@gmail.com> -Date: Wed, 02 May 2012 14:44:40 +0000 -Subject: main: Close the recorder instead of pausing it - -Pausing means that we will continue to use the same output file when -the keybinding is activated again. While useful to record a single -video in chunks, it doesn't seem to be how most users understand the -keybinding. Closing the recorder will close the file and create a new -one the next time the keybinding is pressed. - -https://bugzilla.gnome.org/show_bug.cgi?id=675128 ---- -diff --git a/js/ui/main.js b/js/ui/main.js -index 3b80297..25ad8d8 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -110,7 +110,7 @@ function _initRecorder() { - } - - if (recorder.is_recording()) { -- recorder.pause(); -+ recorder.close(); - Meta.enable_unredirect_for_screen(global.screen); - } else { - // read the parameters from GSettings always in case they have changed --- -cgit v0.9.0.2 diff --git a/extra/goffice/use-apiver-for-dirs.patch b/extra/goffice/use-apiver-for-dirs.patch deleted file mode 100644 index 3d0909da3..000000000 --- a/extra/goffice/use-apiver-for-dirs.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.in.orig 2011-09-07 08:45:49.687783970 +0000 -+++ configure.in 2011-09-07 09:12:55.709382840 +0000 -@@ -418,7 +418,7 @@ - fi - - dnl ************************************************** --AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION}) -+AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER}) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [The package name, for gettext]) - AM_GLIB_GNU_GETTEXT -@@ -638,9 +638,9 @@ - dnl ****************** - dnl - dnl These are changed in goffice.c for WIN32 packages --AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}') --AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}') --AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}') -+AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}') -+AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}') -+AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}') - AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale') - dnl - AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins') ---- libgoffice.pc.in.orig 2010-02-18 22:49:39.000000000 +0000 -+++ libgoffice.pc.in 2011-09-07 09:18:53.655992532 +0000 -@@ -11,4 +11,4 @@ - Libs.private: @EXTRA_LIBS@ - Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@ - --PluginDir=${libdir}/goffice/@VERSION@/plugins -+PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index f60942924..2375268c3 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175868 2013-01-23 00:13:01Z eric $ +# $Id: PKGBUILD 177797 2013-02-09 01:45:32Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=0.8.5 -pkgrel=3 +pkgver=0.8.6 +pkgrel=1 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64' 'mips64el') url="http://www.rodsbooks.com/gdisk/" @@ -15,11 +15,14 @@ provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('15cc691f28212c157e05315662ed6b76ffdcc8de6fc118fa21c81ef5aae84af9') +sha256sums=('4579cd54842459699970e24720dda7fb0aa217027818623089c321bc62a647b2') build() { cd "$srcdir/$pkgname-$pkgver" + # Get rid of annoying debug message (have sent email to upstream author) + sed -i '/Entering GPTPart::SetName/d' gptpart.cc + make } diff --git a/extra/graphite/pango-graphite.install b/extra/graphite/pango-graphite.install deleted file mode 100644 index 46bc44611..000000000 --- a/extra/graphite/pango-graphite.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - usr/bin/pango-querymodules >etc/pango/pango.modules -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - post_install $1 -} - diff --git a/extra/grilo-plugins/tracker-0.14.patch b/extra/grilo-plugins/tracker-0.14.patch deleted file mode 100644 index c9c79fe7c..000000000 --- a/extra/grilo-plugins/tracker-0.14.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9e00790f40ee498a7359b00e0b11a7523fdd1b3e Mon Sep 17 00:00:00 2001 -From: Vincent Untz <vuntz@gnome.org> -Date: Thu, 19 Jan 2012 09:30:28 +0000 -Subject: build: Support build against tracker 0.13/0.14 - -https://bugzilla.gnome.org/show_bug.cgi?id=667855 ---- -diff --git a/configure.ac b/configure.ac -index 1fd6743..71aceed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -134,11 +134,17 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6, - HAVE_GMIME=yes, - HAVE_GMIME=no)]) - --PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, -+PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.14, - HAVE_TRACKER_SPARQL=yes, - HAVE_TRACKER_SPARQL=no) - - if test "x$HAVE_TRACKER_SPARQL" = "xno"; then -+ PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, -+ HAVE_TRACKER_SPARQL=yes, -+ HAVE_TRACKER_SPARQL=no) -+fi -+ -+if test "x$HAVE_TRACKER_SPARQL" = "xno"; then - PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11, - HAVE_TRACKER_SPARQL=yes, - HAVE_TRACKER_SPARQL=no) --- -cgit v0.9.0.2 diff --git a/extra/gstreamer0.10-bad/PKGBUILD b/extra/gstreamer0.10-bad/PKGBUILD deleted file mode 100644 index 6182c5133..000000000 --- a/extra/gstreamer0.10-bad/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 168314 2012-10-08 14:06:19Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-bad -pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins') -pkgver=0.10.23 -pkgrel=3 -arch=('i686' 'x86_64') -license=('LGPL' 'GPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus') -url="http://gstreamer.freedesktop.org/" -options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz) -md5sums=('e4822fa2cc933768e2998311a1565979') - -build() { - cd "${srcdir}/gst-plugins-bad-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Bad Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - - make - sed -e 's/gst sys ext/gst/' -i Makefile -} - -# Disable for now: 2 tests fail, one of them is because of not having a camera during build. -#check() { -# cd "${srcdir}/gst-plugins-bad-${pkgver}" -# make check -#} - -package_gstreamer0.10-bad() { - pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)" - depends=('gstreamer0.10-base>=0.10.34') - - cd "${srcdir}/gst-plugins-bad-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-bad-plugins() { - pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)" - depends=("gstreamer0.10-bad=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus') - groups=('gstreamer0.10-plugins') - install=gstreamer0.10-bad-plugins.install - - cd "${srcdir}/gst-plugins-bad-${pkgver}" - make -C gst-libs DESTDIR="${pkgdir}" install - make -C ext DESTDIR="${pkgdir}" install - make -C sys DESTDIR="${pkgdir}" install - make -C gst-libs DESTDIR="${pkgdir}" uninstall -} diff --git a/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install b/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install deleted file mode 100644 index 3a36b0ccb..000000000 --- a/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.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/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD deleted file mode 100644 index 3d0b13a61..000000000 --- a/extra/gstreamer0.10-good/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-good -pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.31 -pkgrel=1 -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.xz) -sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') - -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 -} - -check() { - cd "${srcdir}/gst-plugins-good-${pkgver}" - make check -} - -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/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install deleted file mode 100644 index e343beea5..000000000 --- a/extra/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/extra/gtk2/fix-stuck-grabs.patch b/extra/gtk2/fix-stuck-grabs.patch deleted file mode 100644 index accec431e..000000000 --- a/extra/gtk2/fix-stuck-grabs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a9fb816a3f64227936f4b25882e4f20ab5018c9c Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Wed, 16 May 2012 21:18:51 +0000 -Subject: Fix a case of 'stuck grab' - -This was showing up when using a combo box in list mode. After popping -up the list, the keyboard grab appeared stuck. What was stuck here is -only the client-side grab, since we forgot to clean up our grabs -when receiving an UnmapNotify. - -This bug was introduced in 3f6592f60fd15fb353fc84600caefba3054dc892. - -[ Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.24 ] - -https://bugzilla.gnome.org/show_bug.cgi?id=680346 ---- -diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c -index 7cc1000..b96e9f5 100644 ---- a/gdk/x11/gdkevents-x11.c -+++ b/gdk/x11/gdkevents-x11.c -@@ -1799,16 +1799,15 @@ gdk_event_translate (GdkDisplay *display, - * means we hid the window ourselves, so we will have already flipped - * the iconified bit off. - */ -- if (window) -- { -- if (GDK_WINDOW_IS_MAPPED (window)) -- gdk_synthesize_window_state (window, -- 0, -- GDK_WINDOW_STATE_ICONIFIED); -- -- _gdk_xgrab_check_unmap (window, xevent->xany.serial); -- } -+ if (window && GDK_WINDOW_IS_MAPPED (window)) -+ gdk_synthesize_window_state (window, -+ 0, -+ GDK_WINDOW_STATE_ICONIFIED); - } -+ -+ if (window) -+ _gdk_xgrab_check_unmap (window, xevent->xany.serial); -+ - break; - - case MapNotify: --- -cgit v0.9.0.2 diff --git a/extra/gtk3/git-fixes.patch b/extra/gtk3/git-fixes.patch deleted file mode 100644 index 06041e326..000000000 --- a/extra/gtk3/git-fixes.patch +++ /dev/null @@ -1,8346 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 9e24e90..00f38b0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -714,7 +714,6 @@ AM_PATH_GLIB_2_0(glib_required_version, :, - *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), - gobject gmodule-no-export) - --dnl - dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. - dnl - gtk_save_LIBS=$LIBS -@@ -748,6 +747,19 @@ else - AC_MSG_RESULT([no]) - fi - -+# -+# Disable deprecation checks for all libraries we depend on on stable branches. -+# This is so newer versions of those libraries don't cause more warnings with -+# a stable GTK version. -+# We don't ever want to turn off deprecation warnings for master however, because -+# that's where we get rid of deprecated API we use. -+# -+if test m4_eval(gtk_minor_version % 2) = 0 ; then -+ AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, -+ [Disable deprecation warnings from glib]) -+fi -+ -+dnl - saved_cflags="$CFLAGS" - saved_ldflags="$LDFLAGS" - -diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c -index 712f232..5d04cdb 100644 ---- a/gdk/quartz/gdkevents-quartz.c -+++ b/gdk/quartz/gdkevents-quartz.c -@@ -1439,7 +1439,8 @@ gdk_event_translate (GdkEvent *event, - if (dx != 0.0 || dy != 0.0) - { - #ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER -- if (gdk_quartz_osx_version() >= GDK_OSX_LION &[nsevent hasPreciseScrollingDeltas]) -+ if (gdk_quartz_osx_version() >= GDK_OSX_LION && -+ [nsevent hasPreciseScrollingDeltas]) - { - GdkEvent *emulated_event; - -diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c -index ce5777a..7088780 100644 ---- a/gtk/a11y/gtktextcellaccessible.c -+++ b/gtk/a11y/gtktextcellaccessible.c -@@ -552,7 +552,6 @@ gtk_text_cell_accessible_get_character_extents (AtkText *text, - gail_renderer = GTK_RENDERER_CELL_ACCESSIBLE (text); - g_object_get (gail_renderer, "renderer", >k_renderer, NULL); - g_object_get (gtk_renderer, "text", &renderer_text, NULL); -- g_object_unref (gtk_renderer); - if (renderer_text == NULL) - { - g_object_unref (gtk_renderer); -diff --git a/gtk/gtk-default.css b/gtk/gtk-default.css -index 2e21518..d084828 100644 ---- a/gtk/gtk-default.css -+++ b/gtk/gtk-default.css -@@ -715,5 +715,17 @@ GtkCalendar.button:hover { - } - - .spinner:active { -+ background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)), -+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); - animation: spinner 1s infinite linear; - } -diff --git a/gtk/gtkcsscomputedvalues.c b/gtk/gtkcsscomputedvalues.c -index 94115a5..b522948 100644 ---- a/gtk/gtkcsscomputedvalues.c -+++ b/gtk/gtkcsscomputedvalues.c -@@ -499,6 +499,8 @@ gtk_css_computed_values_create_css_animations (GtkCssComputedValues *values, - _gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)), - _gtk_css_fill_mode_value_get (_gtk_css_array_value_get_nth (fill_modes, i)), - _gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100)); -+ -+ _gtk_css_keyframes_unref (keyframes); - } - values->animations = g_slist_prepend (values->animations, animation); - } -diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c -index a241733..8497339 100644 ---- a/gtk/gtkcssimagegradient.c -+++ b/gtk/gtkcssimagegradient.c -@@ -79,7 +79,7 @@ fade_pattern (cairo_pattern_t *pattern, - cairo_pattern_add_color_stop_rgba (result, o, r, g, b, a * opacity); - } - -- return pattern; -+ return result; - } - - static cairo_pattern_t * -@@ -102,7 +102,7 @@ transition_pattern (cairo_pattern_t *start, - { - case CAIRO_PATTERN_TYPE_LINEAR: - cairo_pattern_get_linear_points (start, &sx0, &sy0, &sx1, &sy1); -- cairo_pattern_get_linear_points (start, &ex0, &ey0, &ex1, &ey1); -+ cairo_pattern_get_linear_points (end, &ex0, &ey0, &ex1, &ey1); - result = cairo_pattern_create_linear ((1 - progress) * sx0 + progress * ex0, - (1 - progress) * sx1 + progress * ex1, - (1 - progress) * sy0 + progress * ey0, -@@ -110,7 +110,7 @@ transition_pattern (cairo_pattern_t *start, - break; - case CAIRO_PATTERN_TYPE_RADIAL: - cairo_pattern_get_radial_circles (start, &sx0, &sy0, &sr0, &sx1, &sy1, &sr1); -- cairo_pattern_get_radial_circles (start, &ex0, &ey0, &er0, &ex1, &ey1, &er1); -+ cairo_pattern_get_radial_circles (end, &ex0, &ey0, &er0, &ex1, &ey1, &er1); - result = cairo_pattern_create_radial ((1 - progress) * sx0 + progress * ex0, - (1 - progress) * sy0 + progress * ey0, - (1 - progress) * sr0 + progress * er0, -@@ -128,7 +128,7 @@ transition_pattern (cairo_pattern_t *start, - double so, sr, sg, sb, sa, eo, er, eg, eb, ea; - - cairo_pattern_get_color_stop_rgba (start, i, &so, &sr, &sg, &sb, &sa); -- cairo_pattern_get_color_stop_rgba (start, i, &eo, &er, &eg, &eb, &ea); -+ cairo_pattern_get_color_stop_rgba (end, i, &eo, &er, &eg, &eb, &ea); - - cairo_pattern_add_color_stop_rgba (result, - (1 - progress) * so + progress * eo, -diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c -index dbc14f0..2f4bd28 100644 ---- a/gtk/gtkentrycompletion.c -+++ b/gtk/gtkentrycompletion.c -@@ -656,8 +656,7 @@ gtk_entry_completion_set_property (GObject *object, - break; - - case PROP_TEXT_COLUMN: -- gtk_entry_completion_set_text_column (completion, -- g_value_get_int (value)); -+ priv->text_column = g_value_get_int (value); - break; - - case PROP_INLINE_COMPLETION: -diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c -index dab06c3..09d6303 100644 ---- a/gtk/gtkfilechooserdefault.c -+++ b/gtk/gtkfilechooserdefault.c -@@ -6798,7 +6798,7 @@ file_system_model_got_thumbnail (GObject *object, GAsyncResult *res, gpointer da - copy_attribute (info, queried, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED); - copy_attribute (info, queried, G_FILE_ATTRIBUTE_STANDARD_ICON); - -- _gtk_file_system_model_update_file (model, file, info, FALSE); -+ _gtk_file_system_model_update_file (model, file, info); - - g_object_unref (info); - -diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c -index 1e5ffe3..132902b 100644 ---- a/gtk/gtkfilesystemmodel.c -+++ b/gtk/gtkfilesystemmodel.c -@@ -42,6 +42,9 @@ - * the special kind of usage for "search" and "recent-files", where the file chooser gives the model the - * files to be displayed. - * -+ * Internal data structure -+ * ----------------------- -+ * - * Each file is kept in a FileModelNode structure. Each FileModelNode holds a GFile* and other data. All the - * node structures have the same size, determined at runtime, depending on the number of columns that were passed - * to _gtk_file_system_model_new() or _gtk_file_system_model_new_for_directory() (that is, the size of a node is -@@ -66,7 +69,14 @@ - * - * Each FileModelNode has a node->visible field, which indicates whether the node is visible in the GtkTreeView. - * A node may be invisible if, for example, it corresponds to a hidden file and the file chooser is not showing -- * hidden files. -+ * hidden files. Also, a file filter may be explicitly set onto the model, for example, to only show files that -+ * match "*.jpg". In this case, node->filtered_out says whether the node failed the filter. The ultimate -+ * decision on whether a node is visible or not in the treeview is distilled into the node->visible field. -+ * The reason for having a separate node->filtered_out field is so that the file chooser can query whether -+ * a (filtered-out) folder should be made sensitive in the GUI. -+ * -+ * Visible rows vs. possibly-invisible nodes -+ * ----------------------------------------- - * - * Since not all nodes in the model->files array may be visible, we need a way to map visible row indexes from - * the treeview to array indexes in our array of files. And thus we introduce a bit of terminology: -@@ -95,6 +105,16 @@ - * - * You never access a node->row directly. Instead, call node_get_tree_row(). That function will validate the nodes - * up to the sought one if the node is not valid yet, and it will return a proper 0-based row. -+ * -+ * Sorting -+ * ------- -+ * -+ * The model implements the GtkTreeSortable interface. To avoid re-sorting -+ * every time a node gets added (which would lead to O(n^2) performance during -+ * the initial population of the model), the model can freeze itself (with -+ * freeze_updates()) during the intial population process. When the model is -+ * frozen, sorting will not happen. The model will sort itself when the freeze -+ * count goes back to zero, via corresponding calls to thaw_updates(). - */ - - /*** DEFINES ***/ -@@ -184,6 +204,12 @@ struct _GtkFileSystemModelClass - void (*finished_loading) (GtkFileSystemModel *model, GError *error); - }; - -+static void freeze_updates (GtkFileSystemModel *model); -+static void thaw_updates (GtkFileSystemModel *model); -+ -+static guint node_get_for_file (GtkFileSystemModel *model, -+ GFile *file); -+ - static void add_file (GtkFileSystemModel *model, - GFile *file, - GFileInfo *info); -@@ -263,13 +289,13 @@ node_invalidate_index (GtkFileSystemModel *model, guint id) - } - - static GtkTreePath * --gtk_tree_path_new_from_node (GtkFileSystemModel *model, guint id) -+tree_path_new_from_node (GtkFileSystemModel *model, guint id) - { -- guint i = node_get_tree_row (model, id); -+ guint r = node_get_tree_row (model, id); - -- g_assert (i < model->files->len); -+ g_assert (r < model->files->len); - -- return gtk_tree_path_new_from_indices (i, -1); -+ return gtk_tree_path_new_from_indices (r, -1); - } - - static void -@@ -278,7 +304,7 @@ emit_row_inserted_for_node (GtkFileSystemModel *model, guint id) - GtkTreePath *path; - GtkTreeIter iter; - -- path = gtk_tree_path_new_from_node (model, id); -+ path = tree_path_new_from_node (model, id); - ITER_INIT_FROM_INDEX (model, &iter, id); - gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter); - gtk_tree_path_free (path); -@@ -290,7 +316,7 @@ emit_row_changed_for_node (GtkFileSystemModel *model, guint id) - GtkTreePath *path; - GtkTreeIter iter; - -- path = gtk_tree_path_new_from_node (model, id); -+ path = tree_path_new_from_node (model, id); - ITER_INIT_FROM_INDEX (model, &iter, id); - gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter); - gtk_tree_path_free (path); -@@ -570,7 +596,7 @@ gtk_file_system_model_get_path (GtkTreeModel *tree_model, - - g_return_val_if_fail (ITER_IS_VALID (model, iter), NULL); - -- return gtk_tree_path_new_from_node (model, ITER_INDEX (iter)); -+ return tree_path_new_from_node (model, ITER_INDEX (iter)); - } - - static void -@@ -1097,7 +1123,7 @@ thaw_func (gpointer data) - { - GtkFileSystemModel *model = data; - -- _gtk_file_system_model_thaw_updates (model); -+ thaw_updates (model); - model->dir_thaw_source = 0; - - return FALSE; -@@ -1119,7 +1145,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da - { - if (model->dir_thaw_source == 0) - { -- _gtk_file_system_model_freeze_updates (model); -+ freeze_updates (model); - model->dir_thaw_source = gdk_threads_add_timeout_full (IO_PRIORITY + 1, - 50, - thaw_func, -@@ -1168,7 +1194,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da - { - g_source_remove (model->dir_thaw_source); - model->dir_thaw_source = 0; -- _gtk_file_system_model_thaw_updates (model); -+ thaw_updates (model); - } - - g_signal_emit (model, file_system_model_signals[FINISHED_LOADING], 0, error); -@@ -1189,13 +1215,19 @@ gtk_file_system_model_query_done (GObject * object, - GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */ - GFile *file = G_FILE (object); - GFileInfo *info; -+ guint id; - - info = g_file_query_info_finish (file, res, NULL); - if (info == NULL) - return; - - gdk_threads_enter (); -- _gtk_file_system_model_update_file (model, file, info, TRUE); -+ -+ _gtk_file_system_model_update_file (model, file, info); -+ -+ id = node_get_for_file (model, file); -+ gtk_file_system_model_sort_node (model, id); -+ - gdk_threads_leave (); - } - -@@ -1433,14 +1465,14 @@ gtk_file_system_model_refilter_all (GtkFileSystemModel *model) - return; - } - -- _gtk_file_system_model_freeze_updates (model); -+ freeze_updates (model); - - /* start at index 1, don't change the editable */ - for (i = 1; i < model->files->len; i++) - node_compute_visibility_and_filters (model, i); - - model->filter_on_thaw = FALSE; -- _gtk_file_system_model_thaw_updates (model); -+ thaw_updates (model); - } - - /** -@@ -1775,6 +1807,33 @@ _gtk_file_system_model_get_iter_for_file (GtkFileSystemModel *model, - return TRUE; - } - -+/* When an element is added or removed to the model->files array, we need to -+ * update the model->file_lookup mappings of (node, index), as the indexes -+ * change. This function adds the specified increment to the index in that pair -+ * if the index is equal or after the specified id. We use this to slide the -+ * mappings up or down when a node is added or removed, respectively. -+ */ -+static void -+adjust_file_lookup (GtkFileSystemModel *model, guint id, int increment) -+{ -+ GHashTableIter iter; -+ gpointer key; -+ gpointer value; -+ -+ g_hash_table_iter_init (&iter, model->file_lookup); -+ -+ while (g_hash_table_iter_next (&iter, &key, &value)) -+ { -+ guint index = GPOINTER_TO_UINT (value); -+ -+ if (index >= id) -+ { -+ index += increment; -+ g_hash_table_iter_replace (&iter, GUINT_TO_POINTER (index)); -+ } -+ } -+} -+ - /** - * add_file: - * @model: the model -@@ -1825,6 +1884,7 @@ remove_file (GtkFileSystemModel *model, - { - FileModelNode *node; - guint id; -+ guint row; - - g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model)); - g_return_if_fail (G_IS_FILE (file)); -@@ -1834,17 +1894,22 @@ remove_file (GtkFileSystemModel *model, - return; - - node = get_node (model, id); -- node_set_visible_and_filtered_out (model, id, FALSE, FALSE); -+ row = node_get_tree_row (model, id); -+ -+ node_invalidate_index (model, id); - - g_hash_table_remove (model->file_lookup, file); - g_object_unref (node->file); -+ adjust_file_lookup (model, id, -1); - - if (node->info) - g_object_unref (node->info); - - g_array_remove_index (model->files, id); -- g_hash_table_remove_all (model->file_lookup); -- /* We don't need to resort, as removing a row doesn't change the sorting order */ -+ -+ /* We don't need to resort, as removing a row doesn't change the sorting order of the other rows */ -+ -+ emit_row_deleted_for_row (model, row); - } - - /** -@@ -1852,7 +1917,6 @@ remove_file (GtkFileSystemModel *model, - * @model: the model - * @file: the file - * @info: the new file info -- * @requires_resort: FIXME: get rid of this argument - * - * Tells the file system model that the file changed and that the - * new @info should be used for it now. If the file is not part of -@@ -1861,8 +1925,7 @@ remove_file (GtkFileSystemModel *model, - void - _gtk_file_system_model_update_file (GtkFileSystemModel *model, - GFile *file, -- GFileInfo *info, -- gboolean requires_resort) -+ GFileInfo *info) - { - FileModelNode *node; - guint i, id; -@@ -1894,9 +1957,6 @@ _gtk_file_system_model_update_file (GtkFileSystemModel *model, - - if (node->visible) - emit_row_changed_for_node (model, id); -- -- if (requires_resort) -- gtk_file_system_model_sort_node (model, id); - } - - /** -@@ -1967,17 +2027,16 @@ _gtk_file_system_model_remove_editable (GtkFileSystemModel *model) - } - - /** -- * _gtk_file_system_model_freeze_updates: -+ * freeze_updates: - * @model: a #GtkFileSystemModel - * -- * Freezes most updates on the model, so that performing multiple -- * operations on the files in the model do not cause any events. -- * Use _gtk_file_system_model_thaw_updates() to resume proper -- * operations. It is fine to call this function multiple times as -- * long as freeze and thaw calls are balanced. -+ * Freezes most updates on the model, so that performing multiple operations on -+ * the files in the model do not cause any events. Use thaw_updates() to resume -+ * proper operations. It is fine to call this function multiple times as long as -+ * freeze and thaw calls are balanced. - **/ --void --_gtk_file_system_model_freeze_updates (GtkFileSystemModel *model) -+static void -+freeze_updates (GtkFileSystemModel *model) - { - g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model)); - -@@ -1985,14 +2044,13 @@ _gtk_file_system_model_freeze_updates (GtkFileSystemModel *model) - } - - /** -- * _gtk_file_system_model_thaw_updates: -+ * thaw_updates: - * @model: a #GtkFileSystemModel - * -- * Undoes the effect of a previous call to -- * _gtk_file_system_model_freeze_updates() -+ * Undoes the effect of a previous call to freeze_updates() - **/ --void --_gtk_file_system_model_thaw_updates (GtkFileSystemModel *model) -+static void -+thaw_updates (GtkFileSystemModel *model) - { - gboolean stuff_added; - -diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h -index 2264fcf..575cc23 100644 ---- a/gtk/gtkfilesystemmodel.h -+++ b/gtk/gtkfilesystemmodel.h -@@ -71,8 +71,7 @@ void _gtk_file_system_model_add_and_query_file (GtkFileSystemMode - const char *attributes); - void _gtk_file_system_model_update_file (GtkFileSystemModel *model, - GFile *file, -- GFileInfo *info, -- gboolean requires_resort); -+ GFileInfo *info); - - void _gtk_file_system_model_set_show_hidden (GtkFileSystemModel *model, - gboolean show_hidden); -@@ -82,8 +81,6 @@ void _gtk_file_system_model_set_show_files (GtkFileSystemModel - gboolean show_files); - void _gtk_file_system_model_set_filter_folders (GtkFileSystemModel *model, - gboolean show_folders); --void _gtk_file_system_model_freeze_updates (GtkFileSystemModel *model); --void _gtk_file_system_model_thaw_updates (GtkFileSystemModel *model); - void _gtk_file_system_model_clear_cache (GtkFileSystemModel *model, - int column); - -diff --git a/gtk/gtkgradient.c b/gtk/gtkgradient.c -index 3c16fca..8c779d8 100644 ---- a/gtk/gtkgradient.c -+++ b/gtk/gtkgradient.c -@@ -327,6 +327,7 @@ _gtk_gradient_resolve_full (GtkGradient *gradient, - { - rgba = *_gtk_css_rgba_value_get_rgba (val); - *dependencies = _gtk_css_dependencies_union (*dependencies, stop_deps); -+ _gtk_css_value_unref (val); - } - else - { -@@ -467,7 +468,7 @@ gtk_gradient_fade (GtkGradient *gradient, - - stop = &g_array_index (gradient->stops, ColorStop, i); - color = gtk_symbolic_color_new_alpha (stop->color, opacity); -- gtk_gradient_add_color_stop (gradient, stop->offset, color); -+ gtk_gradient_add_color_stop (faded, stop->offset, color); - gtk_symbolic_color_unref (color); - } - -diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c -index 6f23914..49ee9bc 100644 ---- a/gtk/gtkiconhelper.c -+++ b/gtk/gtkiconhelper.c -@@ -20,6 +20,7 @@ - #include "config.h" - - #include "gtkiconhelperprivate.h" -+#include "string.h" - - G_DEFINE_TYPE (GtkIconHelper, _gtk_icon_helper, G_TYPE_OBJECT) - -@@ -466,7 +467,8 @@ _gtk_icon_helper_set_stock_id (GtkIconHelper *self, - { - _gtk_icon_helper_clear (self); - -- if (stock_id != NULL) -+ if (stock_id != NULL && -+ g_strcmp0 (stock_id, "") != 0) - { - self->priv->storage_type = GTK_IMAGE_STOCK; - self->priv->stock_id = g_strdup (stock_id); -diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c -index b46dd3a..ef8f3cd 100644 ---- a/gtk/gtkmenubutton.c -+++ b/gtk/gtkmenubutton.c -@@ -806,6 +806,23 @@ gtk_menu_button_get_menu_model (GtkMenuButton *menu_button) - return menu_button->priv->model; - } - -+static void -+set_align_widget_pointer (GtkMenuButton *menu_button, -+ GtkWidget *align_widget) -+{ -+ GtkMenuButtonPrivate *priv; -+ -+ priv = menu_button->priv; -+ -+ if (priv->align_widget) -+ g_object_remove_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget); -+ -+ priv->align_widget = align_widget; -+ -+ if (align_widget) -+ g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget); -+} -+ - /** - * gtk_menu_button_set_align_widget: - * @menu_button: a #GtkMenuButton -@@ -832,10 +849,7 @@ gtk_menu_button_set_align_widget (GtkMenuButton *menu_button, - if (priv->align_widget == align_widget) - return; - -- priv->align_widget = align_widget; -- -- if (priv->align_widget) -- g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget); -+ set_align_widget_pointer (menu_button, align_widget); - - g_object_notify (G_OBJECT (menu_button), "align-widget"); - } -@@ -926,8 +940,11 @@ gtk_menu_button_dispose (GObject *object) - menu_deactivate_cb, - object); - gtk_menu_detach (GTK_MENU (priv->popup)); -+ priv->popup = NULL; - } - -+ set_align_widget_pointer (GTK_MENU_BUTTON (object), NULL); -+ - g_clear_object (&priv->model); - - G_OBJECT_CLASS (gtk_menu_button_parent_class)->dispose (object); -diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c -index 25c5a44..be388c9 100644 ---- a/gtk/gtkscale.c -+++ b/gtk/gtkscale.c -@@ -221,6 +221,21 @@ gtk_scale_notify (GObject *object, - G_OBJECT_CLASS (gtk_scale_parent_class)->notify (object, pspec); - } - -+static void -+gtk_scale_update_style (GtkScale *scale) -+{ -+ gint slider_length; -+ GtkRange *range; -+ -+ range = GTK_RANGE (scale); -+ -+ gtk_widget_style_get (GTK_WIDGET (scale), -+ "slider-length", &slider_length, -+ NULL); -+ -+ gtk_range_set_min_slider_size (range, slider_length); -+ _gtk_scale_clear_layout (scale); -+} - - #define add_slider_binding(binding_set, keyval, mask, scroll) \ - gtk_binding_entry_add_signal (binding_set, keyval, mask, \ -@@ -492,6 +507,7 @@ gtk_scale_init (GtkScale *scale) - - context = gtk_widget_get_style_context (GTK_WIDGET (scale)); - gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCALE); -+ gtk_scale_update_style (scale); - } - - static void -@@ -1020,18 +1036,7 @@ gtk_scale_get_mark_label_size (GtkScale *scale, - static void - gtk_scale_style_updated (GtkWidget *widget) - { -- gint slider_length; -- GtkRange *range; -- -- range = GTK_RANGE (widget); -- -- gtk_widget_style_get (widget, -- "slider-length", &slider_length, -- NULL); -- -- gtk_range_set_min_slider_size (range, slider_length); -- -- _gtk_scale_clear_layout (GTK_SCALE (widget)); -+ gtk_scale_update_style (GTK_SCALE (widget)); - - GTK_WIDGET_CLASS (gtk_scale_parent_class)->style_updated (widget); - } -diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c -index 541acc3..9062118 100644 ---- a/gtk/gtkscrollbar.c -+++ b/gtk/gtkscrollbar.c -@@ -115,21 +115,13 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class) - } - - static void --gtk_scrollbar_init (GtkScrollbar *scrollbar) --{ -- GtkStyleContext *context; -- -- context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar)); -- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR); --} -- --static void --gtk_scrollbar_style_updated (GtkWidget *widget) -+gtk_scrollbar_update_style (GtkScrollbar *scrollbar) - { -- GtkRange *range = GTK_RANGE (widget); - gint slider_length; - gboolean fixed_size; - gboolean has_a, has_b, has_c, has_d; -+ GtkRange *range = GTK_RANGE (scrollbar); -+ GtkWidget *widget = GTK_WIDGET (scrollbar); - - gtk_widget_style_get (widget, - "min-slider-length", &slider_length, -@@ -144,7 +136,22 @@ gtk_scrollbar_style_updated (GtkWidget *widget) - gtk_range_set_slider_size_fixed (range, fixed_size); - _gtk_range_set_steppers (range, - has_a, has_b, has_c, has_d); -+} - -+static void -+gtk_scrollbar_init (GtkScrollbar *scrollbar) -+{ -+ GtkStyleContext *context; -+ -+ context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar)); -+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR); -+ gtk_scrollbar_update_style (scrollbar); -+} -+ -+static void -+gtk_scrollbar_style_updated (GtkWidget *widget) -+{ -+ gtk_scrollbar_update_style (GTK_SCROLLBAR (widget)); - GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_updated (widget); - } - -diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c -index a18c4cf..7929863 100644 ---- a/gtk/gtkscrolledwindow.c -+++ b/gtk/gtkscrolledwindow.c -@@ -274,9 +274,6 @@ static void gtk_scrolled_window_realize (GtkWidget *wid - static void gtk_scrolled_window_unrealize (GtkWidget *widget); - static void gtk_scrolled_window_map (GtkWidget *widget); - static void gtk_scrolled_window_unmap (GtkWidget *widget); --static void gtk_scrolled_window_state_flags_changed (GtkWidget *widget, -- GtkStateFlags previous_state); --static void gtk_scrolled_window_style_updated (GtkWidget *widget); - - static void gtk_scrolled_window_grab_notify (GtkWidget *widget, - gboolean was_grabbed); -@@ -352,8 +349,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) - widget_class->unrealize = gtk_scrolled_window_unrealize; - widget_class->map = gtk_scrolled_window_map; - widget_class->unmap = gtk_scrolled_window_unmap; -- widget_class->state_flags_changed = gtk_scrolled_window_state_flags_changed; -- widget_class->style_updated = gtk_scrolled_window_style_updated; - widget_class->grab_notify = gtk_scrolled_window_grab_notify; - - container_class->add = gtk_scrolled_window_add; -@@ -3379,14 +3374,13 @@ gtk_scrolled_window_realize (GtkWidget *widget) - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual (widget); - attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | -- GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK; -+ GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK | GDK_EXPOSURE_MASK; - - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; - - scrolled_window->priv->overshoot_window = - gdk_window_new (gtk_widget_get_parent_window (widget), - &attributes, attributes_mask); -- - gdk_window_set_user_data (scrolled_window->priv->overshoot_window, widget); - - child_widget = gtk_bin_get_child (GTK_BIN (widget)); -@@ -3433,37 +3427,6 @@ gtk_scrolled_window_unmap (GtkWidget *widget) - } - - static void --_gtk_scrolled_window_update_background (GtkScrolledWindow *scrolled_window) --{ -- GtkWidget *widget = GTK_WIDGET (scrolled_window); -- -- if (gtk_widget_get_realized (widget)) -- { -- GtkStyleContext *context; -- -- context = gtk_widget_get_style_context (widget); -- gtk_style_context_set_background (context, scrolled_window->priv->overshoot_window); -- } --} -- --static void --gtk_scrolled_window_state_flags_changed (GtkWidget *widget, -- GtkStateFlags previous_state) --{ -- _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget)); -- gtk_widget_queue_draw (widget); --} -- --static void --gtk_scrolled_window_style_updated (GtkWidget *widget) --{ -- GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->style_updated (widget); -- -- _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget)); -- gtk_widget_queue_draw (widget); --} -- --static void - gtk_scrolled_window_grab_notify (GtkWidget *widget, - gboolean was_grabbed) - { -diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c -index 5939e88..4b9e1e5 100644 ---- a/gtk/gtksettings.c -+++ b/gtk/gtksettings.c -@@ -1848,6 +1848,9 @@ gtk_settings_notify (GObject *object, - if (settings_update_fontconfig (settings)) - gtk_style_context_reset_widgets (priv->screen); - break; -+ case PROP_ENABLE_ANIMATIONS: -+ gtk_style_context_reset_widgets (priv->screen); -+ break; - case PROP_CURSOR_THEME_NAME: - case PROP_CURSOR_THEME_SIZE: - settings_update_cursor_theme (settings); -diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c -index b5b043d..091505a 100644 ---- a/gtk/gtksizegroup.c -+++ b/gtk/gtksizegroup.c -@@ -746,6 +746,11 @@ compute_dimension (GtkWidget *widget, - min_dimension = *minimum; - nat_dimension = *natural; - } -+ else if (!gtk_widget_get_mapped (tmp_widget) && priv->ignore_hidden) -+ { -+ min_dimension = 0; -+ nat_dimension = 0; -+ } - else - { - if (mode == GTK_SIZE_GROUP_HORIZONTAL) -@@ -754,11 +759,8 @@ compute_dimension (GtkWidget *widget, - gtk_widget_get_preferred_height (tmp_widget, &min_dimension, &nat_dimension); - } - -- if (gtk_widget_get_mapped (tmp_widget) || !priv->ignore_hidden) -- { -- min_result = MAX (min_result, min_dimension); -- nat_result = MAX (nat_result, nat_dimension); -- } -+ min_result = MAX (min_result, min_dimension); -+ nat_result = MAX (nat_result, nat_dimension); - - tmp_list = tmp_list->next; - } -diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c -index 3738d02..3d06ee4 100644 ---- a/gtk/gtktexthandle.c -+++ b/gtk/gtktexthandle.c -@@ -122,49 +122,43 @@ _gtk_text_handle_draw (GtkTextHandle *handle, - } - - static void --_gtk_text_handle_update_shape (GtkTextHandle *handle, -- GdkWindow *window) -+_gtk_text_handle_update_shape (GtkTextHandle *handle, -+ GdkWindow *window, -+ GtkTextHandlePosition pos) - { - GtkTextHandlePrivate *priv; -+ cairo_surface_t *surface; -+ cairo_region_t *region; -+ cairo_t *cr; - - priv = handle->priv; - -+ surface = -+ gdk_window_create_similar_surface (window, -+ CAIRO_CONTENT_COLOR_ALPHA, -+ gdk_window_get_width (window), -+ gdk_window_get_height (window)); -+ -+ cr = cairo_create (surface); -+ _gtk_text_handle_draw (handle, cr, pos); -+ cairo_destroy (cr); -+ -+ region = gdk_cairo_region_create_from_surface (surface); -+ - if (gtk_widget_is_composited (priv->parent)) - gdk_window_shape_combine_region (window, NULL, 0, 0); - else -- { -- GtkTextHandlePosition pos; -- cairo_surface_t *surface; -- cairo_region_t *region; -- cairo_t *cr; -- -- if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window) -- pos = GTK_TEXT_HANDLE_POSITION_SELECTION_START; -- else if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window) -- pos = GTK_TEXT_HANDLE_POSITION_SELECTION_END; -- else -- return; -+ gdk_window_shape_combine_region (window, region, 0, 0); - -- surface = -- gdk_window_create_similar_surface (window, -- CAIRO_CONTENT_COLOR_ALPHA, -- gdk_window_get_width (window), -- gdk_window_get_height (window)); -+ gdk_window_input_shape_combine_region (window, region, 0, 0); - -- cr = cairo_create (surface); -- _gtk_text_handle_draw (handle, cr, pos); -- cairo_destroy (cr); -- -- region = gdk_cairo_region_create_from_surface (surface); -- gdk_window_shape_combine_region (window, region, 0, 0); -- -- cairo_surface_destroy (surface); -- cairo_region_destroy (region); -- } -+ cairo_surface_destroy (surface); -+ cairo_region_destroy (region); - } - - static GdkWindow * --_gtk_text_handle_create_window (GtkTextHandle *handle) -+_gtk_text_handle_create_window (GtkTextHandle *handle, -+ GtkTextHandlePosition pos) - { - GtkTextHandlePrivate *priv; - GdkRGBA bg = { 0, 0, 0, 0 }; -@@ -200,7 +194,7 @@ _gtk_text_handle_create_window (GtkTextHandle *handle) - gdk_window_set_user_data (window, priv->parent); - gdk_window_set_background_rgba (window, &bg); - -- _gtk_text_handle_update_shape (handle, window); -+ _gtk_text_handle_update_shape (handle, window, pos); - - return window; - } -@@ -307,7 +301,7 @@ _gtk_text_handle_update_window (GtkTextHandle *handle, - gdk_window_destroy (handle_window->window); - - /* Create new window and apply old state */ -- handle_window->window = _gtk_text_handle_create_window (handle); -+ handle_window->window = _gtk_text_handle_create_window (handle, pos); - - if (visible) - { -@@ -531,9 +525,9 @@ _gtk_text_handle_set_relative_to (GtkTextHandle *handle, - { - priv->relative_to = g_object_ref (window); - priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window = -- _gtk_text_handle_create_window (handle); -+ _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_START); - priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window = -- _gtk_text_handle_create_window (handle); -+ _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_END); - priv->realized = TRUE; - } - else -@@ -580,6 +574,10 @@ _gtk_text_handle_set_mode (GtkTextHandle *handle, - } - - priv->mode = mode; -+ -+ _gtk_text_handle_update_shape (handle, -+ priv->windows[GTK_TEXT_HANDLE_POSITION_CURSOR].window, -+ GTK_TEXT_HANDLE_POSITION_CURSOR); - } - - GtkTextHandleMode -diff --git a/po/ga.po b/po/ga.po -index d0faad3..8d66617 100644 ---- a/po/ga.po -+++ b/po/ga.po -@@ -4,14 +4,14 @@ - # Seán Ă“ Ceallaigh <soc@users.sourceforge.net>, 1999. - # Alastair McKinstry <mckinstry@computer.org>, 2004. - # Alan Horkan <horkan@maths.tcd.ie>, 2005. --# Seán de BĂşrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010. -+# Seán de BĂşrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010, 2012. - # - msgid "" - msgstr "" - "Project-Id-Version: gtk+.master\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-10-01 15:41-0400\n" --"PO-Revision-Date: 2010-06-08 12:30-0600\n" -+"POT-Creation-Date: 2012-11-02 03:00-0600\n" -+"PO-Revision-Date: 2012-11-02 03:16-0600\n" - "Last-Translator: Seán de BĂşrca <leftmostcat@gmail.com>\n" - "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" - "Language: ga\n" -@@ -20,303 +20,436 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n" - "%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n" -+"X-Generator: Gtranslator 2.91.5\n" - --#: gdk/gdk.c:103 -+#: ../gdk/gdk.c:155 - #, c-format - msgid "Error parsing option --gdk-debug" - msgstr "Earráid agus rogha --gdk-debug á parsáil" - --#: gdk/gdk.c:123 -+#: ../gdk/gdk.c:175 - #, c-format - msgid "Error parsing option --gdk-no-debug" - msgstr "Earráid agus rogha --gdk-no-debug á parsáil" - - #. Description of --class=CLASS in --help output --#: gdk/gdk.c:151 -+#: ../gdk/gdk.c:203 - msgid "Program class as used by the window manager" - msgstr "Aicme chláir mar Ăşsáidte leis an mbainisteoir fuinneoga" - - #. Placeholder in --class=CLASS in --help output --#: gdk/gdk.c:152 -+#: ../gdk/gdk.c:204 - msgid "CLASS" - msgstr "AICME" - - #. Description of --name=NAME in --help output --#: gdk/gdk.c:154 -+#: ../gdk/gdk.c:206 - msgid "Program name as used by the window manager" - msgstr "Ainm cláir mar Ăşsáidte leis an mbainisteoir fuinneoga" - - #. Placeholder in --name=NAME in --help output --#: gdk/gdk.c:155 -+#: ../gdk/gdk.c:207 - msgid "NAME" - msgstr "AINM" - - #. Description of --display=DISPLAY in --help output --#: gdk/gdk.c:157 -+#: ../gdk/gdk.c:209 - msgid "X display to use" - msgstr "Taispeáint X le hĂşsáid" - - #. Placeholder in --display=DISPLAY in --help output --#: gdk/gdk.c:158 -+#: ../gdk/gdk.c:210 - msgid "DISPLAY" - msgstr "TAISPEĂINT" - --#. Description of --screen=SCREEN in --help output --#: gdk/gdk.c:160 --msgid "X screen to use" --msgstr "Scáileán X le hĂşsáid" -- --#. Placeholder in --screen=SCREEN in --help output --#: gdk/gdk.c:161 --msgid "SCREEN" --msgstr "SCĂILEĂN" -- - #. Description of --gdk-debug=FLAGS in --help output --#: gdk/gdk.c:164 --#, fuzzy -+#: ../gdk/gdk.c:213 - msgid "GDK debugging flags to set" --msgstr "Bratacha dĂfhabhtaithe GTK+ a shocrĂş" -+msgstr "Bratacha dĂfhabhtaithe GTK+ le socrĂş" - - #. Placeholder in --gdk-debug=FLAGS in --help output - #. Placeholder in --gdk-no-debug=FLAGS in --help output - #. Placeholder in --gtk-debug=FLAGS in --help output - #. Placeholder in --gtk-no-debug=FLAGS in --help output --#: gdk/gdk.c:165 gdk/gdk.c:168 gtk/gtkmain.c:533 gtk/gtkmain.c:536 -+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457 - msgid "FLAGS" - msgstr "BRATACHA" - - #. Description of --gdk-no-debug=FLAGS in --help output --#: gdk/gdk.c:167 --#, fuzzy -+#: ../gdk/gdk.c:216 - msgid "GDK debugging flags to unset" --msgstr "Bratacha dĂfhabhtaithe GTK+ a dhĂshocrĂş" -+msgstr "Bratacha dĂfhabhtaithe GTK+ le dĂshocrĂş" - --#: gdk/keyname-table.h:3940 -+#. -+#. * Translators, the strings in the 'keyboard label' context are -+#. * display names for keyboard keys. Some of them have prefixes like -+#. * XF86 or ISO_ - these should be removed in the translation. Similarly, -+#. * underscores should be replaced by spaces. The prefix 'KP_' stands -+#. * for 'key pad' and you may want to include that in your translation. -+#. * Here are some examples of English translations: -+#. * XF86AudioMute - Audio mute -+#. * Scroll_lock - Scroll lock -+#. * KP_Space - Space (keypad) -+#. * Page_Up - Page up -+#. -+#: ../gdk/keyname-table.h:3952 - msgctxt "keyboard label" - msgid "BackSpace" - msgstr "BackSpace" - --#: gdk/keyname-table.h:3941 -+#: ../gdk/keyname-table.h:3953 - msgctxt "keyboard label" - msgid "Tab" - msgstr "Tab" - --#: gdk/keyname-table.h:3942 -+#: ../gdk/keyname-table.h:3954 - msgctxt "keyboard label" - msgid "Return" - msgstr "Return" - --#: gdk/keyname-table.h:3943 -+#: ../gdk/keyname-table.h:3955 - msgctxt "keyboard label" - msgid "Pause" - msgstr "Pause" - --#: gdk/keyname-table.h:3944 -+#: ../gdk/keyname-table.h:3956 - msgctxt "keyboard label" - msgid "Scroll_Lock" - msgstr "Scroll_Lock" - --#: gdk/keyname-table.h:3945 -+#: ../gdk/keyname-table.h:3957 - msgctxt "keyboard label" - msgid "Sys_Req" - msgstr "Sys_Req" - --#: gdk/keyname-table.h:3946 -+#: ../gdk/keyname-table.h:3958 - msgctxt "keyboard label" - msgid "Escape" - msgstr "Escape" - --#: gdk/keyname-table.h:3947 -+#: ../gdk/keyname-table.h:3959 - msgctxt "keyboard label" - msgid "Multi_key" - msgstr "Multi_key" - --#: gdk/keyname-table.h:3948 -+#: ../gdk/keyname-table.h:3960 - msgctxt "keyboard label" - msgid "Home" - msgstr "Home" - --#: gdk/keyname-table.h:3949 -+#: ../gdk/keyname-table.h:3961 - msgctxt "keyboard label" - msgid "Left" - msgstr "Left" - --#: gdk/keyname-table.h:3950 -+#: ../gdk/keyname-table.h:3962 - msgctxt "keyboard label" - msgid "Up" - msgstr "Up" - --#: gdk/keyname-table.h:3951 -+#: ../gdk/keyname-table.h:3963 - msgctxt "keyboard label" - msgid "Right" - msgstr "Right" - --#: gdk/keyname-table.h:3952 -+#: ../gdk/keyname-table.h:3964 - msgctxt "keyboard label" - msgid "Down" - msgstr "Down" - --#: gdk/keyname-table.h:3953 -+#: ../gdk/keyname-table.h:3965 - msgctxt "keyboard label" - msgid "Page_Up" - msgstr "Page_Up" - --#: gdk/keyname-table.h:3954 -+#: ../gdk/keyname-table.h:3966 - msgctxt "keyboard label" - msgid "Page_Down" - msgstr "Page_Down" - --#: gdk/keyname-table.h:3955 -+#: ../gdk/keyname-table.h:3967 - msgctxt "keyboard label" - msgid "End" - msgstr "End" - --#: gdk/keyname-table.h:3956 -+#: ../gdk/keyname-table.h:3968 - msgctxt "keyboard label" - msgid "Begin" - msgstr "Begin" - --#: gdk/keyname-table.h:3957 -+#: ../gdk/keyname-table.h:3969 - msgctxt "keyboard label" - msgid "Print" - msgstr "Print" - --#: gdk/keyname-table.h:3958 -+#: ../gdk/keyname-table.h:3970 - msgctxt "keyboard label" - msgid "Insert" - msgstr "Insert" - --#: gdk/keyname-table.h:3959 -+#: ../gdk/keyname-table.h:3971 - msgctxt "keyboard label" - msgid "Num_Lock" - msgstr "Num_Lock" - --#: gdk/keyname-table.h:3960 -+#. Translators: KP_ means 'key pad' here -+#: ../gdk/keyname-table.h:3973 - msgctxt "keyboard label" - msgid "KP_Space" - msgstr "KP_Space" - --#: gdk/keyname-table.h:3961 -+#: ../gdk/keyname-table.h:3974 - msgctxt "keyboard label" - msgid "KP_Tab" - msgstr "KP_Tab" - --#: gdk/keyname-table.h:3962 -+#: ../gdk/keyname-table.h:3975 - msgctxt "keyboard label" - msgid "KP_Enter" - msgstr "KP_Enter" - --#: gdk/keyname-table.h:3963 -+#: ../gdk/keyname-table.h:3976 - msgctxt "keyboard label" - msgid "KP_Home" - msgstr "KP_Home" - --#: gdk/keyname-table.h:3964 -+#: ../gdk/keyname-table.h:3977 - msgctxt "keyboard label" - msgid "KP_Left" - msgstr "KP_Left" - --#: gdk/keyname-table.h:3965 -+#: ../gdk/keyname-table.h:3978 - msgctxt "keyboard label" - msgid "KP_Up" - msgstr "KP_Up" - --#: gdk/keyname-table.h:3966 -+#: ../gdk/keyname-table.h:3979 - msgctxt "keyboard label" - msgid "KP_Right" - msgstr "KP_Right" - --#: gdk/keyname-table.h:3967 -+#: ../gdk/keyname-table.h:3980 - msgctxt "keyboard label" - msgid "KP_Down" - msgstr "KP_Down" - --#: gdk/keyname-table.h:3968 -+#: ../gdk/keyname-table.h:3981 - msgctxt "keyboard label" - msgid "KP_Page_Up" - msgstr "KP_Page_Up" - --#: gdk/keyname-table.h:3969 -+#: ../gdk/keyname-table.h:3982 - msgctxt "keyboard label" - msgid "KP_Prior" - msgstr "KP_Prior" - --#: gdk/keyname-table.h:3970 -+#: ../gdk/keyname-table.h:3983 - msgctxt "keyboard label" - msgid "KP_Page_Down" - msgstr "KP_Page_Down" - --#: gdk/keyname-table.h:3971 -+#: ../gdk/keyname-table.h:3984 - msgctxt "keyboard label" - msgid "KP_Next" - msgstr "KP_Next" - --#: gdk/keyname-table.h:3972 -+#: ../gdk/keyname-table.h:3985 - msgctxt "keyboard label" - msgid "KP_End" - msgstr "KP_End" - --#: gdk/keyname-table.h:3973 -+#: ../gdk/keyname-table.h:3986 - msgctxt "keyboard label" - msgid "KP_Begin" - msgstr "KP_Begin" - --#: gdk/keyname-table.h:3974 -+#: ../gdk/keyname-table.h:3987 - msgctxt "keyboard label" - msgid "KP_Insert" - msgstr "KP_Insert" - --#: gdk/keyname-table.h:3975 -+#: ../gdk/keyname-table.h:3988 - msgctxt "keyboard label" - msgid "KP_Delete" - msgstr "KP_Delete" - --#: gdk/keyname-table.h:3976 -+#: ../gdk/keyname-table.h:3989 - msgctxt "keyboard label" - msgid "Delete" - msgstr "Delete" - -+#. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed -+#: ../gdk/keyname-table.h:3991 -+msgctxt "keyboard label" -+msgid "XF86MonBrightnessUp" -+msgstr "XF86MonBrightnessUp" -+ -+#: ../gdk/keyname-table.h:3992 -+msgctxt "keyboard label" -+msgid "XF86MonBrightnessDown" -+msgstr "XF86MonBrightnessDown" -+ -+#: ../gdk/keyname-table.h:3993 -+msgctxt "keyboard label" -+msgid "XF86AudioMute" -+msgstr "XF86AudioMute" -+ -+#: ../gdk/keyname-table.h:3994 -+msgctxt "keyboard label" -+msgid "XF86AudioLowerVolume" -+msgstr "XF86AudioLowerVolume" -+ -+#: ../gdk/keyname-table.h:3995 -+msgctxt "keyboard label" -+msgid "XF86AudioRaiseVolume" -+msgstr "XF86AudioRaiseVolume" -+ -+#: ../gdk/keyname-table.h:3996 -+msgctxt "keyboard label" -+msgid "XF86AudioPlay" -+msgstr "XF86AudioPlay" -+ -+#: ../gdk/keyname-table.h:3997 -+msgctxt "keyboard label" -+msgid "XF86AudioStop" -+msgstr "XF86AudioStop" -+ -+#: ../gdk/keyname-table.h:3998 -+msgctxt "keyboard label" -+msgid "XF86AudioNext" -+msgstr "XF86AudioNext" -+ -+#: ../gdk/keyname-table.h:3999 -+msgctxt "keyboard label" -+msgid "XF86AudioPrev" -+msgstr "XF86AudioPrev" -+ -+#: ../gdk/keyname-table.h:4000 -+msgctxt "keyboard label" -+msgid "XF86AudioRecord" -+msgstr "XF86AudioRecord" -+ -+#: ../gdk/keyname-table.h:4001 -+msgctxt "keyboard label" -+msgid "XF86AudioPause" -+msgstr "XF86AudioPause" -+ -+#: ../gdk/keyname-table.h:4002 -+msgctxt "keyboard label" -+msgid "XF86AudioRewind" -+msgstr "XF86AudioRewind" -+ -+#: ../gdk/keyname-table.h:4003 -+msgctxt "keyboard label" -+msgid "XF86AudioMedia" -+msgstr "XF86AudioMedia" -+ -+#: ../gdk/keyname-table.h:4004 -+msgctxt "keyboard label" -+msgid "XF86ScreenSaver" -+msgstr "XF86ScreenSaver" -+ -+#: ../gdk/keyname-table.h:4005 -+msgctxt "keyboard label" -+msgid "XF86Battery" -+msgstr "XF86Battery" -+ -+#: ../gdk/keyname-table.h:4006 -+msgctxt "keyboard label" -+msgid "XF86Launch1" -+msgstr "XF86Launch1" -+ -+#: ../gdk/keyname-table.h:4007 -+msgctxt "keyboard label" -+msgid "XF86Forward" -+msgstr "XF86Forward" -+ -+#: ../gdk/keyname-table.h:4008 -+msgctxt "keyboard label" -+msgid "XF86Back" -+msgstr "XF86Back" -+ -+#: ../gdk/keyname-table.h:4009 -+msgctxt "keyboard label" -+msgid "XF86Sleep" -+msgstr "XF86Sleep" -+ -+#: ../gdk/keyname-table.h:4010 -+msgctxt "keyboard label" -+msgid "XF86Hibernate" -+msgstr "XF86Hibernate" -+ -+#: ../gdk/keyname-table.h:4011 -+msgctxt "keyboard label" -+msgid "XF86WLAN" -+msgstr "XF86WLAN" -+ -+#: ../gdk/keyname-table.h:4012 -+msgctxt "keyboard label" -+msgid "XF86WebCam" -+msgstr "XF86WebCam" -+ -+#: ../gdk/keyname-table.h:4013 -+msgctxt "keyboard label" -+msgid "XF86Display" -+msgstr "XF86Display" -+ -+#: ../gdk/keyname-table.h:4014 -+msgctxt "keyboard label" -+msgid "XF86TouchpadToggle" -+msgstr "XF86TouchpadToggle" -+ -+#: ../gdk/keyname-table.h:4015 -+msgctxt "keyboard label" -+msgid "XF86WakeUp" -+msgstr "XF86WakeUp" -+ -+#: ../gdk/keyname-table.h:4016 -+msgctxt "keyboard label" -+msgid "XF86Suspend" -+msgstr "XF86Suspend" -+ - #. Description of --sync in --help output --#: gdk/win32/gdkmain-win32.c:54 -+#: ../gdk/win32/gdkmain-win32.c:53 - msgid "Don't batch GDI requests" - msgstr "Ná baisc iarratais GDI" - - #. Description of --no-wintab in --help output --#: gdk/win32/gdkmain-win32.c:56 -+#: ../gdk/win32/gdkmain-win32.c:55 - msgid "Don't use the Wintab API for tablet support" - msgstr "Ná hĂşsáid an API Wintab le tacaĂocht táiblĂ©id" - - #. Description of --ignore-wintab in --help output --#: gdk/win32/gdkmain-win32.c:58 -+#: ../gdk/win32/gdkmain-win32.c:57 - msgid "Same as --no-wintab" - msgstr "CĂ©anna le --no-wintab" - - #. Description of --use-wintab in --help output --#: gdk/win32/gdkmain-win32.c:60 -+#: ../gdk/win32/gdkmain-win32.c:59 - msgid "Do use the Wintab API [default]" - msgstr "Ăšsáid an API Wintab [rĂ©amhshocrĂş]" - - #. Description of --max-colors=COLORS in --help output --#: gdk/win32/gdkmain-win32.c:62 -+#: ../gdk/win32/gdkmain-win32.c:61 - msgid "Size of the palette in 8 bit mode" - msgstr "MĂ©id an phailĂ©id sa mhĂłd 8-giotán" - - #. Placeholder in --max-colors=COLORS in --help output --#: gdk/win32/gdkmain-win32.c:63 -+#: ../gdk/win32/gdkmain-win32.c:62 - msgid "COLORS" - msgstr "DATHANNA" - --#: gdk/x11/gdkapplaunchcontext-x11.c:312 -+#: ../gdk/x11/gdkapplaunchcontext-x11.c:292 - #, c-format - msgid "Starting %s" - msgstr "%s á ThosĂş" - --#: gdk/x11/gdkapplaunchcontext-x11.c:316 -+#: ../gdk/x11/gdkapplaunchcontext-x11.c:305 - #, c-format - msgid "Opening %s" - msgstr "%s á Oscailt" - --#: gdk/x11/gdkapplaunchcontext-x11.c:321 -+#: ../gdk/x11/gdkapplaunchcontext-x11.c:310 - #, c-format - msgid "Opening %d Item" - msgid_plural "Opening %d Items" -@@ -326,63 +459,245 @@ msgstr[2] "%d MhĂr á Oscailt" - msgstr[3] "%d MĂr á Oscailt" - msgstr[4] "%d MĂr á Oscailt" - --#. Description of --sync in --help output --#: gdk/x11/gdkmain-x11.c:96 --msgid "Make X calls synchronous" --msgstr "DĂ©an sioncronach glaonna X" -+#: ../gtk/a11y/gtkspinneraccessible.c:40 -+msgctxt "throbbing progress animation widget" -+msgid "Spinner" -+msgstr "" -+ -+#: ../gtk/a11y/gtkspinneraccessible.c:41 -+msgid "Provides visual indication of progress" -+msgstr "" -+ -+#: ../gtk/a11y/gtkswitchaccessible.c:63 -+msgctxt "light switch widget" -+msgid "Switch" -+msgstr "Lasc" -+ -+#: ../gtk/a11y/gtkswitchaccessible.c:64 -+msgid "Switches between on and off states" -+msgstr "" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:425 -+msgid "" -+"Select the color you want from the outer ring. Select the darkness or " -+"lightness of that color using the inner triangle." -+msgstr "" -+"Roghnaigh an dath atá uait Ăłn bhfáinne amuigh. Roghnaigh dorchadas nĂł gile " -+"an datha sin leis an triantán istigh." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:451 -+msgid "" -+"Click the eyedropper, then click a color anywhere on your screen to select " -+"that color." -+msgstr "" -+"Cliceáil an titimeán sĂşile, agus ansin cliceáil dath áit ar bith ar do " -+"scáileán chun an dath sin a roghnĂş." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:461 -+msgid "_Hue:" -+msgstr "_LĂ:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:462 -+msgid "Position on the color wheel." -+msgstr "Ionad ar roth na ndathanna." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:464 -+msgid "S_aturation:" -+msgstr "_SáithiĂş:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:465 -+msgid "Intensity of the color." -+msgstr "DĂ©ine an datha." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:466 -+msgid "_Value:" -+msgstr "L_uach:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:467 -+msgid "Brightness of the color." -+msgstr "Gile an datha." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:468 -+msgid "_Red:" -+msgstr "_Dearg:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:469 -+msgid "Amount of red light in the color." -+msgstr "MĂ©id sholais dhearg sa dath." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:470 -+msgid "_Green:" -+msgstr "_Uaine:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:471 -+msgid "Amount of green light in the color." -+msgstr "MĂ©id sholais uaine sa dath." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:472 -+msgid "_Blue:" -+msgstr "_Gorm:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:473 -+msgid "Amount of blue light in the color." -+msgstr "MĂ©id sholais ghorm sa dath." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:476 -+msgid "Op_acity:" -+msgstr "Teimhne_acht:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:484 ../gtk/deprecated/gtkcolorsel.c:494 -+msgid "Transparency of the color." -+msgstr "TrĂ©dhearcacht an datha." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:501 -+msgid "Color _name:" -+msgstr "Ai_nm datha:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:516 -+msgid "" -+"You can enter an HTML-style hexadecimal color value, or simply a color name " -+"such as 'orange' in this entry." -+msgstr "" -+"Is fĂ©idir leat luach datha heicsidheachĂşlach ar stĂl HTML a iontráil, nĂł " -+"ainm datha mar shampla 'orange' a iontráil san iontráil seo." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:548 -+msgid "_Palette:" -+msgstr "_PailĂ©ad:" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:578 -+msgid "Color Wheel" -+msgstr "Roth na nDathanna" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:1072 -+msgid "" -+"The previously-selected color, for comparison to the color you're selecting " -+"now. You can drag this color to a palette entry, or select this color as " -+"current by dragging it to the other color swatch alongside." -+msgstr "" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:1078 -+msgid "" -+"The color you've chosen. You can drag this color to a palette entry to save " -+"it for use in the future." -+msgstr "" -+"An dath atá roghnaithe agat. Is fĂ©idir leat an dath seo a tharraingt go " -+"hiontráil pailĂ©id chun Ă© a shábháil le haghaidh Ăşsáide san am atá le teacht." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:1084 -+msgid "" -+"The previously-selected color, for comparison to the color you're selecting " -+"now." -+msgstr "" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:1088 -+msgid "The color you've chosen." -+msgstr "An dath atá roghnaithe agat." -+ -+#: ../gtk/deprecated/gtkcolorsel.c:1491 -+msgid "_Save color here" -+msgstr "_Sábháil dath anseo" -+ -+#: ../gtk/deprecated/gtkcolorsel.c:1695 -+msgid "" -+"Click this palette entry to make it the current color. To change this entry, " -+"drag a color swatch here or right-click it and select \"Save color here.\"" -+msgstr "" -+ -+#. We emit the response for the Select button manually, -+#. * since we want to save the color first -+#. -+#: ../gtk/deprecated/gtkcolorseldialog.c:201 ../gtk/gtkappchooserdialog.c:574 -+#: ../gtk/gtkcolorchooserdialog.c:150 ../gtk/gtkfontchooserdialog.c:174 -+#: ../gtk/gtkprinteroptionwidget.c:550 -+msgid "_Select" -+msgstr "_Roghnaigh" -+ -+#: ../gtk/deprecated/gtkcolorseldialog.c:219 -+msgid "Color Selection" -+msgstr "RoghnĂş Datha" -+ -+#. This is the default text shown in the preview entry, though the user -+#. can set it. Remember that some fonts only have capital letters. -+#: ../gtk/deprecated/gtkfontsel.c:124 -+msgid "abcdefghijk ABCDEFGHIJK" -+msgstr "aábcdeĂ©fghiĂ AĂBCDEÉFGHIĂŤ" -+ -+#: ../gtk/deprecated/gtkfontsel.c:393 -+msgid "_Family:" -+msgstr "_Clann:" -+ -+#: ../gtk/deprecated/gtkfontsel.c:400 -+msgid "_Style:" -+msgstr "_StĂl:" -+ -+#: ../gtk/deprecated/gtkfontsel.c:407 -+msgid "Si_ze:" -+msgstr "_MĂ©id:" -+ -+#. create the text entry widget -+#: ../gtk/deprecated/gtkfontsel.c:584 -+msgid "_Preview:" -+msgstr "_RĂ©amhamharc:" -+ -+#: ../gtk/deprecated/gtkfontsel.c:1720 ../gtk/gtkfontchooserdialog.c:183 -+msgid "Font Selection" -+msgstr "RoghnĂş ClĂł" - - #. Translators: this is the license preamble; the string at the end - #. * contains the URL of the license. - #. --#: gtk/gtkaboutdialog.c:101 -+#: ../gtk/gtkaboutdialog.c:104 - #, c-format --msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s" -+msgid "" -+"This program comes with ABSOLUTELY NO WARRANTY;\n" -+"for details, visit <a href=\"%s\">%s</a>" - msgstr "" - --#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235 -+#: ../gtk/gtkaboutdialog.c:357 - msgid "License" - msgstr "CeadĂşnas" - --#: gtk/gtkaboutdialog.c:340 -+#: ../gtk/gtkaboutdialog.c:358 - msgid "The license of the program" - msgstr "CeadĂşnas an chláir" - - #. Add the credits button --#: gtk/gtkaboutdialog.c:621 -+#: ../gtk/gtkaboutdialog.c:751 - msgid "C_redits" - msgstr "_Admhálacha" - - #. Add the license button --#: gtk/gtkaboutdialog.c:635 -+#: ../gtk/gtkaboutdialog.c:764 - msgid "_License" - msgstr "_CeadĂşnas" - --#: gtk/gtkaboutdialog.c:839 -+#: ../gtk/gtkaboutdialog.c:980 - msgid "Could not show link" - msgstr "NĂorbh fhĂ©idir nasc a thaispeáint" - --#: gtk/gtkaboutdialog.c:932 -+#: ../gtk/gtkaboutdialog.c:1017 -+msgid "Homepage" -+msgstr "Leathanach Baile" -+ -+#: ../gtk/gtkaboutdialog.c:1071 - #, c-format - msgid "About %s" - msgstr "Maidir le %s" - --#: gtk/gtkaboutdialog.c:2153 --msgid "Credits" --msgstr "Admhálacha" -+#: ../gtk/gtkaboutdialog.c:2399 -+msgid "Created by" -+msgstr "Cruthaithe ag" - --#: gtk/gtkaboutdialog.c:2185 --msgid "Written by" --msgstr "ScrĂofa ag" -- --#: gtk/gtkaboutdialog.c:2188 -+#: ../gtk/gtkaboutdialog.c:2402 - msgid "Documented by" - msgstr "DoicimĂ©adaithe ag" - --#: gtk/gtkaboutdialog.c:2200 -+#: ../gtk/gtkaboutdialog.c:2412 - msgid "Translated by" - msgstr "Aistrithe ag" - --#: gtk/gtkaboutdialog.c:2204 -+#: ../gtk/gtkaboutdialog.c:2417 - msgid "Artwork by" - msgstr "MaisiĂşchán le" - -@@ -391,7 +706,7 @@ msgstr "MaisiĂşchán le" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: gtk/gtkaccellabel.c:160 -+#: ../gtk/gtkaccellabel.c:159 - msgctxt "keyboard label" - msgid "Shift" - msgstr "Shift" -@@ -401,7 +716,7 @@ msgstr "Shift" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: gtk/gtkaccellabel.c:166 -+#: ../gtk/gtkaccellabel.c:165 - msgctxt "keyboard label" - msgid "Ctrl" - msgstr "Ctrl" -@@ -411,7 +726,7 @@ msgstr "Ctrl" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: gtk/gtkaccellabel.c:172 -+#: ../gtk/gtkaccellabel.c:171 - msgctxt "keyboard label" - msgid "Alt" - msgstr "Alt" -@@ -421,7 +736,7 @@ msgstr "Alt" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: gtk/gtkaccellabel.c:770 -+#: ../gtk/gtkaccellabel.c:805 - msgctxt "keyboard label" - msgid "Super" - msgstr "Super" -@@ -431,7 +746,7 @@ msgstr "Super" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: gtk/gtkaccellabel.c:783 -+#: ../gtk/gtkaccellabel.c:818 - msgctxt "keyboard label" - msgid "Hyper" - msgstr "Hyper" -@@ -441,37 +756,162 @@ msgstr "Hyper" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: gtk/gtkaccellabel.c:797 -+#: ../gtk/gtkaccellabel.c:832 - msgctxt "keyboard label" - msgid "Meta" - msgstr "Meta" - --#: gtk/gtkaccellabel.c:813 -+#: ../gtk/gtkaccellabel.c:848 - msgctxt "keyboard label" - msgid "Space" - msgstr "Space" - --#: gtk/gtkaccellabel.c:816 -+#: ../gtk/gtkaccellabel.c:851 - msgctxt "keyboard label" - msgid "Backslash" - msgstr "Backslash" - --#: gtk/gtkbuilderparser.c:343 -+#: ../gtk/gtkappchooserbutton.c:290 -+msgid "Other application..." -+msgstr "Feidhmchlár eile..." -+ -+#: ../gtk/gtkappchooserdialog.c:137 -+msgid "Failed to look for applications online" -+msgstr "" -+ -+#: ../gtk/gtkappchooserdialog.c:188 -+msgid "_Find applications online" -+msgstr "" -+ -+#: ../gtk/gtkappchooserdialog.c:247 -+#, fuzzy -+msgid "Could not run application" -+msgstr "NĂorbh fhĂ©idir liosta a ghlanadh" -+ -+#: ../gtk/gtkappchooserdialog.c:260 -+#, fuzzy, c-format -+msgid "Could not find '%s'" -+msgstr "NĂorbh fhĂ©idir %s a ghlĂ©asadh" -+ -+#: ../gtk/gtkappchooserdialog.c:263 -+#, fuzzy -+msgid "Could not find application" -+msgstr "NĂorbh fhĂ©idir nasc a thaispeáint" -+ -+#. Translators: %s is a filename -+#: ../gtk/gtkappchooserdialog.c:397 -+#, c-format -+msgid "Select an application to open \"%s\"" -+msgstr "" -+ -+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657 -+#, c-format -+msgid "No applications available to open \"%s\"" -+msgstr "" -+ -+#. Translators: %s is a file type description -+#: ../gtk/gtkappchooserdialog.c:404 -+#, c-format -+msgid "Select an application for \"%s\" files" -+msgstr "" -+ -+#: ../gtk/gtkappchooserdialog.c:406 -+#, c-format -+msgid "No applications available to open \"%s\" files" -+msgstr "" -+ -+#: ../gtk/gtkappchooserdialog.c:422 -+msgid "" -+"Click \"Show other applications\", for more options, or \"Find applications " -+"online\" to install a new application" -+msgstr "" -+ -+#: ../gtk/gtkappchooserdialog.c:492 -+#, fuzzy -+msgid "Forget association" -+msgstr "DĂ©an _dearmad ar an bhfocal faire láithreach" -+ -+#: ../gtk/gtkappchooserdialog.c:558 -+msgid "Show other applications" -+msgstr "Taispeáin feidhmchláir eile" -+ -+#: ../gtk/gtkappchooserwidget.c:606 -+msgid "Default Application" -+msgstr "Feidhmchlár RĂ©amhshocraithe" -+ -+#: ../gtk/gtkappchooserwidget.c:744 -+#, fuzzy -+msgid "Recommended Applications" -+msgstr "Feidhmchlár" -+ -+#: ../gtk/gtkappchooserwidget.c:759 -+#, fuzzy -+msgid "Related Applications" -+msgstr "Feidhmchlár" -+ -+#: ../gtk/gtkappchooserwidget.c:773 -+msgid "Other Applications" -+msgstr "Feidhmchláir Eile" -+ -+#: ../gtk/gtkapplication.c:1558 -+#, c-format -+msgid "" -+"%s cannot quit at this time:\n" -+"\n" -+"%s" -+msgstr "" -+ -+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480 -+#: ../gtk/gtkprintoperation-win32.c:1445 -+msgid "Application" -+msgstr "Feidhmchlár" -+ -+#: ../gtk/gtkassistant.c:1008 -+#, fuzzy -+msgid "C_ontinue" -+msgstr "_Nasc" -+ -+#: ../gtk/gtkassistant.c:1011 -+#, fuzzy -+msgid "Go _Back" -+msgstr "Ar A_is" -+ -+#: ../gtk/gtkassistant.c:1015 -+#, fuzzy -+msgid "_Finish" -+msgstr "CrĂochnaithe" -+ -+#: ../gtk/gtkbuilder-menus.c:220 -+#, fuzzy, c-format -+msgid "Element <%s> not allowed inside <%s>" -+msgstr "NĂ cheadaĂtear an eilimint <%s> faoi <%s>" -+ -+#: ../gtk/gtkbuilder-menus.c:225 -+#, fuzzy, c-format -+msgid "Element <%s> not allowed at toplevel" -+msgstr "NĂ cheadaĂtear an eilimint <%s> faoi <%s>" -+ -+#: ../gtk/gtkbuilder-menus.c:314 -+#, c-format -+msgid "text may not appear inside <%s>" -+msgstr "" -+ -+#: ../gtk/gtkbuilderparser.c:341 - #, c-format - msgid "Invalid type function on line %d: '%s'" - msgstr "Feidhm chineáil neamhbhailĂ ar lĂne %d: '%s'" - --#: gtk/gtkbuilderparser.c:407 -+#: ../gtk/gtkbuilderparser.c:405 - #, c-format - msgid "Duplicate object ID '%s' on line %d (previously on line %d)" - msgstr "" - --#: gtk/gtkbuilderparser.c:859 -+#: ../gtk/gtkbuilderparser.c:865 - #, c-format - msgid "Invalid root element: '%s'" - msgstr "FrĂ©amheilimint neamhbhailĂ: '%s'" - --#: gtk/gtkbuilderparser.c:898 -+#: ../gtk/gtkbuilderparser.c:906 - #, c-format - msgid "Unhandled tag: '%s'" - msgstr "Clib gan láimhseáil: '%s'" -@@ -486,7 +926,7 @@ msgstr "Clib gan láimhseáil: '%s'" - #. * text direction of RTL and specify "calendar:YM", then the year - #. * will appear to the right of the month. - #. --#: gtk/gtkcalendar.c:883 -+#: ../gtk/gtkcalendar.c:872 - msgid "calendar:MY" - msgstr "calendar:MY" - -@@ -494,7 +934,7 @@ msgstr "calendar:MY" - #. * first day of the week to calendar:week_start:1 if you want Monday - #. * to be the first day of the week, and so on. - #. --#: gtk/gtkcalendar.c:921 -+#: ../gtk/gtkcalendar.c:910 - msgid "calendar:week_start:0" - msgstr "calendar:week_start:0" - -@@ -503,7 +943,7 @@ msgstr "calendar:week_start:0" - #. * - #. * If you don't understand this, leave it as "2000" - #. --#: gtk/gtkcalendar.c:2006 -+#: ../gtk/gtkcalendar.c:1910 - msgctxt "year measurement template" - msgid "2000" - msgstr "2000" -@@ -518,7 +958,7 @@ msgstr "2000" - #. * digits. That needs support from your system and locale definition - #. * too. - #. --#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719 -+#: ../gtk/gtkcalendar.c:1941 ../gtk/gtkcalendar.c:2633 - #, c-format - msgctxt "calendar:day:digits" - msgid "%d" -@@ -534,7 +974,7 @@ msgstr "%d" - #. * digits. That needs support from your system and locale definition - #. * too. - #. --#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579 -+#: ../gtk/gtkcalendar.c:1973 ../gtk/gtkcalendar.c:2499 - #, c-format - msgctxt "calendar:week:digits" - msgid "%d" -@@ -550,7 +990,7 @@ msgstr "%d" - #. * - #. * "%Y" is appropriate for most locales. - #. --#: gtk/gtkcalendar.c:2361 -+#: ../gtk/gtkcalendar.c:2268 - msgctxt "calendar year format" - msgid "%Y" - msgstr "%Y" -@@ -558,7 +998,7 @@ msgstr "%Y" - #. This label is displayed in a treeview cell displaying - #. * a disabled accelerator key combination. - #. --#: gtk/gtkcellrendereraccel.c:272 -+#: ../gtk/gtkcellrendereraccel.c:282 - msgctxt "Accelerator" - msgid "Disabled" - msgstr "DĂchumasaithe" -@@ -567,7 +1007,7 @@ msgstr "DĂchumasaithe" - #. * an accelerator key combination that is not valid according - #. * to gtk_accelerator_valid(). - #. --#: gtk/gtkcellrendereraccel.c:282 -+#: ../gtk/gtkcellrendereraccel.c:292 - msgctxt "Accelerator" - msgid "Invalid" - msgstr "NeamhbhailĂ" -@@ -576,155 +1016,290 @@ msgstr "NeamhbhailĂ" - #. * an accelerator when the cell is clicked to change the - #. * acelerator. - #. --#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675 -+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747 - msgid "New accelerator..." - msgstr "Aicearra nua..." - --#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452 -+#: ../gtk/gtkcellrendererprogress.c:372 ../gtk/gtkcellrendererprogress.c:462 - #, c-format - msgctxt "progress bar label" - msgid "%d %%" - msgstr "%d %%" - --#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445 -+#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorbutton.c:449 - msgid "Pick a Color" - msgstr "Roghnaigh Dath" - --#: gtk/gtkcolorbutton.c:336 --msgid "Received invalid color data\n" --msgstr "Fuair sonraĂ datha neamhbhailĂ\n" -+#: ../gtk/gtkcolorchooserdialog.c:164 -+msgid "Select a Color" -+msgstr "Roghnaigh Dath" - --#: gtk/gtkcolorsel.c:384 --msgid "" --"Select the color you want from the outer ring. Select the darkness or " --"lightness of that color using the inner triangle." --msgstr "" --"Roghnaigh an dath atá uait Ăłn bhfáinne amuigh. Roghnaigh dorchadas nĂł gile " --"an datha sin leis an triantán istigh." -+#: ../gtk/gtkcolorchooserwidget.c:281 -+#, c-format -+msgid "Red %d%%, Green %d%%, Blue %d%%, Alpha %d%%" -+msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%, Alfa %d%%" - --#: gtk/gtkcolorsel.c:408 --msgid "" --"Click the eyedropper, then click a color anywhere on your screen to select " --"that color." -+#: ../gtk/gtkcolorchooserwidget.c:287 -+#, c-format -+msgid "Red %d%%, Green %d%%, Blue %d%%" -+msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%" -+ -+#: ../gtk/gtkcolorchooserwidget.c:360 -+#, c-format -+msgid "Color: %s" -+msgstr "Dath: %s" -+ -+#: ../gtk/gtkcolorchooserwidget.c:419 -+msgctxt "Color name" -+msgid "Light Scarlet Red" - msgstr "" --"Cliceáil an titimeán sĂşile, agus ansin cliceáil dath áit ar bith ar do " --"scáileán chun an dath sin a roghnĂş." - --#: gtk/gtkcolorsel.c:417 --msgid "_Hue:" --msgstr "_LĂ:" -+#: ../gtk/gtkcolorchooserwidget.c:420 -+msgctxt "Color name" -+msgid "Scarlet Red" -+msgstr "" - --#: gtk/gtkcolorsel.c:418 --msgid "Position on the color wheel." --msgstr "Ionad ar roth na ndathanna." -+#: ../gtk/gtkcolorchooserwidget.c:421 -+msgctxt "Color name" -+msgid "Dark Scarlet Red" -+msgstr "" - --#: gtk/gtkcolorsel.c:420 --msgid "_Saturation:" --msgstr "_SáithiĂş:" -+#: ../gtk/gtkcolorchooserwidget.c:422 -+msgctxt "Color name" -+msgid "Light Orange" -+msgstr "" - --#: gtk/gtkcolorsel.c:421 -+#: ../gtk/gtkcolorchooserwidget.c:423 - #, fuzzy --msgid "Intensity of the color." --msgstr "TrĂ©dhearcacht an datha." -+msgctxt "Color name" -+msgid "Orange" -+msgstr "Raon" - --#: gtk/gtkcolorsel.c:422 --msgid "_Value:" --msgstr "L_uach:" -+#: ../gtk/gtkcolorchooserwidget.c:424 -+msgctxt "Color name" -+msgid "Dark Orange" -+msgstr "" - --#: gtk/gtkcolorsel.c:423 --msgid "Brightness of the color." --msgstr "Gile an datha." -+#: ../gtk/gtkcolorchooserwidget.c:425 -+msgctxt "Color name" -+msgid "Light Butter" -+msgstr "" - --#: gtk/gtkcolorsel.c:424 --msgid "_Red:" --msgstr "_Dearg:" -+#: ../gtk/gtkcolorchooserwidget.c:426 -+msgctxt "Color name" -+msgid "Butter" -+msgstr "" - --#: gtk/gtkcolorsel.c:425 --msgid "Amount of red light in the color." --msgstr "MĂ©id sholais dhearg sa dath." -+#: ../gtk/gtkcolorchooserwidget.c:427 -+msgctxt "Color name" -+msgid "Dark Butter" -+msgstr "" - --#: gtk/gtkcolorsel.c:426 --msgid "_Green:" --msgstr "_Uaine:" -+#: ../gtk/gtkcolorchooserwidget.c:428 -+msgctxt "Color name" -+msgid "Light Chameleon" -+msgstr "" - --#: gtk/gtkcolorsel.c:427 --msgid "Amount of green light in the color." --msgstr "MĂ©id sholais uaine sa dath." -+#: ../gtk/gtkcolorchooserwidget.c:429 -+msgctxt "Color name" -+msgid "Chameleon" -+msgstr "" - --#: gtk/gtkcolorsel.c:428 --msgid "_Blue:" --msgstr "_Gorm:" -+#: ../gtk/gtkcolorchooserwidget.c:430 -+msgctxt "Color name" -+msgid "Dark Chameleon" -+msgstr "" - --#: gtk/gtkcolorsel.c:429 --msgid "Amount of blue light in the color." --msgstr "MĂ©id sholais ghorm sa dath." -+#: ../gtk/gtkcolorchooserwidget.c:431 -+msgctxt "Color name" -+msgid "Light Sky Blue" -+msgstr "" - --#: gtk/gtkcolorsel.c:432 --msgid "Op_acity:" --msgstr "Teimhne_acht:" -+#: ../gtk/gtkcolorchooserwidget.c:432 -+msgctxt "Color name" -+msgid "Sky Blue" -+msgstr "" - --#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449 --msgid "Transparency of the color." --msgstr "TrĂ©dhearcacht an datha." -+#: ../gtk/gtkcolorchooserwidget.c:433 -+msgctxt "Color name" -+msgid "Dark Sky Blue" -+msgstr "" - --#: gtk/gtkcolorsel.c:456 --msgid "Color _name:" --msgstr "Ai_nm datha:" -+#: ../gtk/gtkcolorchooserwidget.c:434 -+msgctxt "Color name" -+msgid "Light Plum" -+msgstr "" - --#: gtk/gtkcolorsel.c:470 --msgid "" --"You can enter an HTML-style hexadecimal color value, or simply a color name " --"such as 'orange' in this entry." -+#: ../gtk/gtkcolorchooserwidget.c:435 -+msgctxt "Color name" -+msgid "Plum" - msgstr "" --"Is fĂ©idir leat luach datha heicsidheachĂşlach ar stĂl HTML a iontráil, nĂł " --"ainm datha mar shampla 'orange' a iontráil san iontráil seo." - --#: gtk/gtkcolorsel.c:500 --msgid "_Palette:" --msgstr "_PailĂ©ad:" -+#: ../gtk/gtkcolorchooserwidget.c:436 -+msgctxt "Color name" -+msgid "Dark Plum" -+msgstr "" - --#: gtk/gtkcolorsel.c:529 --msgid "Color Wheel" --msgstr "Roth na nDathanna" -+#: ../gtk/gtkcolorchooserwidget.c:437 -+msgctxt "Color name" -+msgid "Light Chocolate" -+msgstr "" - --#: gtk/gtkcolorsel.c:988 --msgid "" --"The previously-selected color, for comparison to the color you're selecting " --"now. You can drag this color to a palette entry, or select this color as " --"current by dragging it to the other color swatch alongside." -+#: ../gtk/gtkcolorchooserwidget.c:438 -+#, fuzzy -+msgctxt "Color name" -+msgid "Chocolate" -+msgstr "C_omhordaigh" -+ -+#: ../gtk/gtkcolorchooserwidget.c:439 -+msgctxt "Color name" -+msgid "Dark Chocolate" - msgstr "" - --#: gtk/gtkcolorsel.c:991 --msgid "" --"The color you've chosen. You can drag this color to a palette entry to save " --"it for use in the future." -+#: ../gtk/gtkcolorchooserwidget.c:440 -+msgctxt "Color name" -+msgid "Light Aluminum 1" - msgstr "" --"An dath atá roghnaithe agat. Is fĂ©idir leat an dath seo a tharraingt go " --"hiontráil pailĂ©id chun Ă© a shábháil le haghaidh Ăşsáide san am atá le teacht." - --#: gtk/gtkcolorsel.c:996 --msgid "" --"The previously-selected color, for comparison to the color you're selecting " --"now." -+#: ../gtk/gtkcolorchooserwidget.c:441 -+msgctxt "Color name" -+msgid "Aluminum 1" - msgstr "" - --#: gtk/gtkcolorsel.c:999 --msgid "The color you've chosen." --msgstr "An dath atá roghnaithe agat." -+#: ../gtk/gtkcolorchooserwidget.c:442 -+msgctxt "Color name" -+msgid "Dark Aluminum 1" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:443 -+msgctxt "Color name" -+msgid "Light Aluminum 2" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:444 -+msgctxt "Color name" -+msgid "Aluminum 2" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:445 -+msgctxt "Color name" -+msgid "Dark Aluminum 2" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:459 -+msgctxt "Color name" -+msgid "Black" -+msgstr "Dubh" -+ -+#: ../gtk/gtkcolorchooserwidget.c:460 -+msgctxt "Color name" -+msgid "Very Dark Gray" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:461 -+msgctxt "Color name" -+msgid "Darker Gray" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:462 -+msgctxt "Color name" -+msgid "Dark Gray" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:463 -+#, fuzzy -+msgctxt "Color name" -+msgid "Medium Gray" -+msgstr "Measartha" -+ -+#: ../gtk/gtkcolorchooserwidget.c:464 -+msgctxt "Color name" -+msgid "Light Gray" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:465 -+msgctxt "Color name" -+msgid "Lighter Gray" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:466 -+msgctxt "Color name" -+msgid "Very Light Gray" -+msgstr "" -+ -+#: ../gtk/gtkcolorchooserwidget.c:467 -+msgctxt "Color name" -+msgid "White" -+msgstr "Bán" -+ -+#. translators: label for the custom section in the color chooser -+#: ../gtk/gtkcolorchooserwidget.c:516 -+msgid "Custom" -+msgstr "Saincheaptha" -+ -+#: ../gtk/gtkcolorchooserwidget.c:524 -+#, fuzzy -+msgid "Create custom color" -+msgstr "Cruthaigh Fi_llteán" - --#: gtk/gtkcolorsel.c:1396 --msgid "_Save color here" --msgstr "_Sábháil dath anseo" -+#: ../gtk/gtkcolorchooserwidget.c:543 -+#, fuzzy, c-format -+msgid "Custom color %d: %s" -+msgstr "%sx%s Saincheaptha" - --#: gtk/gtkcolorsel.c:1601 --msgid "" --"Click this palette entry to make it the current color. To change this entry, " --"drag a color swatch here or right-click it and select \"Save color here.\"" --msgstr "" -+#: ../gtk/gtkcoloreditor.c:412 -+msgid "Color Name" -+msgstr "Ainm Datha" -+ -+#: ../gtk/gtkcoloreditor.c:457 -+msgctxt "Color channel" -+msgid "Saturation" -+msgstr "SáithiĂş" -+ -+#: ../gtk/gtkcoloreditor.c:463 -+msgctxt "Color channel" -+msgid "Value" -+msgstr "Luach" -+ -+#: ../gtk/gtkcoloreditor.c:471 -+msgctxt "Color channel" -+msgid "S" -+msgstr "S" -+ -+#: ../gtk/gtkcoloreditor.c:473 -+msgctxt "Color channel" -+msgid "V" -+msgstr "L" -+ -+#: ../gtk/gtkcoloreditor.c:481 ../gtk/gtkcolorscale.c:301 -+msgctxt "Color channel" -+msgid "Hue" -+msgstr "LĂ" -+ -+#: ../gtk/gtkcoloreditor.c:488 -+msgctxt "Color channel" -+msgid "H" -+msgstr "LĂ" -+ -+#: ../gtk/gtkcoloreditor.c:496 ../gtk/gtkcolorscale.c:303 -+msgctxt "Color channel" -+msgid "Alpha" -+msgstr "Alfa" -+ -+#: ../gtk/gtkcoloreditor.c:503 -+msgctxt "Color channel" -+msgid "A" -+msgstr "A" -+ -+#: ../gtk/gtkcolorplane.c:438 -+#, fuzzy -+msgid "Color Plane" -+msgstr "Ai_nm datha:" - --#: gtk/gtkcolorseldialog.c:189 --msgid "Color Selection" --msgstr "RoghnĂş Datha" -+#: ../gtk/gtkcolorswatch.c:447 -+#, fuzzy -+msgid "_Customize" -+msgstr "MĂ©id saincheaptha" - - #. Translate to the default units to use for presenting - #. * lengths to the user. Translate to default:inch if you -@@ -732,125 +1307,154 @@ msgstr "RoghnĂş Datha" - #. * Do *not* translate it to "predefinito:mm", if it - #. * it isn't default:mm or default:inch it will not work - #. --#: gtk/gtkcustompaperunixdialog.c:116 -+#: ../gtk/gtkcustompaperunixdialog.c:115 - msgid "default:mm" - msgstr "default:mm" - - #. And show the custom paper dialog --#: gtk/gtkcustompaperunixdialog.c:374 gtk/gtkprintunixdialog.c:3233 -+#: ../gtk/gtkcustompaperunixdialog.c:397 ../gtk/gtkprintunixdialog.c:3275 - msgid "Manage Custom Sizes" - msgstr "Bainistigh MĂ©ideanna Saincheaptha" - --#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790 -+#: ../gtk/gtkcustompaperunixdialog.c:558 ../gtk/gtkpagesetupunixdialog.c:778 - msgid "inch" - msgstr "orlach" - --#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788 -+#: ../gtk/gtkcustompaperunixdialog.c:560 ../gtk/gtkpagesetupunixdialog.c:776 - msgid "mm" - msgstr "mm" - --#: gtk/gtkcustompaperunixdialog.c:581 -+#: ../gtk/gtkcustompaperunixdialog.c:605 - msgid "Margins from Printer..." - msgstr "Imill Ăłn bPrintĂ©ir" - --#: gtk/gtkcustompaperunixdialog.c:747 -+#: ../gtk/gtkcustompaperunixdialog.c:771 - #, c-format - msgid "Custom Size %d" - msgstr "MĂ©id Saincheaptha %d" - --#: gtk/gtkcustompaperunixdialog.c:1059 -+#: ../gtk/gtkcustompaperunixdialog.c:1109 - msgid "_Width:" - msgstr "_Leithead:" - --#: gtk/gtkcustompaperunixdialog.c:1071 -+#: ../gtk/gtkcustompaperunixdialog.c:1120 - msgid "_Height:" - msgstr "_Airde:" - --#: gtk/gtkcustompaperunixdialog.c:1083 -+#: ../gtk/gtkcustompaperunixdialog.c:1131 - msgid "Paper Size" - msgstr "MĂ©id PháipĂ©ir" - --#: gtk/gtkcustompaperunixdialog.c:1092 -+#: ../gtk/gtkcustompaperunixdialog.c:1140 - msgid "_Top:" - msgstr "Ba_rr:" - --#: gtk/gtkcustompaperunixdialog.c:1104 -+#: ../gtk/gtkcustompaperunixdialog.c:1151 - msgid "_Bottom:" - msgstr "_Bun:" - --#: gtk/gtkcustompaperunixdialog.c:1116 -+#: ../gtk/gtkcustompaperunixdialog.c:1162 - msgid "_Left:" - msgstr "Ar _ChlĂ©:" - --#: gtk/gtkcustompaperunixdialog.c:1128 -+#: ../gtk/gtkcustompaperunixdialog.c:1173 - msgid "_Right:" - msgstr "Ar _Dheis:" - --#: gtk/gtkcustompaperunixdialog.c:1169 -+#: ../gtk/gtkcustompaperunixdialog.c:1212 - msgid "Paper Margins" - msgstr "Imill an PáipĂ©ar" - --#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248 -+#: ../gtk/gtkentry.c:9140 ../gtk/gtktextview.c:8583 - msgid "Input _Methods" - msgstr "_Modhanna Ionchurtha" - --#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262 -+#: ../gtk/gtkentry.c:9154 ../gtk/gtktextview.c:8597 - msgid "_Insert Unicode Control Character" - msgstr "_Ionsáigh Carachtar RialĂş Unicode" - --#: gtk/gtkentry.c:10015 --msgid "Caps Lock and Num Lock are on" --msgstr "" -- --#: gtk/gtkentry.c:10017 --#, fuzzy --msgid "Num Lock is on" --msgstr "Tá Caps Lock ann" -- --#: gtk/gtkentry.c:10019 -+#: ../gtk/gtkentry.c:10107 - msgid "Caps Lock is on" - msgstr "Tá Caps Lock ann" - -+#. * -+#. * SECTION:gtkfilechooserbutton -+#. * @Short_description: A button to launch a file selection dialog -+#. * @Title: GtkFileChooserButton -+#. * @See_also:#GtkFileChooserDialog -+#. * -+#. * The #GtkFileChooserButton is a widget that lets the user select a -+#. * file. It implements the #GtkFileChooser interface. Visually, it is a -+#. * file name with a button to bring up a #GtkFileChooserDialog. -+#. * The user can then use that dialog to change the file associated with -+#. * that button. This widget does not support setting the -+#. * #GtkFileChooser:select-multiple property to %TRUE. -+#. * -+#. * <example> -+#. * <title>Create a button to let the user select a file in /etc</title> -+#. * <programlisting> -+#. * { -+#. * GtkWidget *button; -+#. * -+#. * button = gtk_file_chooser_button_new (_("Select a file"), -+#. * GTK_FILE_CHOOSER_ACTION_OPEN); -+#. * gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button), -+#. * "/etc"); -+#. * } -+#. * </programlisting> -+#. * </example> -+#. * -+#. * The #GtkFileChooserButton supports the #GtkFileChooserAction<!-- -->s -+#. * %GTK_FILE_CHOOSER_ACTION_OPEN and %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER. -+#. * -+#. * <important> -+#. * The #GtkFileChooserButton will ellipsize the label, -+#. * and thus will thus request little horizontal space. To give the button -+#. * more space, you should call gtk_widget_get_preferred_size(), -+#. * gtk_file_chooser_button_set_width_chars(), or pack the button in -+#. * such a way that other interface elements give space to the widget. -+#. * </important> -+#. - #. **************** * - #. * Private Macros * - #. * **************** --#: gtk/gtkfilechooserbutton.c:61 --msgid "Select A File" -+#: ../gtk/gtkfilechooserbutton.c:104 -+msgid "Select a File" - msgstr "Roghnaigh Comhad" - --#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812 -+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819 - msgid "Desktop" - msgstr "Deasc" - --#: gtk/gtkfilechooserbutton.c:63 -+#: ../gtk/gtkfilechooserbutton.c:106 - msgid "(None)" - msgstr "(NeamhnĂ)" - --#: gtk/gtkfilechooserbutton.c:2005 -+#: ../gtk/gtkfilechooserbutton.c:2046 - msgid "Other..." - msgstr "Eile..." - --#: gtk/gtkfilechooserdefault.c:148 -+#: ../gtk/gtkfilechooserdefault.c:152 - msgid "Type name of new folder" - msgstr "ClĂłscrĂobh ainm den fhillteán nua" - --#: gtk/gtkfilechooserdefault.c:938 -+#: ../gtk/gtkfilechooserdefault.c:970 - msgid "Could not retrieve information about the file" - msgstr "NĂorbh fhĂ©idir eolas faoin gcomhad a fháil" - --#: gtk/gtkfilechooserdefault.c:949 -+#: ../gtk/gtkfilechooserdefault.c:981 - msgid "Could not add a bookmark" - msgstr "NĂorbh fhĂ©idir leabharmharc a chur leis" - --#: gtk/gtkfilechooserdefault.c:960 -+#: ../gtk/gtkfilechooserdefault.c:992 - msgid "Could not remove bookmark" - msgstr "NĂorbh fhĂ©idir leabharmharc a bhaint" - --#: gtk/gtkfilechooserdefault.c:971 -+#: ../gtk/gtkfilechooserdefault.c:1003 - msgid "The folder could not be created" - msgstr "NĂorbh fhĂ©idir an fillteán a chruthĂş" - --#: gtk/gtkfilechooserdefault.c:984 -+#: ../gtk/gtkfilechooserdefault.c:1016 - msgid "" - "The folder could not be created, as a file with the same name already " - "exists. Try using a different name for the folder, or rename the file first." -@@ -859,11 +1463,26 @@ msgstr "" - "an ainm cĂ©anna. Bain triail as Ăşsáid ainm difriĂşil don fhillteán, nĂł " - "athainmnigh an comhad ar dtĂşs." - --#: gtk/gtkfilechooserdefault.c:995 -+#: ../gtk/gtkfilechooserdefault.c:1030 -+msgid "You need to choose a valid filename." -+msgstr "" -+ -+#: ../gtk/gtkfilechooserdefault.c:1033 -+#, fuzzy, c-format -+msgid "Cannot create a file under %s as it is not a folder" -+msgstr "NĂ fĂ©idir athrĂş go dtĂ an fillteán mar nĂl sĂ© logánta" -+ -+#: ../gtk/gtkfilechooserdefault.c:1045 -+msgid "" -+"You may only select folders. The item that you selected is not a folder; " -+"try using a different item." -+msgstr "" -+ -+#: ../gtk/gtkfilechooserdefault.c:1055 - msgid "Invalid file name" - msgstr "Ainm comhaid neamhbhailĂ" - --#: gtk/gtkfilechooserdefault.c:1005 -+#: ../gtk/gtkfilechooserdefault.c:1065 - msgid "The folder contents could not be displayed" - msgstr "NĂorbh fhĂ©idir ábhair an fhillteáin a thaispeáint" - -@@ -871,201 +1490,212 @@ msgstr "NĂorbh fhĂ©idir ábhair an fhillteáin a thaispeáint" - #. * is a hostname. Nautilus and the panel contain the same string - #. * to translate. - #. --#: gtk/gtkfilechooserdefault.c:1555 -+#: ../gtk/gtkfilechooserdefault.c:1591 - #, c-format - msgid "%1$s on %2$s" - msgstr "%1$s ar %2$s" - --#: gtk/gtkfilechooserdefault.c:1731 -+#: ../gtk/gtkfilechooserdefault.c:1740 - msgid "Search" - msgstr "Cuardaigh" - --#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289 -+#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990 - msgid "Recently Used" - msgstr "Ăšsáidte le DĂ©anaĂ" - --#: gtk/gtkfilechooserdefault.c:2409 -+#: ../gtk/gtkfilechooserdefault.c:2363 - msgid "Select which types of files are shown" - msgstr "Roghnaigh an cineál comhad atá taispeánta" - --#: gtk/gtkfilechooserdefault.c:2768 -+#: ../gtk/gtkfilechooserdefault.c:2722 - #, c-format - msgid "Add the folder '%s' to the bookmarks" - msgstr "Cuir an fillteán '%s' leis na leabharmharcanna" - --#: gtk/gtkfilechooserdefault.c:2812 -+#: ../gtk/gtkfilechooserdefault.c:2766 - #, c-format - msgid "Add the current folder to the bookmarks" - msgstr "Cuir an fillteán reatha leis na leabharmharcanna" - --#: gtk/gtkfilechooserdefault.c:2814 -+#: ../gtk/gtkfilechooserdefault.c:2768 - #, c-format - msgid "Add the selected folders to the bookmarks" - msgstr "Cuir na fillteáin roghnaithe leis na leabharmharcanna" - --#: gtk/gtkfilechooserdefault.c:2852 -+#: ../gtk/gtkfilechooserdefault.c:2806 - #, c-format - msgid "Remove the bookmark '%s'" - msgstr "Bain an leabharmharc '%s'" - --#: gtk/gtkfilechooserdefault.c:2854 -+#: ../gtk/gtkfilechooserdefault.c:2808 - #, c-format - msgid "Bookmark '%s' cannot be removed" - msgstr "NĂ fĂ©idir leabharmharc '%s' a bhaint" - --#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725 -+#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701 - msgid "Remove the selected bookmark" - msgstr "Bain an leabharmharc roghnaithe" - --#: gtk/gtkfilechooserdefault.c:3421 -+#: ../gtk/gtkfilechooserdefault.c:3379 - msgid "Remove" - msgstr "Bain" - --#: gtk/gtkfilechooserdefault.c:3430 -+#: ../gtk/gtkfilechooserdefault.c:3388 - msgid "Rename..." - msgstr "Athainmnigh..." - - #. Accessible object name for the file chooser's shortcuts pane --#: gtk/gtkfilechooserdefault.c:3593 -+#: ../gtk/gtkfilechooserdefault.c:3552 - msgid "Places" - msgstr "Ăiteanna" - - #. Column header for the file chooser's shortcuts pane --#: gtk/gtkfilechooserdefault.c:3650 -+#: ../gtk/gtkfilechooserdefault.c:3609 - msgid "_Places" - msgstr "_Ăiteanna" - --#: gtk/gtkfilechooserdefault.c:3706 --msgid "_Add" --msgstr "Cuir _Leis" -- --#: gtk/gtkfilechooserdefault.c:3713 -+#: ../gtk/gtkfilechooserdefault.c:3689 - msgid "Add the selected folder to the Bookmarks" - msgstr "Cuir an fillteán roghnaithe leis na Leabharmharcanna" - --#: gtk/gtkfilechooserdefault.c:3718 --msgid "_Remove" --msgstr "_Bain" -- --#: gtk/gtkfilechooserdefault.c:3860 -+#: ../gtk/gtkfilechooserdefault.c:3950 - msgid "Could not select file" - msgstr "NĂorbh fhĂ©idir comhad a roghnĂş" - --#: gtk/gtkfilechooserdefault.c:4035 -+#: ../gtk/gtkfilechooserdefault.c:4175 -+msgid "_Visit this file" -+msgstr "" -+ -+#: ../gtk/gtkfilechooserdefault.c:4178 -+#, fuzzy -+msgid "_Copy file's location" -+msgstr "CĂłipeái_l SuĂomh" -+ -+#: ../gtk/gtkfilechooserdefault.c:4181 - msgid "_Add to Bookmarks" - msgstr "_Cuir le Leabharmharcanna" - --#: gtk/gtkfilechooserdefault.c:4048 -+#: ../gtk/gtkfilechooserdefault.c:4188 - msgid "Show _Hidden Files" - msgstr "Taispeáin Com_haid Folaithe" - --#: gtk/gtkfilechooserdefault.c:4055 -+#: ../gtk/gtkfilechooserdefault.c:4191 - msgid "Show _Size Column" - msgstr "Taispeáin ColĂşn _MĂ©ide" - --#: gtk/gtkfilechooserdefault.c:4281 -+#: ../gtk/gtkfilechooserdefault.c:4416 - msgid "Files" - msgstr "Comhaid" - --#: gtk/gtkfilechooserdefault.c:4332 -+#: ../gtk/gtkfilechooserdefault.c:4467 - msgid "Name" - msgstr "Ainm" - --#: gtk/gtkfilechooserdefault.c:4355 -+#: ../gtk/gtkfilechooserdefault.c:4490 - msgid "Size" - msgstr "MĂ©id" - --#: gtk/gtkfilechooserdefault.c:4369 -+#: ../gtk/gtkfilechooserdefault.c:4504 - msgid "Modified" - msgstr "Athraithe" - - #. Label --#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801 -+#: ../gtk/gtkfilechooserdefault.c:4597 - msgid "_Name:" - msgstr "_Ainm:" - --#: gtk/gtkfilechooserdefault.c:4667 --msgid "_Browse for other folders" --msgstr "_Brabhsáil ar fhillteáin eile" -- --#: gtk/gtkfilechooserdefault.c:4937 -+#: ../gtk/gtkfilechooserdefault.c:4828 - msgid "Type a file name" - msgstr "ClĂłscrĂobh ainm comhaid" - -+#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886 -+#, fuzzy -+msgid "Please select a folder below" -+msgstr "Roghnaigh fillteán" -+ -+#: ../gtk/gtkfilechooserdefault.c:4881 -+#, fuzzy -+msgid "Please type a file name" -+msgstr "ClĂłscrĂobh ainm comhaid" -+ - #. Create Folder --#: gtk/gtkfilechooserdefault.c:4980 -+#: ../gtk/gtkfilechooserdefault.c:4952 - msgid "Create Fo_lder" - msgstr "Cruthaigh Fi_llteán" - --#: gtk/gtkfilechooserdefault.c:4990 -+#: ../gtk/gtkfilechooserdefault.c:5000 -+msgid "Search:" -+msgstr "Cuardaigh:" -+ -+#: ../gtk/gtkfilechooserdefault.c:5051 - msgid "_Location:" - msgstr "_SuĂomh:" - --#: gtk/gtkfilechooserdefault.c:5194 -+#: ../gtk/gtkfilechooserdefault.c:5502 - msgid "Save in _folder:" - msgstr "Sábháil i bh_fillteán:" - --#: gtk/gtkfilechooserdefault.c:5196 -+#: ../gtk/gtkfilechooserdefault.c:5504 - msgid "Create in _folder:" - msgstr "Cruthaigh i bh_fillteán:" - --#: gtk/gtkfilechooserdefault.c:6248 -+#: ../gtk/gtkfilechooserdefault.c:6591 - #, c-format - msgid "Could not read the contents of %s" - msgstr "NĂorbh fhĂ©idir ábhair %s a lĂ©amh" - --#: gtk/gtkfilechooserdefault.c:6252 -+#: ../gtk/gtkfilechooserdefault.c:6595 - msgid "Could not read the contents of the folder" - msgstr "NĂorbh fhĂ©idir ábhair an fhĂllteáin a lĂ©amh" - --#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413 --#: gtk/gtkfilechooserdefault.c:6558 -+#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756 -+#: ../gtk/gtkfilechooserdefault.c:6936 - msgid "Unknown" - msgstr "Anaithnid" - --#: gtk/gtkfilechooserdefault.c:6360 -+#: ../gtk/gtkfilechooserdefault.c:6703 - msgid "%H:%M" - msgstr "%H:%M" - --#: gtk/gtkfilechooserdefault.c:6362 -+#: ../gtk/gtkfilechooserdefault.c:6705 - msgid "Yesterday at %H:%M" - msgstr "InnĂ© ar a %H:%M" - --#: gtk/gtkfilechooserdefault.c:7028 -+#: ../gtk/gtkfilechooserdefault.c:7407 - msgid "Cannot change to folder because it is not local" - msgstr "NĂ fĂ©idir athrĂş go dtĂ an fillteán mar nĂl sĂ© logánta" - --#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646 -+#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032 - #, c-format - msgid "Shortcut %s already exists" - msgstr "Tá aicearra %s ann cheana" - --#: gtk/gtkfilechooserdefault.c:7736 -+#: ../gtk/gtkfilechooserdefault.c:8122 - #, c-format - msgid "Shortcut %s does not exist" - msgstr "NĂl aicearra %s ann" - --#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480 -+#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548 - #, c-format - msgid "A file named \"%s\" already exists. Do you want to replace it?" - msgstr "Tá comhad darbh ainm \"%s\" ann cheana. Ar mhaith leat Ă© a athchur?" - --#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484 -+#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552 - #, c-format - msgid "" - "The file already exists in \"%s\". Replacing it will overwrite its contents." - msgstr "" - "Tá an comhad ann i \"%s\" cheana. ForscrĂobhfar a ábhair má ionadaĂtear Ă©." - --#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491 -+#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559 - msgid "_Replace" - msgstr "_Ionadaigh" - --#: gtk/gtkfilechooserdefault.c:8658 -+#: ../gtk/gtkfilechooserdefault.c:9183 - msgid "Could not start the search process" - msgstr "NĂorbh fhĂ©idir an prĂłiseas cuardaigh a thosĂş" - --#: gtk/gtkfilechooserdefault.c:8659 -+#: ../gtk/gtkfilechooserdefault.c:9184 - msgid "" - "The program was not able to create a connection to the indexer daemon. " - "Please make sure it is running." -@@ -1074,221 +1704,192 @@ msgstr "" - "innĂ©acsĂłra.\n" - "Cinntigh go bhfuil sĂ© á rith, le do thoil." - --#: gtk/gtkfilechooserdefault.c:8673 -+#: ../gtk/gtkfilechooserdefault.c:9198 - msgid "Could not send the search request" - msgstr "NĂorbh fhĂ©idir an t-iarratas cuardaigh a sheoladh" - --#: gtk/gtkfilechooserdefault.c:8861 --msgid "Search:" --msgstr "Cuardaigh:" -- --#: gtk/gtkfilechooserdefault.c:9466 -+#: ../gtk/gtkfilechooserdefault.c:9808 - #, c-format - msgid "Could not mount %s" - msgstr "NĂorbh fhĂ©idir %s a ghlĂ©asadh" - --#. Translators: this is shown in the feedback for Tab-completion in a file --#. * chooser's text entry, when the user enters an invalid path. --#: gtk/gtkfilechooserentry.c:702 gtk/gtkfilechooserentry.c:1169 --msgid "Invalid path" --msgstr "Conair neamhbhailĂ" -- --#. translators: this text is shown when there are no completions --#. * for something the user typed in a file chooser entry --#. --#: gtk/gtkfilechooserentry.c:1101 --msgid "No match" --msgstr "Gan rud comhoiriĂşnach" -- --#. translators: this text is shown when there is exactly one completion --#. * for something the user typed in a file chooser entry --#. --#: gtk/gtkfilechooserentry.c:1112 --msgid "Sole completion" --msgstr "An comhlánĂş amháin" -- --#. translators: this text is shown when the text in a file chooser --#. * entry is a complete filename, but could be continued to find --#. * a longer match --#. --#: gtk/gtkfilechooserentry.c:1128 --msgid "Complete, but not unique" --msgstr "Curtha i grĂch, ach nach uathĂşil" -- --#. Translators: this text is shown while the system is searching --#. * for possible completions for filenames in a file chooser entry. --#: gtk/gtkfilechooserentry.c:1160 --msgid "Completing..." --msgstr "Ă chur i grĂch..." -- --#. hostnames in a local_only file chooser? user error --#. Translators: this is shown in the feedback for Tab-completion in a --#. * file chooser's text entry when the user enters something like --#. * "sftp://blahblah" in an app that only supports local filenames. --#: gtk/gtkfilechooserentry.c:1182 gtk/gtkfilechooserentry.c:1207 --msgid "Only local files may be selected" --msgstr "Is fĂ©idir comhaid logánta amháin a roghnĂş" -- --#. Another option is to complete the hostname based on the remote volumes that are mounted --#. Translators: this is shown in the feedback for Tab-completion in a --#. * file chooser's text entry when the user hasn't entered the first '/' --#. * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]") --#: gtk/gtkfilechooserentry.c:1191 --msgid "Incomplete hostname; end it with '/'" --msgstr "Ă“stainm neamhiomlán; cuir '/' ag an deireadh" -- --#. Translators: this is shown in the feedback for Tab-completion in a file --#. * chooser's text entry when the user enters a path that does not exist --#. * and then hits Tab --#: gtk/gtkfilechooserentry.c:1202 --msgid "Path does not exist" --msgstr "NĂl an conair sin ann" -- --#: gtk/gtkfilechoosersettings.c:486 --#, c-format --msgid "Error creating folder '%s': %s" --msgstr "Earráid agus fillteán '%s' á chruthĂş: %s" -- - #. The pointers we return for a GtkFileSystemVolume are opaque tokens; they are - #. * really pointers to GDrive, GVolume or GMount objects. We need an extra - #. * token for the fake "File System" volume. So, we'll return a pointer to - #. * this particular string. - #. --#: gtk/gtkfilesystem.c:48 -+#: ../gtk/gtkfilesystem.c:47 - msgid "File System" - msgstr "CĂłras Comhaid" - --#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266 --msgid "Pick a Font" --msgstr "Roghnaigh ClĂł" -- --#. Initialize fields --#: gtk/gtkfontbutton.c:260 -+#: ../gtk/gtkfontbutton.c:354 - msgid "Sans 12" - msgstr "Sans 12" - --#: gtk/gtkfontbutton.c:785 -+#: ../gtk/gtkfontbutton.c:436 ../gtk/gtkfontbutton.c:563 -+msgid "Pick a Font" -+msgstr "Roghnaigh ClĂł" -+ -+#: ../gtk/gtkfontbutton.c:1121 - msgid "Font" - msgstr "ClĂł" - --#. This is the default text shown in the preview entry, though the user --#. can set it. Remember that some fonts only have capital letters. --#: gtk/gtkfontsel.c:103 --msgid "abcdefghijk ABCDEFGHIJK" --msgstr "aábcdeĂ©fghiĂ AĂBCDEÉFGHIĂŤ" -- --#: gtk/gtkfontsel.c:370 --msgid "_Family:" --msgstr "_Clann:" -- --#: gtk/gtkfontsel.c:376 --msgid "_Style:" --msgstr "_StĂl:" -- --#: gtk/gtkfontsel.c:382 --msgid "Si_ze:" --msgstr "_MĂ©id:" -- --#. create the text entry widget --#: gtk/gtkfontsel.c:559 --msgid "_Preview:" --msgstr "_RĂ©amhamharc:" -- --#: gtk/gtkfontsel.c:1659 --msgid "Font Selection" --msgstr "RoghnĂş ClĂł" -- --#. Remove this icon source so we don't keep trying to --#. * load it. --#. --#: gtk/gtkiconfactory.c:1356 --#, c-format --msgid "Error loading icon: %s" --msgstr "Earráid agus deilbhĂn á luchtĂş: %s" -+#: ../gtk/gtkfontchooserwidget.c:110 -+msgid "No fonts matched your search. You can revise your search and try again." -+msgstr "" - --#: gtk/gtkicontheme.c:1354 --#, c-format --msgid "" --"Could not find the icon '%s'. The '%s' theme\n" --"was not found either, perhaps you need to install it.\n" --"You can get a copy from:\n" --"\t%s" -+#: ../gtk/gtkfontchooserwidget.c:557 -+msgid "Search font name" - msgstr "" --"NĂorbh fhĂ©idir an deilbhĂn '%s' a aimsiĂş. NĂor\n" --"aimsĂodh an tĂ©ama '%s' ach an oiread, b'fhĂ©idir go\n" --"gcaithfidh tĂş Ă© a shuiteáil.\n" --"Is fĂ©idir leat cĂłip a fháil Ăł:\n" --"\t%s" - --#: gtk/gtkicontheme.c:1535 -+#: ../gtk/gtkfontchooserwidget.c:891 -+#, fuzzy -+msgid "Font Family" -+msgstr "_Clann:" -+ -+#: ../gtk/gtkicontheme.c:1630 - #, c-format - msgid "Icon '%s' not present in theme" - msgstr "NĂl deilbhĂn '%s' ann sa tĂ©ama" - --#: gtk/gtkicontheme.c:3048 -+#: ../gtk/gtkicontheme.c:3138 - msgid "Failed to load icon" - msgstr "Theip ar luchtĂş deilbhĂn" - --#: gtk/gtkimmodule.c:526 -+#: ../gtk/gtkimmodule.c:515 - msgid "Simple" - msgstr "SimplĂ" - --#: gtk/gtkimmulticontext.c:588 -+#: ../gtk/gtkimmulticontext.c:608 - msgctxt "input method menu" - msgid "System" - msgstr "CĂłras" - --#: gtk/gtkimmulticontext.c:598 -+#: ../gtk/gtkimmulticontext.c:618 - msgctxt "input method menu" - msgid "None" - msgstr "NeamhnĂ" - --#: gtk/gtkimmulticontext.c:681 -+#: ../gtk/gtkimmulticontext.c:701 - #, c-format - msgctxt "input method menu" - msgid "System (%s)" - msgstr "CĂłras (%s)" - - #. Open Link --#: gtk/gtklabel.c:6202 -+#: ../gtk/gtklabel.c:6224 - msgid "_Open Link" - msgstr "_Oscail Nasc" - - #. Copy Link Address --#: gtk/gtklabel.c:6214 -+#: ../gtk/gtklabel.c:6236 - msgid "Copy _Link Address" - msgstr "CĂłipeáil Seoladh an _Naisc" - --#: gtk/gtklinkbutton.c:449 -+#: ../gtk/gtk-launch.c:73 -+msgid "APPLICATION [URI...] - launch an APPLICATION with URI." -+msgstr "" -+ -+#. Translators: this message will appear after the usage string -+#. and before the list of options. -+#: ../gtk/gtk-launch.c:77 -+msgid "" -+"Launch specified application by its desktop file info\n" -+"optionally passing list of URIs as arguments." -+msgstr "" -+ -+#: ../gtk/gtk-launch.c:89 -+#, fuzzy, c-format -+msgid "Error parsing commandline options: %s\n" -+msgstr "Earráid agus deilbhĂn á luchtĂş: %s" -+ -+#: ../gtk/gtk-launch.c:91 ../gtk/gtk-launch.c:104 -+#, c-format -+msgid "Try \"%s --help\" for more information." -+msgstr "" -+ -+#. Translators: the %s is the program name. This error message -+#. means the user is calling gtk-launch without any argument. -+#: ../gtk/gtk-launch.c:102 -+#, c-format -+msgid "%s: missing application name" -+msgstr "" -+ -+#: ../gtk/gtk-launch.c:123 -+#, c-format -+msgid "Creating AppInfo from id not supported on non unix operating systems" -+msgstr "" -+ -+#. Translators: the first %s is the program name, the second one -+#. is the application name. -+#: ../gtk/gtk-launch.c:131 -+#, c-format -+msgid "%s: no such application %s" -+msgstr "" -+ -+#. Translators: the first %s is the program name, the second one -+#. is the error message. -+#: ../gtk/gtk-launch.c:149 -+#, fuzzy, c-format -+msgid "%s: error launching application: %s\n" -+msgstr "Earráid agus deilbhĂn á luchtĂş: %s" -+ -+#: ../gtk/gtklinkbutton.c:499 - msgid "Copy URL" - msgstr "CĂłipeáil URL" - --#: gtk/gtklinkbutton.c:601 -+#: ../gtk/gtklinkbutton.c:665 - msgid "Invalid URI" - msgstr "URI NeamhbhailĂ" - -+#: ../gtk/gtklockbutton.c:290 -+msgid "Lock" -+msgstr "Cuir Faoi Ghlas" -+ -+#: ../gtk/gtklockbutton.c:299 -+msgid "Unlock" -+msgstr "DĂghlasáil" -+ -+#: ../gtk/gtklockbutton.c:308 -+msgid "" -+"Dialog is unlocked.\n" -+"Click to prevent further changes" -+msgstr "" -+ -+#: ../gtk/gtklockbutton.c:317 -+msgid "" -+"Dialog is locked.\n" -+"Click to make changes" -+msgstr "" -+ -+#: ../gtk/gtklockbutton.c:326 -+msgid "" -+"System policy prevents changes.\n" -+"Contact your system administrator" -+msgstr "" -+ - #. Description of --gtk-module=MODULES in --help output --#: gtk/gtkmain.c:526 -+#: ../gtk/gtkmain.c:447 - msgid "Load additional GTK+ modules" - msgstr "Luchtaigh modĂşil GTK+ breise" - - #. Placeholder in --gtk-module=MODULES in --help output --#: gtk/gtkmain.c:527 -+#: ../gtk/gtkmain.c:448 - msgid "MODULES" - msgstr "MODĂšIL" - - #. Description of --g-fatal-warnings in --help output --#: gtk/gtkmain.c:529 -+#: ../gtk/gtkmain.c:450 - msgid "Make all warnings fatal" - msgstr "DĂ©an marfach gach rabhadh" - - #. Description of --gtk-debug=FLAGS in --help output --#: gtk/gtkmain.c:532 -+#: ../gtk/gtkmain.c:453 - msgid "GTK+ debugging flags to set" - msgstr "Bratacha dĂfhabhtaithe GTK+ a shocrĂş" - - #. Description of --gtk-no-debug=FLAGS in --help output --#: gtk/gtkmain.c:535 -+#: ../gtk/gtkmain.c:456 - msgid "GTK+ debugging flags to unset" - msgstr "Bratacha dĂfhabhtaithe GTK+ a dhĂshocrĂş" - -@@ -1297,123 +1898,141 @@ msgstr "Bratacha dĂfhabhtaithe GTK+ a dhĂshocrĂş" - #. * Do *not* translate it to "predefinito:LTR", if it - #. * it isn't default:LTR or default:RTL it will not work - #. --#: gtk/gtkmain.c:798 -+#: ../gtk/gtkmain.c:704 - msgid "default:LTR" - msgstr "default:LTR" - --#: gtk/gtkmain.c:863 -+#: ../gtk/gtkmain.c:772 - #, c-format - msgid "Cannot open display: %s" - msgstr "NĂ fĂ©idir taispeáint a oscailt: %s" - --#: gtk/gtkmain.c:922 -+#: ../gtk/gtkmain.c:838 - msgid "GTK+ Options" - msgstr "Roghanna GTK+" - --#: gtk/gtkmain.c:922 -+#: ../gtk/gtkmain.c:838 - msgid "Show GTK+ Options" - msgstr "Taispeáin Roghanna GTK+" - --#: gtk/gtkmountoperation.c:491 -+#: ../gtk/gtkmountoperation.c:535 - msgid "Co_nnect" - msgstr "_Nasc" - --#: gtk/gtkmountoperation.c:558 --msgid "Connect _anonymously" -+#: ../gtk/gtkmountoperation.c:609 -+#, fuzzy -+msgid "Connect As" -+msgstr "_Nasc" -+ -+#: ../gtk/gtkmountoperation.c:618 -+#, fuzzy -+msgid "_Anonymous" - msgstr "Nasc gan _ainm" - --#: gtk/gtkmountoperation.c:567 --msgid "Connect as u_ser:" --msgstr "Nasc mar Ăş_sáideoir:" -+#: ../gtk/gtkmountoperation.c:627 -+msgid "Registered U_ser" -+msgstr "" - --#: gtk/gtkmountoperation.c:605 --msgid "_Username:" -+#: ../gtk/gtkmountoperation.c:638 -+#, fuzzy -+msgid "_Username" - msgstr "_Ainm Ăşsáideora:" - --#: gtk/gtkmountoperation.c:610 --msgid "_Domain:" -+#: ../gtk/gtkmountoperation.c:643 -+#, fuzzy -+msgid "_Domain" - msgstr "F_earann:" - --#: gtk/gtkmountoperation.c:616 --msgid "_Password:" -+#: ../gtk/gtkmountoperation.c:649 -+#, fuzzy -+msgid "_Password" - msgstr "_Focal faire:" - --#: gtk/gtkmountoperation.c:634 -+#: ../gtk/gtkmountoperation.c:671 - msgid "Forget password _immediately" - msgstr "DĂ©an _dearmad ar an bhfocal faire láithreach" - --#: gtk/gtkmountoperation.c:644 -+#: ../gtk/gtkmountoperation.c:681 - msgid "Remember password until you _logout" - msgstr "Meabhraigh focal faire go dtĂ go _logálann tĂş amach" - --#: gtk/gtkmountoperation.c:654 -+#: ../gtk/gtkmountoperation.c:691 - msgid "Remember _forever" - msgstr "Meabhraigh go d_eo" - --#: gtk/gtkmountoperation.c:883 -+#: ../gtk/gtkmountoperation.c:1080 - #, fuzzy, c-format - msgid "Unknown Application (PID %d)" - msgstr "Feidhmchlár Anaithnid (pid %d)" - --#: gtk/gtkmountoperation.c:1066 --#, c-format -+#: ../gtk/gtkmountoperation.c:1263 - msgid "Unable to end process" - msgstr "NĂ fĂ©idir deireadh a chur leis an bprĂłiseas" - --#: gtk/gtkmountoperation.c:1103 -+#: ../gtk/gtkmountoperation.c:1300 - msgid "_End Process" - msgstr "Cuir _Deireadh Leis an bPrĂłiseas" - --#: gtk/gtkmountoperation-stub.c:64 -+#: ../gtk/gtkmountoperation-stub.c:62 - #, fuzzy, c-format - msgid "Cannot kill process with PID %d. Operation is not implemented." - msgstr "" - "NĂ fĂ©idir an prĂłiseas le pid %d a mharĂş. NĂl an oibrĂocht curtha i ngnĂomh." - - #. translators: this string is a name for the 'less' command --#: gtk/gtkmountoperation-x11.c:862 -+#: ../gtk/gtkmountoperation-x11.c:954 - msgid "Terminal Pager" - msgstr "BrabhsálaĂ TeirminĂ©il" - --#: gtk/gtkmountoperation-x11.c:863 -+#: ../gtk/gtkmountoperation-x11.c:955 - msgid "Top Command" - msgstr "OrdĂş Top" - --#: gtk/gtkmountoperation-x11.c:864 -+#: ../gtk/gtkmountoperation-x11.c:956 - msgid "Bourne Again Shell" - msgstr "Blaosc Bourne Again" - --#: gtk/gtkmountoperation-x11.c:865 -+#: ../gtk/gtkmountoperation-x11.c:957 - msgid "Bourne Shell" - msgstr "Blaosc Bourne" - --#: gtk/gtkmountoperation-x11.c:866 -+#: ../gtk/gtkmountoperation-x11.c:958 - msgid "Z Shell" - msgstr "Blaosc Z" - --#: gtk/gtkmountoperation-x11.c:963 -+#: ../gtk/gtkmountoperation-x11.c:1055 - #, fuzzy, c-format - msgid "Cannot end process with PID %d: %s" - msgstr "NĂ fĂ©idir deireadh a chur leis an bprĂłiseas le pid %d: %s" - --#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170 -+#: ../gtk/gtknotebook.c:5067 ../gtk/gtknotebook.c:7721 - #, c-format - msgid "Page %u" - msgstr "Leathanach %u" - --#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880 -+#. Translators: the format here is used to build the string that will be rendered -+#. * in the number emblem. -+#. -+#: ../gtk/gtknumerableicon.c:482 -+#, c-format -+msgctxt "Number format" -+msgid "%d" -+msgstr "%d" -+ -+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848 -+#: ../gtk/gtkpapersize.c:888 - msgid "Not a valid page setup file" - msgstr "NĂ comhad socrĂş leathanaigh bailĂ Ă©" - --#: gtk/gtkpagesetupunixdialog.c:179 -+#: ../gtk/gtkpagesetupunixdialog.c:167 - msgid "Any Printer" - msgstr "PrintĂ©ir ar Bith" - --#: gtk/gtkpagesetupunixdialog.c:179 -+#: ../gtk/gtkpagesetupunixdialog.c:167 - msgid "For portable documents" - msgstr "Le haghaidh cáipĂ©isĂ iniompartha" - --#: gtk/gtkpagesetupunixdialog.c:809 -+#: ../gtk/gtkpagesetupunixdialog.c:796 - #, c-format - msgid "" - "Margins:\n" -@@ -1428,239 +2047,229 @@ msgstr "" - " Barr: %s %s\n" - " Bun: %s %s" - --#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284 -+#: ../gtk/gtkpagesetupunixdialog.c:845 ../gtk/gtkprintunixdialog.c:3329 - msgid "Manage Custom Sizes..." - msgstr "Bainistigh MĂ©ideanna Saincheaptha..." - --#: gtk/gtkpagesetupunixdialog.c:909 -+#: ../gtk/gtkpagesetupunixdialog.c:896 - msgid "_Format for:" - msgstr "_Formáid le:" - --#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456 -+#: ../gtk/gtkpagesetupunixdialog.c:917 ../gtk/gtkprintunixdialog.c:3477 - msgid "_Paper size:" - msgstr "MĂ©id an _pháipĂ©ir:" - --#: gtk/gtkpagesetupunixdialog.c:962 -+#: ../gtk/gtkpagesetupunixdialog.c:946 - msgid "_Orientation:" - msgstr "_TreoshuĂomh:" - --#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518 -+#: ../gtk/gtkpagesetupunixdialog.c:1006 ../gtk/gtkprintunixdialog.c:3531 - msgid "Page Setup" - msgstr "SocrĂş Leathanaigh" - --#: gtk/gtkpathbar.c:154 -+#: ../gtk/gtkpathbar.c:159 - msgid "Up Path" - msgstr "Conair Suas" - --#: gtk/gtkpathbar.c:156 -+#: ../gtk/gtkpathbar.c:161 - msgid "Down Path" - msgstr "Conair SĂos" - --#: gtk/gtkpathbar.c:1497 -+#: ../gtk/gtkpathbar.c:1644 - msgid "File System Root" - msgstr "FrĂ©amh ChĂłras Comhaid" - --#: gtk/gtkprintbackend.c:749 -+#: ../gtk/gtkprintbackend.c:750 - msgid "Authentication" - msgstr "FĂordheimhniĂş" - --#: gtk/gtkprinteroptionwidget.c:694 --msgid "Not available" --msgstr "NĂl ar fáil" -- --#: gtk/gtkprinteroptionwidget.c:794 --msgid "Select a folder" -+#: ../gtk/gtkprinteroptionwidget.c:546 -+#, fuzzy -+msgid "Select a filename" - msgstr "Roghnaigh fillteán" - --#: gtk/gtkprinteroptionwidget.c:813 --msgid "_Save in folder:" --msgstr "_Sábháil i bhfillteán:" -+#: ../gtk/gtkprinteroptionwidget.c:770 -+msgid "Not available" -+msgstr "NĂl ar fáil" - - #. translators: this string is the default job title for print - #. * jobs. %s gets replaced by the application name, %d gets replaced - #. * by the job number. - #. --#: gtk/gtkprintoperation.c:190 -+#: ../gtk/gtkprintoperation.c:260 - #, c-format - msgid "%s job #%d" - msgstr "%s jab #%d" - --#: gtk/gtkprintoperation.c:1695 -+#: ../gtk/gtkprintoperation.c:1777 - msgctxt "print operation status" - msgid "Initial state" - msgstr "Staid tosaigh" - --#: gtk/gtkprintoperation.c:1696 -+#: ../gtk/gtkprintoperation.c:1778 - msgctxt "print operation status" - msgid "Preparing to print" - msgstr "Priontáil á ullmhĂş" - --#: gtk/gtkprintoperation.c:1697 -+#: ../gtk/gtkprintoperation.c:1779 - msgctxt "print operation status" - msgid "Generating data" - msgstr "Sonraà á nginiĂşint" - --#: gtk/gtkprintoperation.c:1698 -+#: ../gtk/gtkprintoperation.c:1780 - msgctxt "print operation status" - msgid "Sending data" - msgstr "Sonraà á seoladh" - --#: gtk/gtkprintoperation.c:1699 -+#: ../gtk/gtkprintoperation.c:1781 - msgctxt "print operation status" - msgid "Waiting" - msgstr "Ag feitheamh" - --#: gtk/gtkprintoperation.c:1700 -+#: ../gtk/gtkprintoperation.c:1782 - msgctxt "print operation status" - msgid "Blocking on issue" - msgstr "Coiscthe mar gheall ar fhadhb" - --#: gtk/gtkprintoperation.c:1701 -+#: ../gtk/gtkprintoperation.c:1783 - msgctxt "print operation status" - msgid "Printing" - msgstr "Ă Phriontáil" - --#: gtk/gtkprintoperation.c:1702 -+#: ../gtk/gtkprintoperation.c:1784 - msgctxt "print operation status" - msgid "Finished" - msgstr "CrĂochnaithe" - --#: gtk/gtkprintoperation.c:1703 -+#: ../gtk/gtkprintoperation.c:1785 - msgctxt "print operation status" - msgid "Finished with error" - msgstr "CrĂochnaithe le hearráid" - --#: gtk/gtkprintoperation.c:2270 -+#: ../gtk/gtkprintoperation.c:2349 - #, c-format - msgid "Preparing %d" - msgstr "%d á ullmhĂş" - --#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902 --#, c-format -+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983 - msgid "Preparing" - msgstr "Ă ullmhĂş" - --#: gtk/gtkprintoperation.c:2275 -+#: ../gtk/gtkprintoperation.c:2354 - #, c-format - msgid "Printing %d" - msgstr "%d á phriontáil" - --#: gtk/gtkprintoperation.c:2932 --#, c-format -+#: ../gtk/gtkprintoperation.c:3013 - msgid "Error creating print preview" - msgstr "Earráid agus rĂ©amhamharc priontála á chruthĂş" - --#: gtk/gtkprintoperation.c:2935 --#, c-format -+#: ../gtk/gtkprintoperation.c:3016 - msgid "The most probable reason is that a temporary file could not be created." - msgstr "Is dĂłcha gur an chĂşis ná nárbh fhĂ©idir comhad sealadach a chruthĂş." - --#: gtk/gtkprintoperation-unix.c:297 -+#: ../gtk/gtkprintoperation-unix.c:307 - msgid "Error launching preview" - msgstr "Earráid agus rĂ©amhamharc á thosĂş" - --#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447 --msgid "Application" --msgstr "Feidhmchlár" -- --#: gtk/gtkprintoperation-win32.c:611 -+#: ../gtk/gtkprintoperation-win32.c:609 - msgid "Printer offline" - msgstr "PrintĂ©ir as lĂne" - --#: gtk/gtkprintoperation-win32.c:613 -+#: ../gtk/gtkprintoperation-win32.c:611 - msgid "Out of paper" - msgstr "PáipĂ©ar Ădithe" - - #. Translators: this is a printer status. --#: gtk/gtkprintoperation-win32.c:615 --#: modules/printbackends/cups/gtkprintbackendcups.c:1998 -+#: ../gtk/gtkprintoperation-win32.c:613 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2126 - msgid "Paused" - msgstr "Curtha ar sos" - --#: gtk/gtkprintoperation-win32.c:617 -+#: ../gtk/gtkprintoperation-win32.c:615 - msgid "Need user intervention" - msgstr "TeastaĂonn idirghabháil an Ăşsáideora" - --#: gtk/gtkprintoperation-win32.c:717 -+#: ../gtk/gtkprintoperation-win32.c:715 - msgid "Custom size" - msgstr "MĂ©id saincheaptha" - --#: gtk/gtkprintoperation-win32.c:1539 -+#: ../gtk/gtkprintoperation-win32.c:1537 - msgid "No printer found" - msgstr "NĂor aimsĂodh aon phrintĂ©ir" - --#: gtk/gtkprintoperation-win32.c:1566 -+#: ../gtk/gtkprintoperation-win32.c:1564 - msgid "Invalid argument to CreateDC" - msgstr "ArgĂłint neamhbhailĂ go CreateDC" - --#: gtk/gtkprintoperation-win32.c:1602 gtk/gtkprintoperation-win32.c:1829 -+#: ../gtk/gtkprintoperation-win32.c:1600 ../gtk/gtkprintoperation-win32.c:1827 - msgid "Error from StartDoc" - msgstr "Earráid Ăł StartDoc" - --#: gtk/gtkprintoperation-win32.c:1684 gtk/gtkprintoperation-win32.c:1707 --#: gtk/gtkprintoperation-win32.c:1755 -+#: ../gtk/gtkprintoperation-win32.c:1682 ../gtk/gtkprintoperation-win32.c:1705 -+#: ../gtk/gtkprintoperation-win32.c:1753 - msgid "Not enough free memory" - msgstr "Cuimhne Ădithe" - --#: gtk/gtkprintoperation-win32.c:1760 -+#: ../gtk/gtkprintoperation-win32.c:1758 - msgid "Invalid argument to PrintDlgEx" - msgstr "ArgĂłint neamhbhailĂ go PrintDlgEx" - --#: gtk/gtkprintoperation-win32.c:1765 -+#: ../gtk/gtkprintoperation-win32.c:1763 - msgid "Invalid pointer to PrintDlgEx" - msgstr "Pointeoir neamhbhailĂ go PrintDlgEx" - --#: gtk/gtkprintoperation-win32.c:1770 -+#: ../gtk/gtkprintoperation-win32.c:1768 - msgid "Invalid handle to PrintDlgEx" - msgstr "Lorgán neamhbhailĂ chuig PrintDlgEx" - --#: gtk/gtkprintoperation-win32.c:1775 -+#: ../gtk/gtkprintoperation-win32.c:1773 - msgid "Unspecified error" - msgstr "Earráid gan sonrĂş" - --#: gtk/gtkprintunixdialog.c:618 -+#: ../gtk/gtkprintunixdialog.c:681 - msgid "Getting printer information failed" - msgstr "Theip ar fháil eolais printĂ©ara" - --#: gtk/gtkprintunixdialog.c:1873 -+#: ../gtk/gtkprintunixdialog.c:1916 - msgid "Getting printer information..." - msgstr "Eolas printĂ©ara á fháil..." - --#: gtk/gtkprintunixdialog.c:2139 -+#: ../gtk/gtkprintunixdialog.c:2184 - msgid "Printer" - msgstr "PrintĂ©ir" - - #. Translators: this is the header for the location column in the print dialog --#: gtk/gtkprintunixdialog.c:2149 -+#: ../gtk/gtkprintunixdialog.c:2194 - msgid "Location" - msgstr "SuĂomh" - - #. Translators: this is the header for the printer status column in the print dialog --#: gtk/gtkprintunixdialog.c:2160 -+#: ../gtk/gtkprintunixdialog.c:2205 - msgid "Status" - msgstr "Stádas" - --#: gtk/gtkprintunixdialog.c:2186 -+#: ../gtk/gtkprintunixdialog.c:2231 - msgid "Range" - msgstr "Raon" - --#: gtk/gtkprintunixdialog.c:2190 -+#: ../gtk/gtkprintunixdialog.c:2235 - msgid "_All Pages" - msgstr "_Gach Leathanach" - --#: gtk/gtkprintunixdialog.c:2197 -+#: ../gtk/gtkprintunixdialog.c:2240 - msgid "C_urrent Page" - msgstr "Leathanach _Reatha" - --#: gtk/gtkprintunixdialog.c:2207 -+#: ../gtk/gtkprintunixdialog.c:2248 - msgid "Se_lection" - msgstr "_RoghnĂş" - --#: gtk/gtkprintunixdialog.c:2216 -+#: ../gtk/gtkprintunixdialog.c:2254 - msgid "Pag_es:" - msgstr "_Leathanaigh:" - --#: gtk/gtkprintunixdialog.c:2217 -+#: ../gtk/gtkprintunixdialog.c:2255 - msgid "" - "Specify one or more page ranges,\n" - " e.g. 1-3,7,11" -@@ -1668,28 +2277,28 @@ msgstr "" - "Sonraigh raon leathanaigh amháin nĂł nĂos mĂł,\n" - " m.s. 1-3,7,11" - --#: gtk/gtkprintunixdialog.c:2227 -+#: ../gtk/gtkprintunixdialog.c:2264 - msgid "Pages" - msgstr "Leathanaigh" - --#: gtk/gtkprintunixdialog.c:2240 -+#: ../gtk/gtkprintunixdialog.c:2275 - msgid "Copies" - msgstr "CĂłipeanna" - - #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns --#: gtk/gtkprintunixdialog.c:2245 -+#: ../gtk/gtkprintunixdialog.c:2280 - msgid "Copie_s:" - msgstr "CĂłip_eanna:" - --#: gtk/gtkprintunixdialog.c:2263 -+#: ../gtk/gtkprintunixdialog.c:2296 - msgid "C_ollate" - msgstr "C_omhordaigh" - --#: gtk/gtkprintunixdialog.c:2271 -+#: ../gtk/gtkprintunixdialog.c:2302 - msgid "_Reverse" - msgstr "_Aisiompaithe" - --#: gtk/gtkprintunixdialog.c:2291 -+#: ../gtk/gtkprintunixdialog.c:2318 - msgid "General" - msgstr "Ginearálta" - -@@ -1699,168 +2308,168 @@ msgstr "Ginearálta" - #. Translators: These strings name the possible arrangements of - #. * multiple pages on a sheet when printing - #. --#: gtk/gtkprintunixdialog.c:3017 --#: modules/printbackends/cups/gtkprintbackendcups.c:3508 -+#: ../gtk/gtkprintunixdialog.c:3058 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686 - msgid "Left to right, top to bottom" - msgstr "ClĂ© go deas, barr go bun" - --#: gtk/gtkprintunixdialog.c:3017 --#: modules/printbackends/cups/gtkprintbackendcups.c:3508 -+#: ../gtk/gtkprintunixdialog.c:3058 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686 - msgid "Left to right, bottom to top" - msgstr "ClĂ© go deas, bun go barr" - --#: gtk/gtkprintunixdialog.c:3018 --#: modules/printbackends/cups/gtkprintbackendcups.c:3509 -+#: ../gtk/gtkprintunixdialog.c:3059 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687 - msgid "Right to left, top to bottom" - msgstr "Deas go clĂ©, barr go bun" - --#: gtk/gtkprintunixdialog.c:3018 --#: modules/printbackends/cups/gtkprintbackendcups.c:3509 -+#: ../gtk/gtkprintunixdialog.c:3059 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687 - msgid "Right to left, bottom to top" - msgstr "Deas go clĂ©, bun go barr" - --#: gtk/gtkprintunixdialog.c:3019 --#: modules/printbackends/cups/gtkprintbackendcups.c:3510 -+#: ../gtk/gtkprintunixdialog.c:3060 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688 - msgid "Top to bottom, left to right" - msgstr "Barr go bun, clĂ© go deas" - --#: gtk/gtkprintunixdialog.c:3019 --#: modules/printbackends/cups/gtkprintbackendcups.c:3510 -+#: ../gtk/gtkprintunixdialog.c:3060 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688 - msgid "Top to bottom, right to left" - msgstr "Barr go bunn, deas go clĂ©" - --#: gtk/gtkprintunixdialog.c:3020 --#: modules/printbackends/cups/gtkprintbackendcups.c:3511 -+#: ../gtk/gtkprintunixdialog.c:3061 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689 - msgid "Bottom to top, left to right" - msgstr "Bun go barr, clĂ© go deas" - --#: gtk/gtkprintunixdialog.c:3020 --#: modules/printbackends/cups/gtkprintbackendcups.c:3511 -+#: ../gtk/gtkprintunixdialog.c:3061 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689 - msgid "Bottom to top, right to left" - msgstr "Barr go bun, deas go clĂ©" - - #. Translators, this string is used to label the option in the print - #. * dialog that controls in what order multiple pages are arranged - #. --#: gtk/gtkprintunixdialog.c:3024 gtk/gtkprintunixdialog.c:3037 --#: modules/printbackends/cups/gtkprintbackendcups.c:3543 -+#: ../gtk/gtkprintunixdialog.c:3065 ../gtk/gtkprintunixdialog.c:3078 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3766 - msgid "Page Ordering" - msgstr "Cur in Ord Leathanaigh" - --#: gtk/gtkprintunixdialog.c:3053 -+#: ../gtk/gtkprintunixdialog.c:3094 - msgid "Left to right" - msgstr "ClĂ© go deas" - --#: gtk/gtkprintunixdialog.c:3054 -+#: ../gtk/gtkprintunixdialog.c:3095 - msgid "Right to left" - msgstr "Deas go clĂ©" - --#: gtk/gtkprintunixdialog.c:3066 -+#: ../gtk/gtkprintunixdialog.c:3107 - msgid "Top to bottom" - msgstr "Barr go bun" - --#: gtk/gtkprintunixdialog.c:3067 -+#: ../gtk/gtkprintunixdialog.c:3108 - msgid "Bottom to top" - msgstr "Bun go barr" - --#: gtk/gtkprintunixdialog.c:3307 -+#: ../gtk/gtkprintunixdialog.c:3352 - msgid "Layout" - msgstr "Leagan Amach" - --#: gtk/gtkprintunixdialog.c:3311 -+#: ../gtk/gtkprintunixdialog.c:3356 - msgid "T_wo-sided:" - msgstr "_DĂ©thaobhach:" - --#: gtk/gtkprintunixdialog.c:3326 -+#: ../gtk/gtkprintunixdialog.c:3368 - msgid "Pages per _side:" - msgstr "Leathanaigh sa _taobh:" - --#: gtk/gtkprintunixdialog.c:3343 -+#: ../gtk/gtkprintunixdialog.c:3382 - msgid "Page or_dering:" - msgstr "Cur in _ord leathanaigh:" - --#: gtk/gtkprintunixdialog.c:3359 -+#: ../gtk/gtkprintunixdialog.c:3395 - msgid "_Only print:" - msgstr "_Ná priontáil ach:" - - #. In enum order --#: gtk/gtkprintunixdialog.c:3374 -+#: ../gtk/gtkprintunixdialog.c:3407 - msgid "All sheets" - msgstr "Gach leathán" - --#: gtk/gtkprintunixdialog.c:3375 -+#: ../gtk/gtkprintunixdialog.c:3408 - msgid "Even sheets" - msgstr "Leatháin chothroma" - --#: gtk/gtkprintunixdialog.c:3376 -+#: ../gtk/gtkprintunixdialog.c:3409 - msgid "Odd sheets" - msgstr "Leatháin chorra" - --#: gtk/gtkprintunixdialog.c:3379 -+#: ../gtk/gtkprintunixdialog.c:3412 - msgid "Sc_ale:" - msgstr "_Scála:" - --#: gtk/gtkprintunixdialog.c:3406 -+#: ../gtk/gtkprintunixdialog.c:3436 - msgid "Paper" - msgstr "PáipĂ©ar" - --#: gtk/gtkprintunixdialog.c:3410 -+#: ../gtk/gtkprintunixdialog.c:3440 - msgid "Paper _type:" - msgstr "Cineál an pháipĂ©ir:" - --#: gtk/gtkprintunixdialog.c:3425 -+#: ../gtk/gtkprintunixdialog.c:3452 - msgid "Paper _source:" - msgstr "_Foinse an pháipĂ©ir:" - --#: gtk/gtkprintunixdialog.c:3440 -+#: ../gtk/gtkprintunixdialog.c:3464 - msgid "Output t_ray:" - msgstr "T_ráidire aschurtha:" - --#: gtk/gtkprintunixdialog.c:3480 -+#: ../gtk/gtkprintunixdialog.c:3497 - msgid "Or_ientation:" - msgstr "_TreoshuĂomh:" - - #. In enum order --#: gtk/gtkprintunixdialog.c:3495 -+#: ../gtk/gtkprintunixdialog.c:3509 - msgid "Portrait" - msgstr "Portráid" - --#: gtk/gtkprintunixdialog.c:3496 -+#: ../gtk/gtkprintunixdialog.c:3510 - msgid "Landscape" - msgstr "TĂrdhreach" - --#: gtk/gtkprintunixdialog.c:3497 -+#: ../gtk/gtkprintunixdialog.c:3511 - msgid "Reverse portrait" - msgstr "Portráid aisiompaithe" - --#: gtk/gtkprintunixdialog.c:3498 -+#: ../gtk/gtkprintunixdialog.c:3512 - msgid "Reverse landscape" - msgstr "TĂrdhreach aisiompaithe" - --#: gtk/gtkprintunixdialog.c:3543 -+#: ../gtk/gtkprintunixdialog.c:3556 - msgid "Job Details" - msgstr "SonraĂ Jab:" - --#: gtk/gtkprintunixdialog.c:3549 -+#: ../gtk/gtkprintunixdialog.c:3560 - msgid "Pri_ority:" - msgstr "TosaĂ_ocht:" - --#: gtk/gtkprintunixdialog.c:3564 -+#: ../gtk/gtkprintunixdialog.c:3572 - msgid "_Billing info:" - msgstr "Eolas billeáil" - --#: gtk/gtkprintunixdialog.c:3582 -+#: ../gtk/gtkprintunixdialog.c:3587 - msgid "Print Document" - msgstr "Priontáil CáipĂ©is" - - #. Translators: this is one of the choices for the print at option - #. * in the print dialog - #. --#: gtk/gtkprintunixdialog.c:3591 -+#: ../gtk/gtkprintunixdialog.c:3594 - msgid "_Now" - msgstr "A_nois" - --#: gtk/gtkprintunixdialog.c:3602 -+#: ../gtk/gtkprintunixdialog.c:3603 - msgid "A_t:" - msgstr "A_g:" - -@@ -1868,7 +2477,7 @@ msgstr "A_g:" - #. * You can remove the am/pm values below for your locale if they are not - #. * supported. - #. --#: gtk/gtkprintunixdialog.c:3608 -+#: ../gtk/gtkprintunixdialog.c:3609 - msgid "" - "Specify the time of print,\n" - " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm" -@@ -1876,121 +2485,105 @@ msgstr "" - "Sonraigh am an phriontála,\n" - " m.s. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm" - --#: gtk/gtkprintunixdialog.c:3618 -+#: ../gtk/gtkprintunixdialog.c:3617 - msgid "Time of print" - msgstr "Am priontála" - --#: gtk/gtkprintunixdialog.c:3634 -+#: ../gtk/gtkprintunixdialog.c:3631 - msgid "On _hold" - msgstr "Ar feit_heamh" - --#: gtk/gtkprintunixdialog.c:3635 -+#: ../gtk/gtkprintunixdialog.c:3632 - msgid "Hold the job until it is explicitly released" - msgstr "Coinnigh an jab go dtĂ go scaoiltear Ă© go follasach" - --#: gtk/gtkprintunixdialog.c:3655 -+#: ../gtk/gtkprintunixdialog.c:3650 - msgid "Add Cover Page" - msgstr "Cuir Leathanach Cumhdaigh Leis" - - #. Translators, this is the label used for the option in the print - #. * dialog that controls the front cover page. - #. --#: gtk/gtkprintunixdialog.c:3664 -+#: ../gtk/gtkprintunixdialog.c:3657 - msgid "Be_fore:" - msgstr "_Roimh:" - - #. Translators, this is the label used for the option in the print - #. * dialog that controls the back cover page. - #. --#: gtk/gtkprintunixdialog.c:3682 -+#: ../gtk/gtkprintunixdialog.c:3672 - msgid "_After:" - msgstr "_Tar Éis:" - - #. Translators: this is the tab label for the notebook tab containing - #. * job-specific options in the print dialog - #. --#: gtk/gtkprintunixdialog.c:3700 -+#: ../gtk/gtkprintunixdialog.c:3687 - msgid "Job" - msgstr "Jab" - --#: gtk/gtkprintunixdialog.c:3766 -+#: ../gtk/gtkprintunixdialog.c:3753 - msgid "Advanced" - msgstr "Casta" - - #. Translators: this will appear as tab label in print dialog. --#: gtk/gtkprintunixdialog.c:3804 -+#: ../gtk/gtkprintunixdialog.c:3791 - msgid "Image Quality" - msgstr "CáilĂocht ĂŤomhá" - - #. Translators: this will appear as tab label in print dialog. --#: gtk/gtkprintunixdialog.c:3808 -+#: ../gtk/gtkprintunixdialog.c:3795 - msgid "Color" - msgstr "Dath" - - #. Translators: this will appear as tab label in print dialog. - #. It's a typographical term, as in "Binding and finishing" --#: gtk/gtkprintunixdialog.c:3813 -+#: ../gtk/gtkprintunixdialog.c:3800 - msgid "Finishing" - msgstr "Ag crĂochnĂş" - --#: gtk/gtkprintunixdialog.c:3823 -+#: ../gtk/gtkprintunixdialog.c:3810 - msgid "Some of the settings in the dialog conflict" - msgstr "Tá cuid de na socruithe sa dialĂłg in aghaidh a chĂ©ile" - --#: gtk/gtkprintunixdialog.c:3846 -+#: ../gtk/gtkprintunixdialog.c:3836 - msgid "Print" - msgstr "Priontáil" - --#: gtk/gtkrc.c:2834 --#, c-format --msgid "Unable to find include file: \"%s\"" --msgstr "NĂ fĂ©idir comhad ceanntáisc a aimsiĂş: \"%s\"" -- --#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473 --#, c-format --msgid "Unable to locate image file in pixmap_path: \"%s\"" --msgstr "NĂ fĂ©idir Ăomhá chomaid a aimsiĂş i bpixmap_path: \"%s\"" -- --#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173 --#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623 --#, c-format --msgid "This function is not implemented for widgets of class '%s'" --msgstr "NĂl an feidhm seo curtha i ngnĂomh do ghiuirlĂ©idĂ na haicme '%s'" -- --#: gtk/gtkrecentchooserdefault.c:482 -+#: ../gtk/gtkrecentchooserdefault.c:480 - msgid "Select which type of documents are shown" - msgstr "Roghnaigh an cineál cáipĂ©isĂ le taispeáint" - --#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175 -+#: ../gtk/gtkrecentchooserdefault.c:1130 ../gtk/gtkrecentchooserdefault.c:1167 - #, c-format - msgid "No item for URI '%s' found" - msgstr "NĂor aimsĂodh mĂr le URI '%s'" - --#: gtk/gtkrecentchooserdefault.c:1302 -+#: ../gtk/gtkrecentchooserdefault.c:1294 - msgid "Untitled filter" - msgstr "Scagaire gan teideal" - --#: gtk/gtkrecentchooserdefault.c:1655 -+#: ../gtk/gtkrecentchooserdefault.c:1647 - msgid "Could not remove item" - msgstr "NĂorbh fhĂ©idir mĂr a bhaint" - --#: gtk/gtkrecentchooserdefault.c:1699 -+#: ../gtk/gtkrecentchooserdefault.c:1691 - msgid "Could not clear list" - msgstr "NĂorbh fhĂ©idir liosta a ghlanadh" - --#: gtk/gtkrecentchooserdefault.c:1783 -+#: ../gtk/gtkrecentchooserdefault.c:1775 - msgid "Copy _Location" - msgstr "CĂłipeái_l SuĂomh" - --#: gtk/gtkrecentchooserdefault.c:1796 -+#: ../gtk/gtkrecentchooserdefault.c:1788 - msgid "_Remove From List" - msgstr "_Bain den Liosta" - --#: gtk/gtkrecentchooserdefault.c:1805 -+#: ../gtk/gtkrecentchooserdefault.c:1797 - msgid "_Clear List" - msgstr "_Glan Liosta" - --#: gtk/gtkrecentchooserdefault.c:1819 -+#: ../gtk/gtkrecentchooserdefault.c:1811 - msgid "Show _Private Resources" - msgstr "Taispeáin _AcmhainnĂ PrĂobháideacha" - -@@ -2004,21 +2597,21 @@ msgstr "Taispeáin _AcmhainnĂ PrĂobháideacha" - #. * user appended or prepended custom menu items to the - #. * recent chooser menu widget. - #. --#: gtk/gtkrecentchoosermenu.c:369 -+#: ../gtk/gtkrecentchoosermenu.c:360 - msgid "No items found" - msgstr "NĂor aimsĂodh mĂr ar bith" - --#: gtk/gtkrecentchoosermenu.c:535 gtk/gtkrecentchoosermenu.c:591 -+#: ../gtk/gtkrecentchoosermenu.c:526 ../gtk/gtkrecentchoosermenu.c:582 - #, c-format - msgid "No recently used resource found with URI `%s'" - msgstr "NĂor aimsĂodh aon acmhainn Ăşsáidte le dĂ©anaĂ leis an URI `%s'" - --#: gtk/gtkrecentchoosermenu.c:802 -+#: ../gtk/gtkrecentchoosermenu.c:792 - #, c-format - msgid "Open '%s'" - msgstr "Oscail '%s'" - --#: gtk/gtkrecentchoosermenu.c:832 -+#: ../gtk/gtkrecentchoosermenu.c:822 - msgid "Unknown item" - msgstr "MĂr anaithnid" - -@@ -2027,7 +2620,7 @@ msgstr "MĂr anaithnid" - #. * the %s is the name of the item. Please keep the _ in front - #. * of the number to give these menu items a mnemonic. - #. --#: gtk/gtkrecentchoosermenu.c:843 -+#: ../gtk/gtkrecentchoosermenu.c:833 - #, c-format - msgctxt "recent menu label" - msgid "_%d. %s" -@@ -2036,46 +2629,42 @@ msgstr "_%d. %s" - #. This is the format that is used for items in a recent files menu. - #. * The %d is the number of the item, the %s is the name of the item. - #. --#: gtk/gtkrecentchoosermenu.c:848 -+#: ../gtk/gtkrecentchoosermenu.c:838 - #, c-format - msgctxt "recent menu label" - msgid "%d. %s" - msgstr "%d. %s" - --#: gtk/gtkrecentmanager.c:980 gtk/gtkrecentmanager.c:993 --#: gtk/gtkrecentmanager.c:1131 gtk/gtkrecentmanager.c:1141 --#: gtk/gtkrecentmanager.c:1194 gtk/gtkrecentmanager.c:1203 --#: gtk/gtkrecentmanager.c:1218 -+#: ../gtk/gtkrecentmanager.c:1010 ../gtk/gtkrecentmanager.c:1023 -+#: ../gtk/gtkrecentmanager.c:1160 ../gtk/gtkrecentmanager.c:1170 -+#: ../gtk/gtkrecentmanager.c:1222 ../gtk/gtkrecentmanager.c:1231 -+#: ../gtk/gtkrecentmanager.c:1246 - #, c-format - msgid "Unable to find an item with URI '%s'" - msgstr "NĂ fĂ©idir mĂr a aimsiĂş le URI '%s'" - --#: gtk/gtkspinner.c:456 --msgctxt "throbbing progress animation widget" --msgid "Spinner" --msgstr "" -- --#: gtk/gtkspinner.c:457 --msgid "Provides visual indication of progress" -+#: ../gtk/gtkrecentmanager.c:2446 -+#, c-format -+msgid "No registered application with name '%s' for item with URI '%s' found" - msgstr "" - - #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate --#: gtk/gtkstock.c:313 -+#: ../gtk/gtkstock.c:324 - msgctxt "Stock label" - msgid "Information" - msgstr "Eolas" - --#: gtk/gtkstock.c:314 -+#: ../gtk/gtkstock.c:325 - msgctxt "Stock label" - msgid "Warning" - msgstr "Rabhadh" - --#: gtk/gtkstock.c:315 -+#: ../gtk/gtkstock.c:326 - msgctxt "Stock label" - msgid "Error" - msgstr "Earráid" - --#: gtk/gtkstock.c:316 -+#: ../gtk/gtkstock.c:327 - msgctxt "Stock label" - msgid "Question" - msgstr "Ceist" -@@ -2083,695 +2672,707 @@ msgstr "Ceist" - #. FIXME these need accelerators when appropriate, and - #. * need the mnemonics to be rationalized - #. --#: gtk/gtkstock.c:321 -+#: ../gtk/gtkstock.c:332 - msgctxt "Stock label" - msgid "_About" - msgstr "_Maidir Leis Seo" - --#: gtk/gtkstock.c:322 -+#: ../gtk/gtkstock.c:333 - msgctxt "Stock label" - msgid "_Add" - msgstr "Cuir _Leis" - --#: gtk/gtkstock.c:323 -+#: ../gtk/gtkstock.c:334 - msgctxt "Stock label" - msgid "_Apply" - msgstr "Cuir i bh_Feidhm" - --#: gtk/gtkstock.c:324 -+#: ../gtk/gtkstock.c:335 - msgctxt "Stock label" - msgid "_Bold" - msgstr "_Trom" - --#: gtk/gtkstock.c:325 -+#: ../gtk/gtkstock.c:336 - msgctxt "Stock label" - msgid "_Cancel" - msgstr "_Cealaigh" - --#: gtk/gtkstock.c:326 -+#: ../gtk/gtkstock.c:337 - #, fuzzy - msgctxt "Stock label" - msgid "_CD-ROM" - msgstr "_CD-ROM" - --#: gtk/gtkstock.c:327 -+#: ../gtk/gtkstock.c:338 - msgctxt "Stock label" - msgid "_Clear" - msgstr "_Glan" - --#: gtk/gtkstock.c:328 -+#: ../gtk/gtkstock.c:339 - msgctxt "Stock label" - msgid "_Close" - msgstr "_DĂşn" - --#: gtk/gtkstock.c:329 -+#: ../gtk/gtkstock.c:340 - msgctxt "Stock label" - msgid "C_onnect" - msgstr "_Nasc" - --#: gtk/gtkstock.c:330 -+#: ../gtk/gtkstock.c:341 - msgctxt "Stock label" - msgid "_Convert" - msgstr "_Tiontaigh" - --#: gtk/gtkstock.c:331 -+#: ../gtk/gtkstock.c:342 - msgctxt "Stock label" - msgid "_Copy" - msgstr "_CĂłipeáil" - --#: gtk/gtkstock.c:332 -+#: ../gtk/gtkstock.c:343 - msgctxt "Stock label" - msgid "Cu_t" - msgstr "_Gearr" - --#: gtk/gtkstock.c:333 -+#: ../gtk/gtkstock.c:344 - msgctxt "Stock label" - msgid "_Delete" - msgstr "_Scrios" - --#: gtk/gtkstock.c:334 -+#: ../gtk/gtkstock.c:345 - msgctxt "Stock label" - msgid "_Discard" - msgstr "_Cuir i Leataobh" - --#: gtk/gtkstock.c:335 -+#: ../gtk/gtkstock.c:346 - msgctxt "Stock label" - msgid "_Disconnect" - msgstr "_DĂnasc" - --#: gtk/gtkstock.c:336 -+#: ../gtk/gtkstock.c:347 - msgctxt "Stock label" - msgid "_Execute" - msgstr "_Rith" - --#: gtk/gtkstock.c:337 -+#: ../gtk/gtkstock.c:348 - msgctxt "Stock label" - msgid "_Edit" - msgstr "Cuir in _Eagar" - --#: gtk/gtkstock.c:338 -+#: ../gtk/gtkstock.c:349 - #, fuzzy - msgctxt "Stock label" - msgid "_File" - msgstr "Comhad" - --#: gtk/gtkstock.c:339 -+#: ../gtk/gtkstock.c:350 - msgctxt "Stock label" - msgid "_Find" - msgstr "_Aimsigh" - --#: gtk/gtkstock.c:340 -+#: ../gtk/gtkstock.c:351 - msgctxt "Stock label" - msgid "Find and _Replace" - msgstr "Aimsigh agus _Ionadaigh" - --#: gtk/gtkstock.c:341 -+#: ../gtk/gtkstock.c:352 - msgctxt "Stock label" - msgid "_Floppy" - msgstr "Diosca _Bog" - --#: gtk/gtkstock.c:342 -+#: ../gtk/gtkstock.c:353 - msgctxt "Stock label" - msgid "_Fullscreen" - msgstr "_Lánscáileán" - --#: gtk/gtkstock.c:343 -+#: ../gtk/gtkstock.c:354 - msgctxt "Stock label" - msgid "_Leave Fullscreen" - msgstr "_Fág Lánscáileán" - - #. This is a navigation label as in "go to the bottom of the page" --#: gtk/gtkstock.c:345 -+#: ../gtk/gtkstock.c:356 - msgctxt "Stock label, navigation" - msgid "_Bottom" - msgstr "_Bun:" - - #. This is a navigation label as in "go to the first page" --#: gtk/gtkstock.c:347 -+#: ../gtk/gtkstock.c:358 - msgctxt "Stock label, navigation" - msgid "_First" - msgstr "An _ChĂ©ad" - - #. This is a navigation label as in "go to the last page" --#: gtk/gtkstock.c:349 -+#: ../gtk/gtkstock.c:360 - msgctxt "Stock label, navigation" - msgid "_Last" - msgstr "An _Deireanach" - - #. This is a navigation label as in "go to the top of the page" --#: gtk/gtkstock.c:351 -+#: ../gtk/gtkstock.c:362 - msgctxt "Stock label, navigation" - msgid "_Top" - msgstr "Ba_rr:" - - #. This is a navigation label as in "go back" --#: gtk/gtkstock.c:353 -+#: ../gtk/gtkstock.c:364 - msgctxt "Stock label, navigation" - msgid "_Back" - msgstr "Ar A_is" - - #. This is a navigation label as in "go down" --#: gtk/gtkstock.c:355 -+#: ../gtk/gtkstock.c:366 - msgctxt "Stock label, navigation" - msgid "_Down" - msgstr "_SĂos" - - #. This is a navigation label as in "go forward" --#: gtk/gtkstock.c:357 -+#: ../gtk/gtkstock.c:368 - msgctxt "Stock label, navigation" - msgid "_Forward" - msgstr "Ar A_ghaidh" - - #. This is a navigation label as in "go up" --#: gtk/gtkstock.c:359 -+#: ../gtk/gtkstock.c:370 - msgctxt "Stock label, navigation" - msgid "_Up" - msgstr "_Siar" - --#: gtk/gtkstock.c:360 -+#: ../gtk/gtkstock.c:371 - #, fuzzy - msgctxt "Stock label" - msgid "_Hard Disk" - msgstr "Diosca _Crua" - --#: gtk/gtkstock.c:361 -+#: ../gtk/gtkstock.c:372 - msgctxt "Stock label" - msgid "_Help" - msgstr "Cab_hair" - --#: gtk/gtkstock.c:362 -+#: ../gtk/gtkstock.c:373 - msgctxt "Stock label" - msgid "_Home" - msgstr "_Baile" - --#: gtk/gtkstock.c:363 -+#: ../gtk/gtkstock.c:374 - msgctxt "Stock label" - msgid "Increase Indent" - msgstr "MĂ©adaigh Eang" - --#: gtk/gtkstock.c:364 -+#: ../gtk/gtkstock.c:375 - msgctxt "Stock label" - msgid "Decrease Indent" - msgstr "Laghdaigh Eang" - --#: gtk/gtkstock.c:365 -+#: ../gtk/gtkstock.c:376 - msgctxt "Stock label" - msgid "_Index" - msgstr "_InnĂ©acs" - --#: gtk/gtkstock.c:366 -+#: ../gtk/gtkstock.c:377 - msgctxt "Stock label" - msgid "_Information" - msgstr "_Eolas" - --#: gtk/gtkstock.c:367 -+#: ../gtk/gtkstock.c:378 - msgctxt "Stock label" - msgid "_Italic" - msgstr "ClĂł _Iodálach" - --#: gtk/gtkstock.c:368 -+#: ../gtk/gtkstock.c:379 - msgctxt "Stock label" - msgid "_Jump to" - msgstr "_LĂ©im Go" - - #. This is about text justification, "centered text" --#: gtk/gtkstock.c:370 -+#: ../gtk/gtkstock.c:381 - msgctxt "Stock label" - msgid "_Center" - msgstr "_Láraigh" - - #. This is about text justification --#: gtk/gtkstock.c:372 -+#: ../gtk/gtkstock.c:383 - msgctxt "Stock label" - msgid "_Fill" - msgstr "_LĂon" - - #. This is about text justification, "left-justified text" --#: gtk/gtkstock.c:374 -+#: ../gtk/gtkstock.c:385 - msgctxt "Stock label" - msgid "_Left" - msgstr "Ar _ChlĂ©" - - #. This is about text justification, "right-justified text" --#: gtk/gtkstock.c:376 -+#: ../gtk/gtkstock.c:387 - msgctxt "Stock label" - msgid "_Right" - msgstr "Ar _Dheis" - - #. Media label, as in "fast forward" --#: gtk/gtkstock.c:379 -+#: ../gtk/gtkstock.c:390 - msgctxt "Stock label, media" - msgid "_Forward" - msgstr "_Ar Aghaidh" - - #. Media label, as in "next song" --#: gtk/gtkstock.c:381 -+#: ../gtk/gtkstock.c:392 - msgctxt "Stock label, media" - msgid "_Next" - msgstr "Ar _Aghaidh" - - #. Media label, as in "pause music" --#: gtk/gtkstock.c:383 -+#: ../gtk/gtkstock.c:394 - msgctxt "Stock label, media" - msgid "P_ause" - msgstr "_Sos" - - #. Media label, as in "play music" --#: gtk/gtkstock.c:385 -+#: ../gtk/gtkstock.c:396 - msgctxt "Stock label, media" - msgid "_Play" - msgstr "_Seinn" - - #. Media label, as in "previous song" --#: gtk/gtkstock.c:387 -+#: ../gtk/gtkstock.c:398 - msgctxt "Stock label, media" - msgid "Pre_vious" - msgstr "_Roimhe Seo" - - #. Media label --#: gtk/gtkstock.c:389 -+#: ../gtk/gtkstock.c:400 - msgctxt "Stock label, media" - msgid "_Record" - msgstr "_Taifead" - - #. Media label --#: gtk/gtkstock.c:391 -+#: ../gtk/gtkstock.c:402 - msgctxt "Stock label, media" - msgid "R_ewind" - msgstr "At_ochrais" - - #. Media label --#: gtk/gtkstock.c:393 -+#: ../gtk/gtkstock.c:404 - msgctxt "Stock label, media" - msgid "_Stop" - msgstr "_Stad" - --#: gtk/gtkstock.c:394 -+#: ../gtk/gtkstock.c:405 - msgctxt "Stock label" - msgid "_Network" - msgstr "LĂo_nra" - --#: gtk/gtkstock.c:395 -+#: ../gtk/gtkstock.c:406 - msgctxt "Stock label" - msgid "_New" - msgstr "_Nua" - --#: gtk/gtkstock.c:396 -+#: ../gtk/gtkstock.c:407 - msgctxt "Stock label" - msgid "_No" - msgstr "_NĂl" - --#: gtk/gtkstock.c:397 -+#: ../gtk/gtkstock.c:408 - msgctxt "Stock label" - msgid "_OK" - msgstr "Tá g_o Maith" - --#: gtk/gtkstock.c:398 -+#: ../gtk/gtkstock.c:409 - msgctxt "Stock label" - msgid "_Open" - msgstr "_Oscail" - - #. Page orientation --#: gtk/gtkstock.c:400 -+#: ../gtk/gtkstock.c:411 - msgctxt "Stock label" - msgid "Landscape" - msgstr "TĂrdhreach" - - #. Page orientation --#: gtk/gtkstock.c:402 -+#: ../gtk/gtkstock.c:413 - msgctxt "Stock label" - msgid "Portrait" - msgstr "Portráid" - - #. Page orientation --#: gtk/gtkstock.c:404 -+#: ../gtk/gtkstock.c:415 - msgctxt "Stock label" - msgid "Reverse landscape" - msgstr "TĂrdhreach aisiompaithe" - - #. Page orientation --#: gtk/gtkstock.c:406 -+#: ../gtk/gtkstock.c:417 - msgctxt "Stock label" - msgid "Reverse portrait" - msgstr "Portráid aisiompaithe" - --#: gtk/gtkstock.c:407 -+#: ../gtk/gtkstock.c:418 - msgctxt "Stock label" - msgid "Page Set_up" - msgstr "SocrĂş _Leathanaigh" - --#: gtk/gtkstock.c:408 -+#: ../gtk/gtkstock.c:419 - msgctxt "Stock label" - msgid "_Paste" - msgstr "G_reamaigh" - --#: gtk/gtkstock.c:409 -+#: ../gtk/gtkstock.c:420 - msgctxt "Stock label" - msgid "_Preferences" - msgstr "_Sainroghanna" - --#: gtk/gtkstock.c:410 -+#: ../gtk/gtkstock.c:421 - msgctxt "Stock label" - msgid "_Print" - msgstr "_Priontáil" - --#: gtk/gtkstock.c:411 -+#: ../gtk/gtkstock.c:422 - msgctxt "Stock label" - msgid "Print Pre_view" - msgstr "RĂ©amh_amharc Priontála" - --#: gtk/gtkstock.c:412 -+#: ../gtk/gtkstock.c:423 - msgctxt "Stock label" - msgid "_Properties" - msgstr "_AirĂonna" - --#: gtk/gtkstock.c:413 -+#: ../gtk/gtkstock.c:424 - msgctxt "Stock label" - msgid "_Quit" - msgstr "_Scoir" - --#: gtk/gtkstock.c:414 -+#: ../gtk/gtkstock.c:425 - msgctxt "Stock label" - msgid "_Redo" - msgstr "_Athfheidhmigh" - --#: gtk/gtkstock.c:415 -+#: ../gtk/gtkstock.c:426 - msgctxt "Stock label" - msgid "_Refresh" - msgstr "_Athnuaigh" - --#: gtk/gtkstock.c:416 -+#: ../gtk/gtkstock.c:427 - msgctxt "Stock label" - msgid "_Remove" - msgstr "_Bain" - --#: gtk/gtkstock.c:417 -+#: ../gtk/gtkstock.c:428 - msgctxt "Stock label" - msgid "_Revert" - msgstr "_Fill" - --#: gtk/gtkstock.c:418 -+#: ../gtk/gtkstock.c:429 - msgctxt "Stock label" - msgid "_Save" - msgstr "_Sábháil" - --#: gtk/gtkstock.c:419 -+#: ../gtk/gtkstock.c:430 - msgctxt "Stock label" - msgid "Save _As" - msgstr "Sábháil M_ar" - --#: gtk/gtkstock.c:420 -+#: ../gtk/gtkstock.c:431 - msgctxt "Stock label" - msgid "Select _All" - msgstr "Roghnaigh _Gach Rud" - --#: gtk/gtkstock.c:421 -+#: ../gtk/gtkstock.c:432 - msgctxt "Stock label" - msgid "_Color" - msgstr "_Dath" - --#: gtk/gtkstock.c:422 -+#: ../gtk/gtkstock.c:433 - msgctxt "Stock label" - msgid "_Font" - msgstr "_ClĂł" - - #. Sorting direction --#: gtk/gtkstock.c:424 -+#: ../gtk/gtkstock.c:435 - msgctxt "Stock label" - msgid "_Ascending" - msgstr "_Ardaitheach" - - #. Sorting direction --#: gtk/gtkstock.c:426 -+#: ../gtk/gtkstock.c:437 - msgctxt "Stock label" - msgid "_Descending" - msgstr "ĂŤ_slitheach" - --#: gtk/gtkstock.c:427 -+#: ../gtk/gtkstock.c:438 - msgctxt "Stock label" - msgid "_Spell Check" - msgstr "_LitriĂş" - --#: gtk/gtkstock.c:428 -+#: ../gtk/gtkstock.c:439 - msgctxt "Stock label" - msgid "_Stop" - msgstr "_Stad" - - #. Font variant --#: gtk/gtkstock.c:430 -+#: ../gtk/gtkstock.c:441 - msgctxt "Stock label" - msgid "_Strikethrough" - msgstr "LĂne _TrĂ" - --#: gtk/gtkstock.c:431 -+#: ../gtk/gtkstock.c:442 - msgctxt "Stock label" - msgid "_Undelete" - msgstr "_DĂscrios" - - #. Font variant --#: gtk/gtkstock.c:433 -+#: ../gtk/gtkstock.c:444 - msgctxt "Stock label" - msgid "_Underline" - msgstr "_LĂne Faoi" - --#: gtk/gtkstock.c:434 -+#: ../gtk/gtkstock.c:445 - msgctxt "Stock label" - msgid "_Undo" - msgstr "Cea_laigh" - --#: gtk/gtkstock.c:435 -+#: ../gtk/gtkstock.c:446 - msgctxt "Stock label" - msgid "_Yes" - msgstr "_Tá" - - #. Zoom --#: gtk/gtkstock.c:437 -+#: ../gtk/gtkstock.c:448 - msgctxt "Stock label" - msgid "_Normal Size" - msgstr "_GnáthmhĂ©id" - - #. Zoom --#: gtk/gtkstock.c:439 -+#: ../gtk/gtkstock.c:450 - msgctxt "Stock label" - msgid "Best _Fit" - msgstr "_ScothoiriĂşint" - --#: gtk/gtkstock.c:440 -+#: ../gtk/gtkstock.c:451 - msgctxt "Stock label" - msgid "Zoom _In" - msgstr "SĂşmáil _Isteach" - --#: gtk/gtkstock.c:441 -+#: ../gtk/gtkstock.c:452 - msgctxt "Stock label" - msgid "Zoom _Out" - msgstr "SĂşmáil _Amach" - --#: gtk/gtktextbufferrichtext.c:650 -+#. Translators: if the "on" state label requires more than three -+#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for -+#. * the state -+#. -+#: ../gtk/gtkswitch.c:337 ../gtk/gtkswitch.c:392 ../gtk/gtkswitch.c:586 -+msgctxt "switch" -+msgid "ON" -+msgstr "âť™" -+ -+#. Translators: if the "off" state label requires more than three -+#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state -+#. -+#: ../gtk/gtkswitch.c:345 ../gtk/gtkswitch.c:393 ../gtk/gtkswitch.c:615 -+msgctxt "switch" -+msgid "OFF" -+msgstr "â—‹" -+ -+#: ../gtk/gtktextbufferrichtext.c:649 - #, c-format - msgid "Unknown error when trying to deserialize %s" - msgstr "" - --#: gtk/gtktextbufferrichtext.c:709 -+#: ../gtk/gtktextbufferrichtext.c:708 - #, c-format - msgid "No deserialize function found for format %s" - msgstr "" - --#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821 -+#: ../gtk/gtktextbufferserialize.c:798 ../gtk/gtktextbufferserialize.c:824 - #, c-format - msgid "Both \"id\" and \"name\" were found on the <%s> element" - msgstr "AimsĂodh \"id\" agus \"name\" araon ar an eilimint <%s>" - --#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831 -+#: ../gtk/gtktextbufferserialize.c:808 ../gtk/gtktextbufferserialize.c:834 - #, c-format - msgid "The attribute \"%s\" was found twice on the <%s> element" - msgstr "AimsĂodh an trĂ©ith \"%s\" faoi dhĂł ar an eilimint <%s>" - --#: gtk/gtktextbufferserialize.c:845 -+#: ../gtk/gtktextbufferserialize.c:850 - #, fuzzy, c-format - msgid "<%s> element has invalid ID \"%s\"" - msgstr "Tá ca neamhbhailĂ \"%2$s\" ag eilimint <%1$s>" - --#: gtk/gtktextbufferserialize.c:855 -+#: ../gtk/gtktextbufferserialize.c:860 - #, c-format - msgid "<%s> element has neither a \"name\" nor an \"id\" attribute" - msgstr "NĂl trĂ©ith \"name\" ná \"id\" ag an eilimint <%s>" - --#: gtk/gtktextbufferserialize.c:942 -+#: ../gtk/gtktextbufferserialize.c:947 - #, c-format - msgid "Attribute \"%s\" repeated twice on the same <%s> element" - msgstr "" - --#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985 -+#: ../gtk/gtktextbufferserialize.c:965 ../gtk/gtktextbufferserialize.c:990 - #, c-format - msgid "Attribute \"%s\" is invalid on <%s> element in this context" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1024 -+#: ../gtk/gtktextbufferserialize.c:1029 - #, c-format - msgid "Tag \"%s\" has not been defined." - msgstr "NĂor sainmhĂnĂodh an chlib \"%s\"." - --#: gtk/gtktextbufferserialize.c:1036 -+#: ../gtk/gtktextbufferserialize.c:1041 - msgid "Anonymous tag found and tags can not be created." - msgstr "" - --#: gtk/gtktextbufferserialize.c:1047 -+#: ../gtk/gtktextbufferserialize.c:1052 - #, c-format - msgid "Tag \"%s\" does not exist in buffer and tags can not be created." - msgstr "" - --#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221 --#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398 -+#: ../gtk/gtktextbufferserialize.c:1151 ../gtk/gtktextbufferserialize.c:1226 -+#: ../gtk/gtktextbufferserialize.c:1331 ../gtk/gtktextbufferserialize.c:1405 - #, c-format - msgid "Element <%s> is not allowed below <%s>" - msgstr "NĂ cheadaĂtear an eilimint <%s> faoi <%s>" - --#: gtk/gtktextbufferserialize.c:1177 -+#: ../gtk/gtktextbufferserialize.c:1182 - #, c-format - msgid "\"%s\" is not a valid attribute type" - msgstr "NĂ cineál trĂ©ithe bailĂ Ă© \"%s\"" - --#: gtk/gtktextbufferserialize.c:1185 -+#: ../gtk/gtktextbufferserialize.c:1190 - #, c-format - msgid "\"%s\" is not a valid attribute name" - msgstr "NĂ ainm trĂ©ithe bailĂ Ă© \"%s\"" - --#: gtk/gtktextbufferserialize.c:1195 -+#: ../gtk/gtktextbufferserialize.c:1200 - #, c-format - msgid "" - "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\"" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1204 -+#: ../gtk/gtktextbufferserialize.c:1209 - #, c-format - msgid "\"%s\" is not a valid value for attribute \"%s\"" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1289 -+#: ../gtk/gtktextbufferserialize.c:1294 - #, c-format - msgid "Tag \"%s\" already defined" - msgstr "SainmhĂnĂodh clib \"%s\" cheana." - --#: gtk/gtktextbufferserialize.c:1300 -+#: ../gtk/gtktextbufferserialize.c:1307 - #, c-format - msgid "Tag \"%s\" has invalid priority \"%s\"" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1353 -+#: ../gtk/gtktextbufferserialize.c:1360 - #, c-format - msgid "Outermost element in text must be <text_view_markup> not <%s>" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378 -+#: ../gtk/gtktextbufferserialize.c:1369 ../gtk/gtktextbufferserialize.c:1385 - #, c-format - msgid "A <%s> element has already been specified" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1384 -+#: ../gtk/gtktextbufferserialize.c:1391 - msgid "A <text> element can't occur before a <tags> element" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1784 -+#: ../gtk/gtktextbufferserialize.c:1790 - msgid "Serialized data is malformed" - msgstr "" - --#: gtk/gtktextbufferserialize.c:1862 -+#: ../gtk/gtktextbufferserialize.c:1868 - msgid "" - "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001" - msgstr "" - --#: gtk/gtktextutil.c:60 -+#: ../gtk/gtktextutil.c:58 - msgid "LRM _Left-to-right mark" - msgstr "LRM Marc _ClĂ©-go-deas" - --#: gtk/gtktextutil.c:61 -+#: ../gtk/gtktextutil.c:59 - msgid "RLM _Right-to-left mark" - msgstr "RLM Marc _Deas-go-clĂ©" - --#: gtk/gtktextutil.c:62 -+#: ../gtk/gtktextutil.c:60 - msgid "LRE Left-to-right _embedding" - msgstr "LRE _LeabĂş ClĂ©-go-deas" - --#: gtk/gtktextutil.c:63 -+#: ../gtk/gtktextutil.c:61 - msgid "RLE Right-to-left e_mbedding" - msgstr "RLE L_eabĂş Deas-go-clĂ©" - --#: gtk/gtktextutil.c:64 -+#: ../gtk/gtktextutil.c:62 - msgid "LRO Left-to-right _override" - msgstr "LRO _SárĂş ClĂ©-go-deas" - --#: gtk/gtktextutil.c:65 -+#: ../gtk/gtktextutil.c:63 - msgid "RLO Right-to-left o_verride" - msgstr "RLO Sá_rĂş Deas-go-clĂ©" - --#: gtk/gtktextutil.c:66 -+#: ../gtk/gtktextutil.c:64 - msgid "PDF _Pop directional formatting" - msgstr "" - --#: gtk/gtktextutil.c:67 -+#: ../gtk/gtktextutil.c:65 - msgid "ZWS _Zero width space" - msgstr "" - --#: gtk/gtktextutil.c:68 -+#: ../gtk/gtktextutil.c:66 - msgid "ZWJ Zero width _joiner" - msgstr "" - --#: gtk/gtktextutil.c:69 -+#: ../gtk/gtktextutil.c:67 - msgid "ZWNJ Zero width _non-joiner" - msgstr "" - --#: gtk/gtkthemes.c:72 --#, c-format --msgid "Unable to locate theme engine in module_path: \"%s\"," --msgstr "NĂ fĂ©idir inneall tĂ©ama a aimsiĂş i module_path: \"%s\"," -- --#: gtk/gtkuimanager.c:1505 -+#: ../gtk/gtkuimanager.c:1781 - #, c-format - msgid "Unexpected start tag '%s' on line %d char %d" - msgstr "" - --#: gtk/gtkuimanager.c:1595 -+#: ../gtk/gtkuimanager.c:1871 - #, c-format - msgid "Unexpected character data on line %d char %d" - msgstr "" - --#: gtk/gtkuimanager.c:2427 -+#: ../gtk/gtkuimanager.c:2694 - msgid "Empty" - msgstr "Folamh" - --#: gtk/gtkvolumebutton.c:83 -+#: ../gtk/gtkvolumebutton.c:169 - msgid "Volume" - msgstr "Airde" - --#: gtk/gtkvolumebutton.c:85 -+#: ../gtk/gtkvolumebutton.c:171 - msgid "Turns volume down or up" - msgstr "MĂ©adaĂonn nĂł laghdaĂonn sĂ© seo an airde" - --#: gtk/gtkvolumebutton.c:88 -+#: ../gtk/gtkvolumebutton.c:174 - msgid "Adjusts the volume" - msgstr "CoigeartaĂonn sĂ© seo an airde" - --#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97 -+#: ../gtk/gtkvolumebutton.c:180 ../gtk/gtkvolumebutton.c:183 - msgid "Volume Down" - msgstr "Airde SĂos" - --#: gtk/gtkvolumebutton.c:96 -+#: ../gtk/gtkvolumebutton.c:182 - msgid "Decreases the volume" - msgstr "LaghdaĂonn sĂ© seo an airde" - --#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103 -+#: ../gtk/gtkvolumebutton.c:186 ../gtk/gtkvolumebutton.c:189 - msgid "Volume Up" - msgstr "Airde Suas" - --#: gtk/gtkvolumebutton.c:102 -+#: ../gtk/gtkvolumebutton.c:188 - msgid "Increases the volume" - msgstr "MĂ©adaĂonn sĂ© seo an airde" - --#: gtk/gtkvolumebutton.c:160 -+#: ../gtk/gtkvolumebutton.c:246 - msgid "Muted" - msgstr "Gan fuaim" - --#: gtk/gtkvolumebutton.c:164 -+#: ../gtk/gtkvolumebutton.c:250 - msgid "Full Volume" - msgstr "Airde Iomlán" - -@@ -2780,932 +3381,927 @@ msgstr "Airde Iomlán" - #. * Translate the "%d" to "%Id" if you want to use localised digits, - #. * or otherwise translate the "%d" to "%d". - #. --#: gtk/gtkvolumebutton.c:177 -+#: ../gtk/gtkvolumebutton.c:263 - #, c-format - msgctxt "volume percentage" - msgid "%d %%" - msgstr "%d %%" - --#: gtk/paper_names_offsets.c:4 -+#: ../gtk/paper_names_offsets.c:4 - msgctxt "paper size" - msgid "asme_f" - msgstr "asme_f" - --#: gtk/paper_names_offsets.c:5 -+#: ../gtk/paper_names_offsets.c:5 - msgctxt "paper size" - msgid "A0x2" - msgstr "A0x2" - --#: gtk/paper_names_offsets.c:6 -+#: ../gtk/paper_names_offsets.c:6 - msgctxt "paper size" - msgid "A0" - msgstr "A0" - --#: gtk/paper_names_offsets.c:7 -+#: ../gtk/paper_names_offsets.c:7 - msgctxt "paper size" - msgid "A0x3" - msgstr "A0x3" - --#: gtk/paper_names_offsets.c:8 -+#: ../gtk/paper_names_offsets.c:8 - msgctxt "paper size" - msgid "A1" - msgstr "A1" - --#: gtk/paper_names_offsets.c:9 -+#: ../gtk/paper_names_offsets.c:9 - msgctxt "paper size" - msgid "A10" - msgstr "A10" - --#: gtk/paper_names_offsets.c:10 -+#: ../gtk/paper_names_offsets.c:10 - msgctxt "paper size" - msgid "A1x3" - msgstr "A1x3" - --#: gtk/paper_names_offsets.c:11 -+#: ../gtk/paper_names_offsets.c:11 - msgctxt "paper size" - msgid "A1x4" - msgstr "A1x4" - --#: gtk/paper_names_offsets.c:12 -+#: ../gtk/paper_names_offsets.c:12 - msgctxt "paper size" - msgid "A2" - msgstr "A2" - --#: gtk/paper_names_offsets.c:13 -+#: ../gtk/paper_names_offsets.c:13 - msgctxt "paper size" - msgid "A2x3" - msgstr "A2x3" - --#: gtk/paper_names_offsets.c:14 -+#: ../gtk/paper_names_offsets.c:14 - msgctxt "paper size" - msgid "A2x4" - msgstr "A2x4" - --#: gtk/paper_names_offsets.c:15 -+#: ../gtk/paper_names_offsets.c:15 - msgctxt "paper size" - msgid "A2x5" - msgstr "A2x5" - --#: gtk/paper_names_offsets.c:16 -+#: ../gtk/paper_names_offsets.c:16 - msgctxt "paper size" - msgid "A3" - msgstr "A3" - --#: gtk/paper_names_offsets.c:17 -+#: ../gtk/paper_names_offsets.c:17 - msgctxt "paper size" - msgid "A3 Extra" - msgstr "A3 Breise" - --#: gtk/paper_names_offsets.c:18 -+#: ../gtk/paper_names_offsets.c:18 - msgctxt "paper size" - msgid "A3x3" - msgstr "A3x3" - --#: gtk/paper_names_offsets.c:19 -+#: ../gtk/paper_names_offsets.c:19 - msgctxt "paper size" - msgid "A3x4" - msgstr "A3x4" - --#: gtk/paper_names_offsets.c:20 -+#: ../gtk/paper_names_offsets.c:20 - msgctxt "paper size" - msgid "A3x5" - msgstr "A3x5" - --#: gtk/paper_names_offsets.c:21 -+#: ../gtk/paper_names_offsets.c:21 - msgctxt "paper size" - msgid "A3x6" - msgstr "A3x6" - --#: gtk/paper_names_offsets.c:22 -+#: ../gtk/paper_names_offsets.c:22 - msgctxt "paper size" - msgid "A3x7" - msgstr "A3x7" - --#: gtk/paper_names_offsets.c:23 -+#: ../gtk/paper_names_offsets.c:23 - msgctxt "paper size" - msgid "A4" - msgstr "A4" - --#: gtk/paper_names_offsets.c:24 -+#: ../gtk/paper_names_offsets.c:24 - msgctxt "paper size" - msgid "A4 Extra" - msgstr "A4 Breise" - --#: gtk/paper_names_offsets.c:25 -+#: ../gtk/paper_names_offsets.c:25 - msgctxt "paper size" - msgid "A4 Tab" - msgstr "A4 Clib" - --#: gtk/paper_names_offsets.c:26 -+#: ../gtk/paper_names_offsets.c:26 - msgctxt "paper size" - msgid "A4x3" - msgstr "A4x3" - --#: gtk/paper_names_offsets.c:27 -+#: ../gtk/paper_names_offsets.c:27 - msgctxt "paper size" - msgid "A4x4" - msgstr "A4x4" - --#: gtk/paper_names_offsets.c:28 -+#: ../gtk/paper_names_offsets.c:28 - msgctxt "paper size" - msgid "A4x5" - msgstr "A4x5" - --#: gtk/paper_names_offsets.c:29 -+#: ../gtk/paper_names_offsets.c:29 - msgctxt "paper size" - msgid "A4x6" - msgstr "A4x6" - --#: gtk/paper_names_offsets.c:30 -+#: ../gtk/paper_names_offsets.c:30 - msgctxt "paper size" - msgid "A4x7" - msgstr "A4x7" - --#: gtk/paper_names_offsets.c:31 -+#: ../gtk/paper_names_offsets.c:31 - msgctxt "paper size" - msgid "A4x8" - msgstr "A4x8" - --#: gtk/paper_names_offsets.c:32 -+#: ../gtk/paper_names_offsets.c:32 - msgctxt "paper size" - msgid "A4x9" - msgstr "A4x9" - --#: gtk/paper_names_offsets.c:33 -+#: ../gtk/paper_names_offsets.c:33 - msgctxt "paper size" - msgid "A5" - msgstr "A5" - --#: gtk/paper_names_offsets.c:34 -+#: ../gtk/paper_names_offsets.c:34 - msgctxt "paper size" - msgid "A5 Extra" - msgstr "A5 Breise" - --#: gtk/paper_names_offsets.c:35 -+#: ../gtk/paper_names_offsets.c:35 - msgctxt "paper size" - msgid "A6" - msgstr "A6" - --#: gtk/paper_names_offsets.c:36 -+#: ../gtk/paper_names_offsets.c:36 - msgctxt "paper size" - msgid "A7" - msgstr "A7" - --#: gtk/paper_names_offsets.c:37 -+#: ../gtk/paper_names_offsets.c:37 - msgctxt "paper size" - msgid "A8" - msgstr "A8" - --#: gtk/paper_names_offsets.c:38 -+#: ../gtk/paper_names_offsets.c:38 - msgctxt "paper size" - msgid "A9" - msgstr "A9" - --#: gtk/paper_names_offsets.c:39 -+#: ../gtk/paper_names_offsets.c:39 - msgctxt "paper size" - msgid "B0" - msgstr "B0" - --#: gtk/paper_names_offsets.c:40 -+#: ../gtk/paper_names_offsets.c:40 - msgctxt "paper size" - msgid "B1" - msgstr "B1" - --#: gtk/paper_names_offsets.c:41 -+#: ../gtk/paper_names_offsets.c:41 - msgctxt "paper size" - msgid "B10" - msgstr "B10" - --#: gtk/paper_names_offsets.c:42 -+#: ../gtk/paper_names_offsets.c:42 - msgctxt "paper size" - msgid "B2" - msgstr "B2" - --#: gtk/paper_names_offsets.c:43 -+#: ../gtk/paper_names_offsets.c:43 - msgctxt "paper size" - msgid "B3" - msgstr "B3" - --#: gtk/paper_names_offsets.c:44 -+#: ../gtk/paper_names_offsets.c:44 - msgctxt "paper size" - msgid "B4" - msgstr "B4" - --#: gtk/paper_names_offsets.c:45 -+#: ../gtk/paper_names_offsets.c:45 - msgctxt "paper size" - msgid "B5" - msgstr "B5" - --#: gtk/paper_names_offsets.c:46 -+#: ../gtk/paper_names_offsets.c:46 - msgctxt "paper size" - msgid "B5 Extra" - msgstr "B5 Breise" - --#: gtk/paper_names_offsets.c:47 -+#: ../gtk/paper_names_offsets.c:47 - msgctxt "paper size" - msgid "B6" - msgstr "B6" - --#: gtk/paper_names_offsets.c:48 -+#: ../gtk/paper_names_offsets.c:48 - msgctxt "paper size" - msgid "B6/C4" - msgstr "B6/C4" - --#: gtk/paper_names_offsets.c:49 -+#: ../gtk/paper_names_offsets.c:49 - msgctxt "paper size" - msgid "B7" - msgstr "B7" - --#: gtk/paper_names_offsets.c:50 -+#: ../gtk/paper_names_offsets.c:50 - msgctxt "paper size" - msgid "B8" - msgstr "B8" - --#: gtk/paper_names_offsets.c:51 -+#: ../gtk/paper_names_offsets.c:51 - msgctxt "paper size" - msgid "B9" - msgstr "B9" - --#: gtk/paper_names_offsets.c:52 -+#: ../gtk/paper_names_offsets.c:52 - msgctxt "paper size" - msgid "C0" - msgstr "C0" - --#: gtk/paper_names_offsets.c:53 -+#: ../gtk/paper_names_offsets.c:53 - msgctxt "paper size" - msgid "C1" - msgstr "C1" - --#: gtk/paper_names_offsets.c:54 -+#: ../gtk/paper_names_offsets.c:54 - msgctxt "paper size" - msgid "C10" - msgstr "C10" - --#: gtk/paper_names_offsets.c:55 -+#: ../gtk/paper_names_offsets.c:55 - msgctxt "paper size" - msgid "C2" - msgstr "C2" - --#: gtk/paper_names_offsets.c:56 -+#: ../gtk/paper_names_offsets.c:56 - msgctxt "paper size" - msgid "C3" - msgstr "C3" - --#: gtk/paper_names_offsets.c:57 -+#: ../gtk/paper_names_offsets.c:57 - msgctxt "paper size" - msgid "C4" - msgstr "C4" - --#: gtk/paper_names_offsets.c:58 -+#: ../gtk/paper_names_offsets.c:58 - msgctxt "paper size" - msgid "C5" - msgstr "C5" - --#: gtk/paper_names_offsets.c:59 -+#: ../gtk/paper_names_offsets.c:59 - msgctxt "paper size" - msgid "C6" - msgstr "C6" - --#: gtk/paper_names_offsets.c:60 -+#: ../gtk/paper_names_offsets.c:60 - msgctxt "paper size" - msgid "C6/C5" - msgstr "C6/C5" - --#: gtk/paper_names_offsets.c:61 -+#: ../gtk/paper_names_offsets.c:61 - msgctxt "paper size" - msgid "C7" - msgstr "C7" - --#: gtk/paper_names_offsets.c:62 -+#: ../gtk/paper_names_offsets.c:62 - msgctxt "paper size" - msgid "C7/C6" - msgstr "C7/C6" - --#: gtk/paper_names_offsets.c:63 -+#: ../gtk/paper_names_offsets.c:63 - msgctxt "paper size" - msgid "C8" - msgstr "C8" - --#: gtk/paper_names_offsets.c:64 -+#: ../gtk/paper_names_offsets.c:64 - msgctxt "paper size" - msgid "C9" - msgstr "C9" - --#: gtk/paper_names_offsets.c:65 -+#: ../gtk/paper_names_offsets.c:65 - msgctxt "paper size" - msgid "DL Envelope" - msgstr "ClĂşdach DL" - --#: gtk/paper_names_offsets.c:66 -+#: ../gtk/paper_names_offsets.c:66 - msgctxt "paper size" - msgid "RA0" - msgstr "RA0" - --#: gtk/paper_names_offsets.c:67 -+#: ../gtk/paper_names_offsets.c:67 - msgctxt "paper size" - msgid "RA1" - msgstr "RA1" - --#: gtk/paper_names_offsets.c:68 -+#: ../gtk/paper_names_offsets.c:68 - msgctxt "paper size" - msgid "RA2" - msgstr "RA2" - --#: gtk/paper_names_offsets.c:69 -+#: ../gtk/paper_names_offsets.c:69 - msgctxt "paper size" - msgid "SRA0" - msgstr "SRA0" - --#: gtk/paper_names_offsets.c:70 -+#: ../gtk/paper_names_offsets.c:70 - msgctxt "paper size" - msgid "SRA1" - msgstr "SRA1" - --#: gtk/paper_names_offsets.c:71 -+#: ../gtk/paper_names_offsets.c:71 - msgctxt "paper size" - msgid "SRA2" - msgstr "SRA2" - --#: gtk/paper_names_offsets.c:72 -+#: ../gtk/paper_names_offsets.c:72 - msgctxt "paper size" - msgid "JB0" - msgstr "JB0" - --#: gtk/paper_names_offsets.c:73 -+#: ../gtk/paper_names_offsets.c:73 - msgctxt "paper size" - msgid "JB1" - msgstr "JB1" - --#: gtk/paper_names_offsets.c:74 -+#: ../gtk/paper_names_offsets.c:74 - msgctxt "paper size" - msgid "JB10" - msgstr "JB10" - --#: gtk/paper_names_offsets.c:75 -+#: ../gtk/paper_names_offsets.c:75 - msgctxt "paper size" - msgid "JB2" - msgstr "JB2" - --#: gtk/paper_names_offsets.c:76 -+#: ../gtk/paper_names_offsets.c:76 - msgctxt "paper size" - msgid "JB3" - msgstr "JB3" - --#: gtk/paper_names_offsets.c:77 -+#: ../gtk/paper_names_offsets.c:77 - msgctxt "paper size" - msgid "JB4" - msgstr "JB4" - --#: gtk/paper_names_offsets.c:78 -+#: ../gtk/paper_names_offsets.c:78 - msgctxt "paper size" - msgid "JB5" - msgstr "JB5" - --#: gtk/paper_names_offsets.c:79 -+#: ../gtk/paper_names_offsets.c:79 - msgctxt "paper size" - msgid "JB6" - msgstr "JB6" - --#: gtk/paper_names_offsets.c:80 -+#: ../gtk/paper_names_offsets.c:80 - msgctxt "paper size" - msgid "JB7" - msgstr "JB7" - --#: gtk/paper_names_offsets.c:81 -+#: ../gtk/paper_names_offsets.c:81 - msgctxt "paper size" - msgid "JB8" - msgstr "JB8" - --#: gtk/paper_names_offsets.c:82 -+#: ../gtk/paper_names_offsets.c:82 - msgctxt "paper size" - msgid "JB9" - msgstr "JB9" - --#: gtk/paper_names_offsets.c:83 -+#: ../gtk/paper_names_offsets.c:83 - msgctxt "paper size" - msgid "jis exec" - msgstr "jis exec" - --#: gtk/paper_names_offsets.c:84 -+#: ../gtk/paper_names_offsets.c:84 - msgctxt "paper size" - msgid "Choukei 2 Envelope" - msgstr "ClĂşdach Choukei 2" - --#: gtk/paper_names_offsets.c:85 -+#: ../gtk/paper_names_offsets.c:85 - msgctxt "paper size" - msgid "Choukei 3 Envelope" - msgstr "ClĂşdach Choukei 3" - --#: gtk/paper_names_offsets.c:86 -+#: ../gtk/paper_names_offsets.c:86 - msgctxt "paper size" - msgid "Choukei 4 Envelope" - msgstr "ClĂşdach Choukei 4" - --#: gtk/paper_names_offsets.c:87 -+#: ../gtk/paper_names_offsets.c:87 - msgctxt "paper size" - msgid "hagaki (postcard)" - msgstr "hagaki (cárta poist)" - --#: gtk/paper_names_offsets.c:88 -+#: ../gtk/paper_names_offsets.c:88 - msgctxt "paper size" - msgid "kahu Envelope" - msgstr "ClĂşdach kahu" - --#: gtk/paper_names_offsets.c:89 -+#: ../gtk/paper_names_offsets.c:89 - msgctxt "paper size" - msgid "kaku2 Envelope" - msgstr "ClĂşdach kaku2" - --#: gtk/paper_names_offsets.c:90 -+#: ../gtk/paper_names_offsets.c:90 - msgctxt "paper size" - msgid "oufuku (reply postcard)" - msgstr "oufuku (cárta poist freagartha)" - --#: gtk/paper_names_offsets.c:91 -+#: ../gtk/paper_names_offsets.c:91 - msgctxt "paper size" - msgid "you4 Envelope" - msgstr "ClĂşdach you4" - --#: gtk/paper_names_offsets.c:92 -+#: ../gtk/paper_names_offsets.c:92 - msgctxt "paper size" - msgid "10x11" - msgstr "10x11" - --#: gtk/paper_names_offsets.c:93 -+#: ../gtk/paper_names_offsets.c:93 - msgctxt "paper size" - msgid "10x13" - msgstr "10x13" - --#: gtk/paper_names_offsets.c:94 -+#: ../gtk/paper_names_offsets.c:94 - msgctxt "paper size" - msgid "10x14" - msgstr "10x14" - --#: gtk/paper_names_offsets.c:95 gtk/paper_names_offsets.c:96 -+#: ../gtk/paper_names_offsets.c:95 ../gtk/paper_names_offsets.c:96 - msgctxt "paper size" - msgid "10x15" - msgstr "10x15" - --#: gtk/paper_names_offsets.c:97 -+#: ../gtk/paper_names_offsets.c:97 - msgctxt "paper size" - msgid "11x12" - msgstr "11x12" - --#: gtk/paper_names_offsets.c:98 -+#: ../gtk/paper_names_offsets.c:98 - msgctxt "paper size" - msgid "11x15" - msgstr "11x15" - --#: gtk/paper_names_offsets.c:99 -+#: ../gtk/paper_names_offsets.c:99 - msgctxt "paper size" - msgid "12x19" - msgstr "12x19" - --#: gtk/paper_names_offsets.c:100 -+#: ../gtk/paper_names_offsets.c:100 - msgctxt "paper size" - msgid "5x7" - msgstr "5x7" - --#: gtk/paper_names_offsets.c:101 -+#: ../gtk/paper_names_offsets.c:101 - msgctxt "paper size" - msgid "6x9 Envelope" - msgstr "ClĂşdach 6x9" - --#: gtk/paper_names_offsets.c:102 -+#: ../gtk/paper_names_offsets.c:102 - msgctxt "paper size" - msgid "7x9 Envelope" - msgstr "ClĂşdach 7x9" - --#: gtk/paper_names_offsets.c:103 -+#: ../gtk/paper_names_offsets.c:103 - msgctxt "paper size" - msgid "9x11 Envelope" - msgstr "ClĂşdach 9x11" - --#: gtk/paper_names_offsets.c:104 -+#: ../gtk/paper_names_offsets.c:104 - msgctxt "paper size" - msgid "a2 Envelope" - msgstr "ClĂşdach a2" - --#: gtk/paper_names_offsets.c:105 -+#: ../gtk/paper_names_offsets.c:105 - msgctxt "paper size" - msgid "Arch A" - msgstr "Arch A" - --#: gtk/paper_names_offsets.c:106 -+#: ../gtk/paper_names_offsets.c:106 - msgctxt "paper size" - msgid "Arch B" - msgstr "Arch B" - --#: gtk/paper_names_offsets.c:107 -+#: ../gtk/paper_names_offsets.c:107 - msgctxt "paper size" - msgid "Arch C" - msgstr "Arch C" - --#: gtk/paper_names_offsets.c:108 -+#: ../gtk/paper_names_offsets.c:108 - msgctxt "paper size" - msgid "Arch D" - msgstr "Arch D" - --#: gtk/paper_names_offsets.c:109 -+#: ../gtk/paper_names_offsets.c:109 - msgctxt "paper size" - msgid "Arch E" - msgstr "Arch E" - --#: gtk/paper_names_offsets.c:110 -+#: ../gtk/paper_names_offsets.c:110 - msgctxt "paper size" - msgid "b-plus" - msgstr "b-plus" - --#: gtk/paper_names_offsets.c:111 -+#: ../gtk/paper_names_offsets.c:111 - msgctxt "paper size" - msgid "c" - msgstr "c" - --#: gtk/paper_names_offsets.c:112 -+#: ../gtk/paper_names_offsets.c:112 - msgctxt "paper size" - msgid "c5 Envelope" - msgstr "ClĂşdach c5" - --#: gtk/paper_names_offsets.c:113 -+#: ../gtk/paper_names_offsets.c:113 - msgctxt "paper size" - msgid "d" - msgstr "d" - --#: gtk/paper_names_offsets.c:114 -+#: ../gtk/paper_names_offsets.c:114 - msgctxt "paper size" - msgid "e" - msgstr "e" - --#: gtk/paper_names_offsets.c:115 -+#: ../gtk/paper_names_offsets.c:115 - msgctxt "paper size" - msgid "edp" - msgstr "edp" - --#: gtk/paper_names_offsets.c:116 -+#: ../gtk/paper_names_offsets.c:116 - msgctxt "paper size" - msgid "European edp" - msgstr "edp Eorpach" - --#: gtk/paper_names_offsets.c:117 -+#: ../gtk/paper_names_offsets.c:117 - msgctxt "paper size" - msgid "Executive" - msgstr "Feidhmeannach" - --#: gtk/paper_names_offsets.c:118 -+#: ../gtk/paper_names_offsets.c:118 - msgctxt "paper size" - msgid "f" - msgstr "f" - --#: gtk/paper_names_offsets.c:119 -+#: ../gtk/paper_names_offsets.c:119 - msgctxt "paper size" - msgid "FanFold European" - msgstr "FanFold Eorpach" - --#: gtk/paper_names_offsets.c:120 -+#: ../gtk/paper_names_offsets.c:120 - msgctxt "paper size" - msgid "FanFold US" - msgstr "FanFold (SAM)" - --#: gtk/paper_names_offsets.c:121 -+#: ../gtk/paper_names_offsets.c:121 - msgctxt "paper size" - msgid "FanFold German Legal" - msgstr "Fanfold DlĂ Gearmánach" - --#: gtk/paper_names_offsets.c:122 -+#: ../gtk/paper_names_offsets.c:122 - msgctxt "paper size" - msgid "Government Legal" - msgstr "DlĂ Rialtais" - --#: gtk/paper_names_offsets.c:123 -+#: ../gtk/paper_names_offsets.c:123 - msgctxt "paper size" - msgid "Government Letter" - msgstr "Litir Rialtais" - --#: gtk/paper_names_offsets.c:124 -+#: ../gtk/paper_names_offsets.c:124 - msgctxt "paper size" - msgid "Index 3x5" - msgstr "InnĂ©acs 3x5" - --#: gtk/paper_names_offsets.c:125 -+#: ../gtk/paper_names_offsets.c:125 - msgctxt "paper size" - msgid "Index 4x6 (postcard)" - msgstr "InnĂ©acs 4x6 (cárta poist)" - --#: gtk/paper_names_offsets.c:126 -+#: ../gtk/paper_names_offsets.c:126 - msgctxt "paper size" - msgid "Index 4x6 ext" - msgstr "InnĂ©acs 4x6 ext" - --#: gtk/paper_names_offsets.c:127 -+#: ../gtk/paper_names_offsets.c:127 - msgctxt "paper size" - msgid "Index 5x8" - msgstr "InnĂ©acs 5x8" - --#: gtk/paper_names_offsets.c:128 -+#: ../gtk/paper_names_offsets.c:128 - msgctxt "paper size" - msgid "Invoice" - msgstr "Sonrasc" - --#: gtk/paper_names_offsets.c:129 -+#: ../gtk/paper_names_offsets.c:129 - msgctxt "paper size" - msgid "Tabloid" - msgstr "TablĂłid" - --#: gtk/paper_names_offsets.c:130 -+#: ../gtk/paper_names_offsets.c:130 - msgctxt "paper size" - msgid "US Legal" - msgstr "DlĂ (SAM)" - --#: gtk/paper_names_offsets.c:131 -+#: ../gtk/paper_names_offsets.c:131 - msgctxt "paper size" - msgid "US Legal Extra" - msgstr "DlĂ Breise (SAM)" - --#: gtk/paper_names_offsets.c:132 -+#: ../gtk/paper_names_offsets.c:132 - msgctxt "paper size" - msgid "US Letter" - msgstr "Litir (SAM)" - --#: gtk/paper_names_offsets.c:133 -+#: ../gtk/paper_names_offsets.c:133 - msgctxt "paper size" - msgid "US Letter Extra" - msgstr "Litir Breise (SAM)" - --#: gtk/paper_names_offsets.c:134 -+#: ../gtk/paper_names_offsets.c:134 - msgctxt "paper size" - msgid "US Letter Plus" - msgstr "Litir Plus (SAM)" - --#: gtk/paper_names_offsets.c:135 -+#: ../gtk/paper_names_offsets.c:135 - msgctxt "paper size" - msgid "Monarch Envelope" - msgstr "ClĂşdach Monarch" - --#: gtk/paper_names_offsets.c:136 -+#: ../gtk/paper_names_offsets.c:136 - msgctxt "paper size" - msgid "#10 Envelope" - msgstr "ClĂşdach #10" - --#: gtk/paper_names_offsets.c:137 -+#: ../gtk/paper_names_offsets.c:137 - msgctxt "paper size" - msgid "#11 Envelope" - msgstr "ClĂşdach #11" - --#: gtk/paper_names_offsets.c:138 -+#: ../gtk/paper_names_offsets.c:138 - msgctxt "paper size" - msgid "#12 Envelope" - msgstr "ClĂşdach #12" - --#: gtk/paper_names_offsets.c:139 -+#: ../gtk/paper_names_offsets.c:139 - msgctxt "paper size" - msgid "#14 Envelope" - msgstr "ClĂşdach #14" - --#: gtk/paper_names_offsets.c:140 -+#: ../gtk/paper_names_offsets.c:140 - msgctxt "paper size" - msgid "#9 Envelope" - msgstr "ClĂşdach #9" - --#: gtk/paper_names_offsets.c:141 -+#: ../gtk/paper_names_offsets.c:141 - msgctxt "paper size" - msgid "Personal Envelope" - msgstr "ClĂşdach Pearsanta" - --#: gtk/paper_names_offsets.c:142 -+#: ../gtk/paper_names_offsets.c:142 - msgctxt "paper size" - msgid "Quarto" - msgstr "Ceathairfhillte" - --#: gtk/paper_names_offsets.c:143 -+#: ../gtk/paper_names_offsets.c:143 - msgctxt "paper size" - msgid "Super A" - msgstr "Super A" - --#: gtk/paper_names_offsets.c:144 -+#: ../gtk/paper_names_offsets.c:144 - msgctxt "paper size" - msgid "Super B" - msgstr "Super B" - --#: gtk/paper_names_offsets.c:145 -+#: ../gtk/paper_names_offsets.c:145 - msgctxt "paper size" - msgid "Wide Format" - msgstr "Formáid Leathan" - --#: gtk/paper_names_offsets.c:146 -+#: ../gtk/paper_names_offsets.c:146 - msgctxt "paper size" - msgid "Dai-pa-kai" - msgstr "Dai-pa-kai" - --#: gtk/paper_names_offsets.c:147 -+#: ../gtk/paper_names_offsets.c:147 - msgctxt "paper size" - msgid "Folio" - msgstr "FĂłiliĂł" - --#: gtk/paper_names_offsets.c:148 -+#: ../gtk/paper_names_offsets.c:148 - msgctxt "paper size" - msgid "Folio sp" - msgstr "FĂłiliĂł sp" - --#: gtk/paper_names_offsets.c:149 -+#: ../gtk/paper_names_offsets.c:149 - msgctxt "paper size" - msgid "Invite Envelope" - msgstr "ClĂşdach Cuiridh" - --#: gtk/paper_names_offsets.c:150 -+#: ../gtk/paper_names_offsets.c:150 - msgctxt "paper size" - msgid "Italian Envelope" - msgstr "ClĂşdach Iodálach" - --#: gtk/paper_names_offsets.c:151 -+#: ../gtk/paper_names_offsets.c:151 - msgctxt "paper size" - msgid "juuro-ku-kai" - msgstr "juuro-ku-kai" - --#: gtk/paper_names_offsets.c:152 -+#: ../gtk/paper_names_offsets.c:152 - msgctxt "paper size" - msgid "pa-kai" - msgstr "pa-kai" - --#: gtk/paper_names_offsets.c:153 -+#: ../gtk/paper_names_offsets.c:153 - msgctxt "paper size" - msgid "Postfix Envelope" - msgstr "ClĂşdach Postfix" - --#: gtk/paper_names_offsets.c:154 -+#: ../gtk/paper_names_offsets.c:154 - msgctxt "paper size" - msgid "Small Photo" - msgstr "Grianghraf Beag" - --#: gtk/paper_names_offsets.c:155 -+#: ../gtk/paper_names_offsets.c:155 - msgctxt "paper size" - msgid "prc1 Envelope" - msgstr "ClĂşdach prc1" - --#: gtk/paper_names_offsets.c:156 -+#: ../gtk/paper_names_offsets.c:156 - msgctxt "paper size" - msgid "prc10 Envelope" - msgstr "ClĂşdach prc10" - --#: gtk/paper_names_offsets.c:157 -+#: ../gtk/paper_names_offsets.c:157 - msgctxt "paper size" - msgid "prc 16k" - msgstr "prc 16k" - --#: gtk/paper_names_offsets.c:158 -+#: ../gtk/paper_names_offsets.c:158 - msgctxt "paper size" - msgid "prc2 Envelope" - msgstr "ClĂşdach prc2" - --#: gtk/paper_names_offsets.c:159 -+#: ../gtk/paper_names_offsets.c:159 - msgctxt "paper size" - msgid "prc3 Envelope" - msgstr "ClĂşdach prc3" - --#: gtk/paper_names_offsets.c:160 -+#: ../gtk/paper_names_offsets.c:160 - msgctxt "paper size" - msgid "prc 32k" - msgstr "prc 32k" - --#: gtk/paper_names_offsets.c:161 -+#: ../gtk/paper_names_offsets.c:161 - msgctxt "paper size" - msgid "prc4 Envelope" - msgstr "ClĂşdach prc4" - --#: gtk/paper_names_offsets.c:162 -+#: ../gtk/paper_names_offsets.c:162 - msgctxt "paper size" - msgid "prc5 Envelope" - msgstr "ClĂşdach prc5" - --#: gtk/paper_names_offsets.c:163 -+#: ../gtk/paper_names_offsets.c:163 - msgctxt "paper size" - msgid "prc6 Envelope" - msgstr "ClĂşdach prc6" - --#: gtk/paper_names_offsets.c:164 -+#: ../gtk/paper_names_offsets.c:164 - msgctxt "paper size" - msgid "prc7 Envelope" - msgstr "ClĂşdach prc7" - --#: gtk/paper_names_offsets.c:165 -+#: ../gtk/paper_names_offsets.c:165 - msgctxt "paper size" - msgid "prc8 Envelope" - msgstr "ClĂşdach prc8" - --#: gtk/paper_names_offsets.c:166 -+#: ../gtk/paper_names_offsets.c:166 - msgctxt "paper size" - msgid "prc9 Envelope" - msgstr "ClĂşdach prc9" - --#: gtk/paper_names_offsets.c:167 -+#: ../gtk/paper_names_offsets.c:167 - msgctxt "paper size" - msgid "ROC 16k" - msgstr "ROC 16k" - --#: gtk/paper_names_offsets.c:168 -+#: ../gtk/paper_names_offsets.c:168 - msgctxt "paper size" - msgid "ROC 8k" - msgstr "ROC 8k" - --#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552 --#, c-format --msgid "different idatas found for symlinked '%s' and '%s'\n" --msgstr "aimsĂodh idata difriĂşla do '%s' agus '%s' nasctha go siombalach\n" -- --#: gtk/updateiconcache.c:1374 -+#: ../gtk/updateiconcache.c:1368 - #, c-format - msgid "Failed to write header\n" - msgstr "Theip ar scrĂobh ceanntáisc\n" - --#: gtk/updateiconcache.c:1380 -+#: ../gtk/updateiconcache.c:1374 - #, c-format - msgid "Failed to write hash table\n" - msgstr "Theip ar scrĂobh hais-tábla\n" - --#: gtk/updateiconcache.c:1386 -+#: ../gtk/updateiconcache.c:1380 - #, c-format - msgid "Failed to write folder index\n" - msgstr "Theip ar scrĂobh innĂ©acs fillteáin\n" - --#: gtk/updateiconcache.c:1394 -+#: ../gtk/updateiconcache.c:1388 - #, c-format - msgid "Failed to rewrite header\n" - msgstr "Theip ar athscrĂobh ceanntáisc\n" - --#: gtk/updateiconcache.c:1463 -+#: ../gtk/updateiconcache.c:1482 - #, c-format - msgid "Failed to open file %s : %s\n" - msgstr "Theip ar oscailt comhaid %s : %s\n" - --#: gtk/updateiconcache.c:1471 -+#: ../gtk/updateiconcache.c:1490 ../gtk/updateiconcache.c:1520 - #, c-format - msgid "Failed to write cache file: %s\n" - msgstr "Theip ar scrĂobh chomhad taisce: %s\n" - --#: gtk/updateiconcache.c:1507 -+#: ../gtk/updateiconcache.c:1530 - #, c-format - msgid "The generated cache was invalid.\n" - msgstr "BhĂ an taisce ghinte neamhbhailĂ.\n" - --#: gtk/updateiconcache.c:1521 -+#: ../gtk/updateiconcache.c:1544 - #, c-format - msgid "Could not rename %s to %s: %s, removing %s then.\n" - msgstr "NĂorbh fhĂ©idir %s a athainmniĂş go %s: %s, mar sin %s á bhaint.\n" - --#: gtk/updateiconcache.c:1535 -+#: ../gtk/updateiconcache.c:1558 - #, c-format - msgid "Could not rename %s to %s: %s\n" - msgstr "NĂorbh fhĂ©idir %s a athainmniĂş go %s: %s\n" - --#: gtk/updateiconcache.c:1545 -+#: ../gtk/updateiconcache.c:1568 - #, c-format - msgid "Could not rename %s back to %s: %s.\n" - msgstr "NĂorbh fhĂ©idir %s a athainmniĂş ar ais go %s: %s\n" - --#: gtk/updateiconcache.c:1572 -+#: ../gtk/updateiconcache.c:1595 - #, c-format - msgid "Cache file created successfully.\n" - msgstr "D'Ă©irigh le cruthĂş an chomhaid taisce.\n" - --#: gtk/updateiconcache.c:1611 -+#: ../gtk/updateiconcache.c:1634 - msgid "Overwrite an existing cache, even if up to date" - msgstr "" - --#: gtk/updateiconcache.c:1612 -+#: ../gtk/updateiconcache.c:1635 - msgid "Don't check for the existence of index.theme" - msgstr "" - --#: gtk/updateiconcache.c:1613 -+#: ../gtk/updateiconcache.c:1636 - msgid "Don't include image data in the cache" - msgstr "" - --#: gtk/updateiconcache.c:1614 -+#: ../gtk/updateiconcache.c:1637 - msgid "Output a C header file" - msgstr "Cuir comhad ceanntáisc C amach" - --#: gtk/updateiconcache.c:1615 -+#: ../gtk/updateiconcache.c:1638 - msgid "Turn off verbose output" - msgstr "DĂchumasaigh aschur foclach" - --#: gtk/updateiconcache.c:1616 -+#: ../gtk/updateiconcache.c:1639 - msgid "Validate existing icon cache" - msgstr "" - --#: gtk/updateiconcache.c:1683 -+#: ../gtk/updateiconcache.c:1706 - #, c-format - msgid "File not found: %s\n" - msgstr "Comhad gan aimsiĂş: %s\n" - --#: gtk/updateiconcache.c:1689 -+#: ../gtk/updateiconcache.c:1712 - #, c-format - msgid "Not a valid icon cache: %s\n" - msgstr "NĂ taisce dheilbhĂnĂ bhailĂ Ă©: %s\n" - --#: gtk/updateiconcache.c:1702 -+#: ../gtk/updateiconcache.c:1725 - #, c-format - msgid "No theme index file.\n" - msgstr "Gan chomhad innĂ©acs tĂ©ama.\n" - --#: gtk/updateiconcache.c:1706 -+#: ../gtk/updateiconcache.c:1729 - #, c-format - msgid "" - "No theme index file in '%s'.\n" -@@ -3716,376 +4312,375 @@ msgstr "" - "theme-index.\n" - - #. ID --#: modules/input/imam-et.c:454 -+#: ../modules/input/imam-et.c:452 - msgid "Amharic (EZ+)" - msgstr "Amáiris (EZ+)" - - #. ID --#: modules/input/imcedilla.c:92 -+#: ../modules/input/imcedilla.c:90 - msgid "Cedilla" - msgstr "StraithĂn" - - #. ID --#: modules/input/imcyrillic-translit.c:217 -+#: ../modules/input/imcyrillic-translit.c:215 - msgid "Cyrillic (Transliterated)" - msgstr "Coireallach (Traslitrithe)" - - #. ID --#: modules/input/iminuktitut.c:127 -+#: ../modules/input/iminuktitut.c:125 - msgid "Inuktitut (Transliterated)" - msgstr "IonĂşitis (Traslitrithe)" - - #. ID --#: modules/input/imipa.c:145 -+#: ../modules/input/imipa.c:143 - msgid "IPA" - msgstr "AFI" - - #. ID --#: modules/input/immultipress.c:31 -+#: ../modules/input/immultipress.c:29 - msgid "Multipress" - msgstr "Il-bhrĂş" - - #. ID --#: modules/input/imthai.c:35 -+#: ../modules/input/imthai.c:33 - msgid "Thai-Lao" - msgstr "TĂ©alainnis-Láóis" - - #. ID --#: modules/input/imti-er.c:453 -+#: ../modules/input/imti-er.c:451 - msgid "Tigrigna-Eritrean (EZ+)" - msgstr "TigrĂnis-EiritrĂ©ach (EZ+)" - - #. ID --#: modules/input/imti-et.c:453 -+#: ../modules/input/imti-et.c:451 - msgid "Tigrigna-Ethiopian (EZ+)" - msgstr "TigrĂnis-AetĂłpach (EZ+)" - - #. ID --#: modules/input/imviqr.c:244 -+#: ../modules/input/imviqr.c:242 - msgid "Vietnamese (VIQR)" - msgstr "VĂtneaimis (VIQR)" - - #. ID --#: modules/input/imxim.c:28 -+#: ../modules/input/imxim.c:26 - msgid "X Input Method" - msgstr "Modh Ionchurtha X" - --#: modules/printbackends/cups/gtkprintbackendcups.c:811 --#: modules/printbackends/cups/gtkprintbackendcups.c:1020 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:858 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1073 - msgid "Username:" - msgstr "Ainm Ăšsáideora:" - --#: modules/printbackends/cups/gtkprintbackendcups.c:812 --#: modules/printbackends/cups/gtkprintbackendcups.c:1029 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:859 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1082 - msgid "Password:" - msgstr "Focal Faire:" - --#: modules/printbackends/cups/gtkprintbackendcups.c:850 --#, c-format --msgid "Authentication is required to get a file from %s" --msgstr "FĂordheimhniĂş de dhĂth chun comhad a fháil Ăł %s" -- --#: modules/printbackends/cups/gtkprintbackendcups.c:854 --#: modules/printbackends/cups/gtkprintbackendcups.c:1042 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:898 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1095 - #, c-format - msgid "Authentication is required to print document '%s' on printer %s" - msgstr "FĂordheimhniĂş de dhĂth chun cáipĂ©is '%s' a phriontáil ar phrintĂ©ir %s" - --#: modules/printbackends/cups/gtkprintbackendcups.c:856 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:900 - #, c-format - msgid "Authentication is required to print a document on %s" - msgstr "FĂordheimhniĂş de dhĂth chun cáipĂ©is a phriontáil ar %s" - --#: modules/printbackends/cups/gtkprintbackendcups.c:860 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:904 - #, c-format - msgid "Authentication is required to get attributes of job '%s'" - msgstr "FĂordheimhniĂş de dhĂth chun trĂ©ithe jab '%s' a fháil" - --#: modules/printbackends/cups/gtkprintbackendcups.c:862 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:906 - msgid "Authentication is required to get attributes of a job" - msgstr "FĂordheimhniĂş de dhĂth chun trĂ©ithe jab a fháil" - --#: modules/printbackends/cups/gtkprintbackendcups.c:866 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:910 - #, c-format - msgid "Authentication is required to get attributes of printer %s" - msgstr "FĂordheimhniĂş de dhĂth chun trĂ©ithe printĂ©ara %s a fháil" - --#: modules/printbackends/cups/gtkprintbackendcups.c:868 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:912 - msgid "Authentication is required to get attributes of a printer" - msgstr "FĂordheimhniĂş de dhĂth chun trĂ©ithe printĂ©ara a fháil" - --#: modules/printbackends/cups/gtkprintbackendcups.c:871 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:915 - #, c-format - msgid "Authentication is required to get default printer of %s" - msgstr "FĂordheimhniĂş de dhĂth chun an printĂ©ir rĂ©amhshocraithe %s a fháil" - --#: modules/printbackends/cups/gtkprintbackendcups.c:874 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:918 - #, c-format - msgid "Authentication is required to get printers from %s" - msgstr "FĂordheimhniĂş de dhĂth chun printĂ©irĂ a fháil Ăł %s" - --#: modules/printbackends/cups/gtkprintbackendcups.c:877 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:923 -+#, c-format -+msgid "Authentication is required to get a file from %s" -+msgstr "FĂordheimhniĂş de dhĂth chun comhad a fháil Ăł %s" -+ -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:925 - #, c-format - msgid "Authentication is required on %s" - msgstr "FĂordheimhniĂş de dhĂth ar %s" - --#: modules/printbackends/cups/gtkprintbackendcups.c:1014 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067 - msgid "Domain:" - msgstr "Fearann:" - --#: modules/printbackends/cups/gtkprintbackendcups.c:1044 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1097 - #, c-format - msgid "Authentication is required to print document '%s'" - msgstr "FĂordheimhniĂş de dhĂth chun cáipĂ©is '%s' a phriontáil" - --#: modules/printbackends/cups/gtkprintbackendcups.c:1049 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1102 - #, c-format - msgid "Authentication is required to print this document on printer %s" - msgstr "" - "FĂordheimhniĂş de dhĂth chun an cháipĂ©is seo a phriontáil ar phrintĂ©ir %s" - --#: modules/printbackends/cups/gtkprintbackendcups.c:1051 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1104 - msgid "Authentication is required to print this document" - msgstr "FĂordheimhniĂş de dhĂth chun an cháipĂ©is seo a phriontáil" - --#: modules/printbackends/cups/gtkprintbackendcups.c:1672 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1666 - #, c-format - msgid "Printer '%s' is low on toner." - msgstr "TonĂłir gann i bprintĂ©ir '%s'." - --#: modules/printbackends/cups/gtkprintbackendcups.c:1673 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1667 - #, c-format - msgid "Printer '%s' has no toner left." - msgstr "NĂl aon tonĂłir fágtha i bprintĂ©ir '%s'." - - #. Translators: "Developer" like on photo development context --#: modules/printbackends/cups/gtkprintbackendcups.c:1675 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1669 - #, c-format - msgid "Printer '%s' is low on developer." - msgstr "RĂ©alĂłir gann i bprintĂ©ir '%s'." - - #. Translators: "Developer" like on photo development context --#: modules/printbackends/cups/gtkprintbackendcups.c:1677 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1671 - #, c-format - msgid "Printer '%s' is out of developer." - msgstr "NĂl aon rĂ©alĂłir fágtha i bprintĂ©ir '%s'." - - #. Translators: "marker" is one color bin of the printer --#: modules/printbackends/cups/gtkprintbackendcups.c:1679 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673 - #, c-format - msgid "Printer '%s' is low on at least one marker supply." - msgstr "" - - #. Translators: "marker" is one color bin of the printer --#: modules/printbackends/cups/gtkprintbackendcups.c:1681 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675 - #, c-format - msgid "Printer '%s' is out of at least one marker supply." - msgstr "" - --#: modules/printbackends/cups/gtkprintbackendcups.c:1682 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1676 - #, c-format - msgid "The cover is open on printer '%s'." - msgstr "Tá an clĂşdach ar phrintĂ©ir '%s' oscailte." - --#: modules/printbackends/cups/gtkprintbackendcups.c:1683 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677 - #, c-format - msgid "The door is open on printer '%s'." - msgstr "Tá an doras ar phrintĂ©ir '%s' oscailte." - --#: modules/printbackends/cups/gtkprintbackendcups.c:1684 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1678 - #, c-format - msgid "Printer '%s' is low on paper." - msgstr "PáipĂ©ar gann i bprintĂ©ir '%s'." - --#: modules/printbackends/cups/gtkprintbackendcups.c:1685 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679 - #, c-format - msgid "Printer '%s' is out of paper." - msgstr "NĂl aon pháipĂ©ar fágtha i bprintĂ©ir '%s'." - --#: modules/printbackends/cups/gtkprintbackendcups.c:1686 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1680 - #, fuzzy, c-format - msgid "Printer '%s' is currently offline." - msgstr "Tá printĂ©ir '%s' as lĂne faoi láthair." - --#: modules/printbackends/cups/gtkprintbackendcups.c:1687 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681 - #, c-format - msgid "There is a problem on printer '%s'." - msgstr "Tá fadhb ann le printĂ©ir '%s'." - - #. Translators: this is a printer status. --#: modules/printbackends/cups/gtkprintbackendcups.c:1995 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2123 - msgid "Paused ; Rejecting Jobs" - msgstr "Ar Sos ; Jabanna á nDiĂşltĂş" - - #. Translators: this is a printer status. --#: modules/printbackends/cups/gtkprintbackendcups.c:2001 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2129 - msgid "Rejecting Jobs" - msgstr "Jabanna á nDiĂşltĂş" - --#: modules/printbackends/cups/gtkprintbackendcups.c:2777 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2909 - msgid "Two Sided" - msgstr "DĂ©thaobhach" - --#: modules/printbackends/cups/gtkprintbackendcups.c:2778 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2910 - msgid "Paper Type" - msgstr "Cineál an PháipĂ©ir" - --#: modules/printbackends/cups/gtkprintbackendcups.c:2779 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2911 - msgid "Paper Source" - msgstr "Foinse an PháipĂ©ir" - --#: modules/printbackends/cups/gtkprintbackendcups.c:2780 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2912 - msgid "Output Tray" - msgstr "Tráidire Aschurtha" - --#: modules/printbackends/cups/gtkprintbackendcups.c:2781 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2913 - msgid "Resolution" - msgstr "Taifeach" - --#: modules/printbackends/cups/gtkprintbackendcups.c:2782 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2914 - msgid "GhostScript pre-filtering" - msgstr "RĂ©amhscagadh GhostScript" - --#: modules/printbackends/cups/gtkprintbackendcups.c:2791 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2923 - msgid "One Sided" - msgstr "Aonthaobhach" - - #. Translators: this is an option of "Two Sided" --#: modules/printbackends/cups/gtkprintbackendcups.c:2793 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2925 - msgid "Long Edge (Standard)" - msgstr "Ciumhais Fhada (Caighdeánach)" - - #. Translators: this is an option of "Two Sided" --#: modules/printbackends/cups/gtkprintbackendcups.c:2795 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2927 - msgid "Short Edge (Flip)" - msgstr "Ciumhais Ghearr (Smeach)" - - #. Translators: this is an option of "Paper Source" --#: modules/printbackends/cups/gtkprintbackendcups.c:2797 --#: modules/printbackends/cups/gtkprintbackendcups.c:2799 --#: modules/printbackends/cups/gtkprintbackendcups.c:2807 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2929 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2931 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2939 - msgid "Auto Select" - msgstr "Roghnaigh go hUathoibrĂoch" - - #. Translators: this is an option of "Paper Source" - #. Translators: this is an option of "Resolution" --#: modules/printbackends/cups/gtkprintbackendcups.c:2801 --#: modules/printbackends/cups/gtkprintbackendcups.c:2803 --#: modules/printbackends/cups/gtkprintbackendcups.c:2805 --#: modules/printbackends/cups/gtkprintbackendcups.c:2809 --#: modules/printbackends/cups/gtkprintbackendcups.c:3295 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2933 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2935 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2937 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2941 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3429 - msgid "Printer Default" - msgstr "RĂ©amhshocrĂş PrintĂ©ara" - - #. Translators: this is an option of "GhostScript" --#: modules/printbackends/cups/gtkprintbackendcups.c:2811 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2943 - msgid "Embed GhostScript fonts only" - msgstr "Leabaigh clĂłnna GhostScript amháin" - - #. Translators: this is an option of "GhostScript" --#: modules/printbackends/cups/gtkprintbackendcups.c:2813 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2945 - msgid "Convert to PS level 1" - msgstr "Tiontaigh go PS leibhĂ©al 1" - - #. Translators: this is an option of "GhostScript" --#: modules/printbackends/cups/gtkprintbackendcups.c:2815 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2947 - msgid "Convert to PS level 2" - msgstr "Tiontaigh go PS leibhĂ©al 2" - - #. Translators: this is an option of "GhostScript" --#: modules/printbackends/cups/gtkprintbackendcups.c:2817 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2949 - msgid "No pre-filtering" - msgstr "Gan rĂ©amhscagadh" - - #. Translators: "Miscellaneous" is the label for a button, that opens - #. up an extra panel of settings in a print dialog. --#: modules/printbackends/cups/gtkprintbackendcups.c:2826 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2958 - msgid "Miscellaneous" - msgstr "Socruithe ÉagsĂşla" - - #. Translators: These strings name the possible values of the - #. * job priority option in the print dialog - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3503 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 - msgid "Urgent" - msgstr "Práinneach" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3503 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 - msgid "High" - msgstr "Ard" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3503 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 - msgid "Medium" - msgstr "Measartha" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3503 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681 - msgid "Low" - msgstr "ĂŤseal" - --#. Cups specific, non-ppd related settings --#. Translators, this string is used to label the pages-per-sheet option --#. * in the print dialog --#. --#: modules/printbackends/cups/gtkprintbackendcups.c:3527 --msgid "Pages per Sheet" --msgstr "Leathanaigh sa Leathán" -- - #. Translators, this string is used to label the job priority option - #. * in the print dialog - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3564 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3711 - msgid "Job Priority" - msgstr "TosaĂocht an Jab" - - #. Translators, this string is used to label the billing info entry - #. * in the print dialog - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3575 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3722 - msgid "Billing Info" - msgstr "Eolas billeála" - - #. Translators, these strings are names for various 'standard' cover - #. * pages that the printing system may support. - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3590 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 - msgid "None" - msgstr "NeamhnĂ" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3590 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 - msgid "Classified" - msgstr "RĂşnaicmithe" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3590 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 - msgid "Confidential" - msgstr "Faoi RĂşn" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3590 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 - msgid "Secret" - msgstr "RĂşnda" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3590 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 - msgid "Standard" - msgstr "Caighdeánach" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3590 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 - msgid "Top Secret" - msgstr "An-RĂşnda" - --#: modules/printbackends/cups/gtkprintbackendcups.c:3590 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737 - msgid "Unclassified" - msgstr "NeamhrĂşnaicmithe" - -+#. Translators, this string is used to label the pages-per-sheet option -+#. * in the print dialog -+#. -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3748 -+msgid "Pages per Sheet" -+msgstr "Leathanaigh sa Leathán" -+ - #. Translators, this is the label used for the option in the print - #. * dialog that controls the front cover page. - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3625 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3808 - msgid "Before" - msgstr "Roimh" - - #. Translators, this is the label used for the option in the print - #. * dialog that controls the back cover page. - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3640 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3823 - msgid "After" - msgstr "Tar Éis" - -@@ -4093,14 +4688,14 @@ msgstr "Tar Éis" - #. * a print job is printed. Possible values are 'now', a specified time, - #. * or 'on hold' - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3660 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3843 - msgid "Print at" - msgstr "Priontáil ag" - - #. Translators: this is the name of the option that allows the user - #. * to specify a time when a print job will be printed. - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3671 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3854 - msgid "Print at time" - msgstr "Priontáil ag am" - -@@ -4108,109 +4703,223 @@ msgstr "Priontáil ag am" - #. * size. The two placeholders are replaced with the width and height - #. * in points. E.g: "Custom 230.4x142.9" - #. --#: modules/printbackends/cups/gtkprintbackendcups.c:3706 -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3889 - #, c-format - msgid "Custom %sx%s" - msgstr "%sx%s Saincheaptha" - --#. default filename used for print-to-file --#: modules/printbackends/file/gtkprintbackendfile.c:250 --#, c-format --msgid "output.%s" -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3970 -+#, fuzzy -+msgid "Printer Profile" -+msgstr "PrintĂ©ir as lĂne" -+ -+#. TRANSLATORS: this is when color profile information is unavailable -+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3977 -+#, fuzzy -+msgid "Unavailable" -+msgstr "NĂl ar fáil" -+ -+#. TRANSLATORS: when we're running an old CUPS, and -+#. * it hasn't registered the device with colord -+#: ../modules/printbackends/cups/gtkprintercups.c:221 -+msgid "Color management unavailable" -+msgstr "" -+ -+#. TRANSLATORS: when there is no color profile available -+#: ../modules/printbackends/cups/gtkprintercups.c:233 -+#, fuzzy -+msgid "No profile available" -+msgstr "NĂl ar fáil" -+ -+#. TRANSLATORS: when the color profile has no title -+#: ../modules/printbackends/cups/gtkprintercups.c:244 -+#, fuzzy -+msgid "Unspecified profile" -+msgstr "Earráid gan sonrĂş" -+ -+#: ../modules/printbackends/file/gtkprintbackendfile.c:249 -+#, fuzzy -+msgid "output" - msgstr "aschur.%s" - --#: modules/printbackends/file/gtkprintbackendfile.c:493 -+#: ../modules/printbackends/file/gtkprintbackendfile.c:521 - msgid "Print to File" - msgstr "Priontáil go Comhad" - --#: modules/printbackends/file/gtkprintbackendfile.c:570 -+#: ../modules/printbackends/file/gtkprintbackendfile.c:647 - msgid "PDF" - msgstr "PDF" - --#: modules/printbackends/file/gtkprintbackendfile.c:570 -+#: ../modules/printbackends/file/gtkprintbackendfile.c:647 - msgid "Postscript" - msgstr "Postscript" - --#: modules/printbackends/file/gtkprintbackendfile.c:570 -+#: ../modules/printbackends/file/gtkprintbackendfile.c:647 - msgid "SVG" - msgstr "SVG" - --#: modules/printbackends/file/gtkprintbackendfile.c:582 --#: modules/printbackends/test/gtkprintbackendtest.c:503 -+#: ../modules/printbackends/file/gtkprintbackendfile.c:660 -+#: ../modules/printbackends/test/gtkprintbackendtest.c:501 - msgid "Pages per _sheet:" - msgstr "_Leathanaigh sa leathán:" - --#: modules/printbackends/file/gtkprintbackendfile.c:641 -+#: ../modules/printbackends/file/gtkprintbackendfile.c:719 - msgid "File" - msgstr "Comhad" - --#: modules/printbackends/file/gtkprintbackendfile.c:651 -+#: ../modules/printbackends/file/gtkprintbackendfile.c:729 - msgid "_Output format" - msgstr "_Formáid aschurtha" - --#: modules/printbackends/lpr/gtkprintbackendlpr.c:395 -+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:393 - msgid "Print to LPR" - msgstr "Priontáil go LPR" - --#: modules/printbackends/lpr/gtkprintbackendlpr.c:421 -+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:419 - msgid "Pages Per Sheet" - msgstr "Leathanaigh sa Leathán" - --#: modules/printbackends/lpr/gtkprintbackendlpr.c:428 -+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:426 - msgid "Command Line" - msgstr "LĂne na n-Orduithe" - - #. SUN_BRANDING --#: modules/printbackends/papi/gtkprintbackendpapi.c:811 -+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:809 - msgid "printer offline" - msgstr "printĂ©ir as lĂne" - - #. SUN_BRANDING --#: modules/printbackends/papi/gtkprintbackendpapi.c:829 -+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:827 - msgid "ready to print" - msgstr "rĂ©idh do phriontáil" - - #. SUN_BRANDING --#: modules/printbackends/papi/gtkprintbackendpapi.c:832 -+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:830 - msgid "processing job" - msgstr "jab á phrĂłiseáil" - - #. SUN_BRANDING --#: modules/printbackends/papi/gtkprintbackendpapi.c:836 -+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:834 - msgid "paused" - msgstr "curtha ar shos" - - #. SUN_BRANDING --#: modules/printbackends/papi/gtkprintbackendpapi.c:839 -+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:837 - msgid "unknown" - msgstr "anaithnid" - - #. default filename used for print-to-test --#: modules/printbackends/test/gtkprintbackendtest.c:234 -+#: ../modules/printbackends/test/gtkprintbackendtest.c:232 - #, c-format - msgid "test-output.%s" - msgstr "aschur-trialach.%s" - --#: modules/printbackends/test/gtkprintbackendtest.c:467 -+#: ../modules/printbackends/test/gtkprintbackendtest.c:465 - msgid "Print to Test Printer" - msgstr "Priontáil go PrintĂ©ir Tástála" - --#: tests/testfilechooser.c:207 --#, c-format --msgid "Could not get information for file '%s': %s" --msgstr "NĂorbh fhĂ©idir eolas a fháil don chomhad '%s': %s" -+#~ msgid "X screen to use" -+#~ msgstr "Scáileán X le hĂşsáid" - --#: tests/testfilechooser.c:222 --#, c-format --msgid "Failed to open file '%s': %s" --msgstr "Theip ar oscail comhad '%s': %s" -+#~ msgid "SCREEN" -+#~ msgstr "SCĂILEĂN" - --#: tests/testfilechooser.c:267 --#, c-format --msgid "" --"Failed to load image '%s': reason not known, probably a corrupt image file" --msgstr "" --"Theip ar luchtĂş Ăomhá '%s': fáth anaithnid, is dĂłcha comhad Ăomhá truaillithe" -+#~ msgid "Make X calls synchronous" -+#~ msgstr "DĂ©an sioncronach glaonna X" -+ -+#~ msgid "Credits" -+#~ msgstr "Admhálacha" -+ -+#~ msgid "Written by" -+#~ msgstr "ScrĂofa ag" -+ -+#~ msgid "Received invalid color data\n" -+#~ msgstr "Fuair sonraĂ datha neamhbhailĂ\n" -+ -+#, fuzzy -+#~ msgid "Num Lock is on" -+#~ msgstr "Tá Caps Lock ann" -+ -+#~ msgid "_Add" -+#~ msgstr "Cuir _Leis" -+ -+#~ msgid "_Remove" -+#~ msgstr "_Bain" -+ -+#~ msgid "_Browse for other folders" -+#~ msgstr "_Brabhsáil ar fhillteáin eile" -+ -+#~ msgid "Invalid path" -+#~ msgstr "Conair neamhbhailĂ" -+ -+#~ msgid "No match" -+#~ msgstr "Gan rud comhoiriĂşnach" -+ -+#~ msgid "Sole completion" -+#~ msgstr "An comhlánĂş amháin" -+ -+#~ msgid "Complete, but not unique" -+#~ msgstr "Curtha i grĂch, ach nach uathĂşil" -+ -+#~ msgid "Completing..." -+#~ msgstr "Ă chur i grĂch..." -+ -+#~ msgid "Only local files may be selected" -+#~ msgstr "Is fĂ©idir comhaid logánta amháin a roghnĂş" -+ -+#~ msgid "Incomplete hostname; end it with '/'" -+#~ msgstr "Ă“stainm neamhiomlán; cuir '/' ag an deireadh" -+ -+#~ msgid "Path does not exist" -+#~ msgstr "NĂl an conair sin ann" -+ -+#~ msgid "Error creating folder '%s': %s" -+#~ msgstr "Earráid agus fillteán '%s' á chruthĂş: %s" -+ -+#~ msgid "" -+#~ "Could not find the icon '%s'. The '%s' theme\n" -+#~ "was not found either, perhaps you need to install it.\n" -+#~ "You can get a copy from:\n" -+#~ "\t%s" -+#~ msgstr "" -+#~ "NĂorbh fhĂ©idir an deilbhĂn '%s' a aimsiĂş. NĂor\n" -+#~ "aimsĂodh an tĂ©ama '%s' ach an oiread, b'fhĂ©idir go\n" -+#~ "gcaithfidh tĂş Ă© a shuiteáil.\n" -+#~ "Is fĂ©idir leat cĂłip a fháil Ăł:\n" -+#~ "\t%s" -+ -+#~ msgid "Connect as u_ser:" -+#~ msgstr "Nasc mar Ăş_sáideoir:" -+ -+#~ msgid "_Save in folder:" -+#~ msgstr "_Sábháil i bhfillteán:" -+ -+#~ msgid "Unable to find include file: \"%s\"" -+#~ msgstr "NĂ fĂ©idir comhad ceanntáisc a aimsiĂş: \"%s\"" -+ -+#~ msgid "Unable to locate image file in pixmap_path: \"%s\"" -+#~ msgstr "NĂ fĂ©idir Ăomhá chomaid a aimsiĂş i bpixmap_path: \"%s\"" -+ -+#~ msgid "This function is not implemented for widgets of class '%s'" -+#~ msgstr "NĂl an feidhm seo curtha i ngnĂomh do ghiuirlĂ©idĂ na haicme '%s'" -+ -+#~ msgid "Unable to locate theme engine in module_path: \"%s\"," -+#~ msgstr "NĂ fĂ©idir inneall tĂ©ama a aimsiĂş i module_path: \"%s\"," -+ -+#~ msgid "different idatas found for symlinked '%s' and '%s'\n" -+#~ msgstr "aimsĂodh idata difriĂşla do '%s' agus '%s' nasctha go siombalach\n" -+ -+#~ msgid "Could not get information for file '%s': %s" -+#~ msgstr "NĂorbh fhĂ©idir eolas a fháil don chomhad '%s': %s" -+ -+#~ msgid "Failed to open file '%s': %s" -+#~ msgstr "Theip ar oscail comhad '%s': %s" -+ -+#~ msgid "" -+#~ "Failed to load image '%s': reason not known, probably a corrupt image file" -+#~ msgstr "" -+#~ "Theip ar luchtĂş Ăomhá '%s': fáth anaithnid, is dĂłcha comhad Ăomhá " -+#~ "truaillithe" - - #~ msgid "Gdk debugging flags to set" - #~ msgstr "Bratacha dĂfhabhtaithe Gdk le socrĂş" -diff --git a/po/zh_HK.po b/po/zh_HK.po -index 64057e3..2305461 100644 ---- a/po/zh_HK.po -+++ b/po/zh_HK.po -@@ -8,9 +8,9 @@ msgid "" - msgstr "" - "Project-Id-Version: gtk+ 3.3.11\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-09-05 20:10+0800\n" --"PO-Revision-Date: 2012-09-05 20:10+0800\n" --"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n" -+"POT-Creation-Date: 2012-11-07 02:40+0800\n" -+"PO-Revision-Date: 2012-11-07 02:40+0800\n" -+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" - "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n" - "Language: zh_TW\n" - "MIME-Version: 1.0\n" -@@ -69,7 +69,7 @@ msgstr "ćş–ĺ‚™č¨ĺ®šçš„ GDK ĺµéŚŻć——標" - #. Placeholder in --gdk-no-debug=FLAGS in --help output - #. Placeholder in --gtk-debug=FLAGS in --help output - #. Placeholder in --gtk-no-debug=FLAGS in --help output --#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456 -+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457 - msgid "FLAGS" - msgstr "旗標" - -@@ -698,7 +698,7 @@ msgstr "美工č¨č¨" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:156 -+#: ../gtk/gtkaccellabel.c:159 - msgctxt "keyboard label" - msgid "Shift" - msgstr "Shift" -@@ -708,7 +708,7 @@ msgstr "Shift" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:162 -+#: ../gtk/gtkaccellabel.c:165 - msgctxt "keyboard label" - msgid "Ctrl" - msgstr "Ctrl" -@@ -718,7 +718,7 @@ msgstr "Ctrl" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:168 -+#: ../gtk/gtkaccellabel.c:171 - msgctxt "keyboard label" - msgid "Alt" - msgstr "Alt" -@@ -728,7 +728,7 @@ msgstr "Alt" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:802 -+#: ../gtk/gtkaccellabel.c:805 - msgctxt "keyboard label" - msgid "Super" - msgstr "Super" -@@ -738,7 +738,7 @@ msgstr "Super" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:815 -+#: ../gtk/gtkaccellabel.c:818 - msgctxt "keyboard label" - msgid "Hyper" - msgstr "Hyper" -@@ -748,17 +748,17 @@ msgstr "Hyper" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:829 -+#: ../gtk/gtkaccellabel.c:832 - msgctxt "keyboard label" - msgid "Meta" - msgstr "Meta" - --#: ../gtk/gtkaccellabel.c:845 -+#: ../gtk/gtkaccellabel.c:848 - msgctxt "keyboard label" - msgid "Space" - msgstr "Space" - --#: ../gtk/gtkaccellabel.c:848 -+#: ../gtk/gtkaccellabel.c:851 - msgctxt "keyboard label" - msgid "Backslash" - msgstr "Backslash" -@@ -794,7 +794,7 @@ msgstr "找不ĺ°ć‡‰ç”¨ç¨‹ĺĽŹ" - msgid "Select an application to open \"%s\"" - msgstr "č«‹é¸ć“‡č¦ç”¨äľ†é–‹ĺ•źă€Ś%s」的應用程式" - --#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654 -+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657 - #, c-format - msgid "No applications available to open \"%s\"" - msgstr "沒有程式可開啟「%s」的應用程式" -@@ -824,23 +824,23 @@ msgstr "ć¶é™¤é—śčŻ" - msgid "Show other applications" - msgstr "顯示其他的應用程式" - --#: ../gtk/gtkappchooserwidget.c:603 -+#: ../gtk/gtkappchooserwidget.c:606 - msgid "Default Application" - msgstr "é č¨çš„應用程式" - --#: ../gtk/gtkappchooserwidget.c:741 -+#: ../gtk/gtkappchooserwidget.c:744 - msgid "Recommended Applications" - msgstr "建č°çš„應用程式" - --#: ../gtk/gtkappchooserwidget.c:756 -+#: ../gtk/gtkappchooserwidget.c:759 - msgid "Related Applications" - msgstr "相關的應用程式" - --#: ../gtk/gtkappchooserwidget.c:770 -+#: ../gtk/gtkappchooserwidget.c:773 - msgid "Other Applications" - msgstr "其他的應用程式" - --#: ../gtk/gtkapplication.c:1552 -+#: ../gtk/gtkapplication.c:1558 - #, c-format - msgid "" - "%s cannot quit at this time:\n" -@@ -851,20 +851,20 @@ msgstr "" - "\n" - "%s" - --#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475 -+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480 - #: ../gtk/gtkprintoperation-win32.c:1445 - msgid "Application" - msgstr "應用程式" - --#: ../gtk/gtkassistant.c:1004 -+#: ../gtk/gtkassistant.c:1008 - msgid "C_ontinue" - msgstr "繼續(_O)" - --#: ../gtk/gtkassistant.c:1007 -+#: ../gtk/gtkassistant.c:1011 - msgid "Go _Back" - msgstr "後退(_B)" - --#: ../gtk/gtkassistant.c:1011 -+#: ../gtk/gtkassistant.c:1015 - msgid "_Finish" - msgstr "完ć(_F)" - -@@ -1003,7 +1003,7 @@ msgstr "無ć•" - #. * an accelerator when the cell is clicked to change the - #. * acelerator. - #. --#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745 -+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747 - msgid "New accelerator..." - msgstr "新增捷徑鍵…" - -@@ -1403,7 +1403,7 @@ msgstr "Caps Lock 已開啟" - msgid "Select a File" - msgstr "é¸ĺŹ–檔ćˇ" - --#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817 -+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819 - msgid "Desktop" - msgstr "桌面" - -@@ -1419,48 +1419,48 @@ msgstr "其他…" - msgid "Type name of new folder" - msgstr "請輸入新資料夾ĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:968 -+#: ../gtk/gtkfilechooserdefault.c:970 - msgid "Could not retrieve information about the file" - msgstr "無法取得關於檔ćˇçš„資訊" - --#: ../gtk/gtkfilechooserdefault.c:979 -+#: ../gtk/gtkfilechooserdefault.c:981 - msgid "Could not add a bookmark" - msgstr "ç„ˇćł•ĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:990 -+#: ../gtk/gtkfilechooserdefault.c:992 - msgid "Could not remove bookmark" - msgstr "無法移除書籤" - --#: ../gtk/gtkfilechooserdefault.c:1001 -+#: ../gtk/gtkfilechooserdefault.c:1003 - msgid "The folder could not be created" - msgstr "無法建立資料夾" - --#: ../gtk/gtkfilechooserdefault.c:1014 -+#: ../gtk/gtkfilechooserdefault.c:1016 - msgid "" - "The folder could not be created, as a file with the same name already " - "exists. Try using a different name for the folder, or rename the file first." - msgstr "ć¤čł‡ć–™ĺ¤ľç„ˇćł•ĺ»şç«‹ďĽŚĺ› 為已有相ĺŚĺŤç¨±çš„檔ćˇĺ在。ĺ—試使用不ĺŚçš„資料夾ĺŤç¨±ďĽŚć–者ĺ…重新命ĺŤč©˛ćŞ”ćˇă€‚" - --#: ../gtk/gtkfilechooserdefault.c:1028 -+#: ../gtk/gtkfilechooserdefault.c:1030 - msgid "You need to choose a valid filename." - msgstr "ä˝ éś€č¦é¸ć“‡ćś‰ć•çš„檔ćˇĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:1031 -+#: ../gtk/gtkfilechooserdefault.c:1033 - #, c-format - msgid "Cannot create a file under %s as it is not a folder" - msgstr "不č˝ĺś¨ %s 下建立檔ćˇďĽŚĺ› ç‚şĺ®ä¸ŤćŻčł‡ć–™ĺ¤ľ" - --#: ../gtk/gtkfilechooserdefault.c:1043 -+#: ../gtk/gtkfilechooserdefault.c:1045 - msgid "" - "You may only select folders. The item that you selected is not a folder; " - "try using a different item." - msgstr "ä˝ ĺŹŞč˝é¸ć“‡čł‡ć–™ĺ¤ľă€‚ä˝ ć‰€é¸ĺŹ–çš„é …ç›®ä¸ŤćŻčł‡ć–™ĺ¤ľďĽ›č«‹ĺ—試使用不ĺŚçš„é …ç›®ă€‚" - --#: ../gtk/gtkfilechooserdefault.c:1053 -+#: ../gtk/gtkfilechooserdefault.c:1055 - msgid "Invalid file name" - msgstr "無ć•çš„檔ćˇĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:1063 -+#: ../gtk/gtkfilechooserdefault.c:1065 - msgid "The folder contents could not be displayed" - msgstr "無法顯示資料夾內容" - -@@ -1468,218 +1468,218 @@ msgstr "無法顯示資料夾內容" - #. * is a hostname. Nautilus and the panel contain the same string - #. * to translate. - #. --#: ../gtk/gtkfilechooserdefault.c:1589 -+#: ../gtk/gtkfilechooserdefault.c:1591 - #, c-format - msgid "%1$s on %2$s" - msgstr "%1$s ć–Ľ %2$s" - --#: ../gtk/gtkfilechooserdefault.c:1738 -+#: ../gtk/gtkfilechooserdefault.c:1740 - msgid "Search" - msgstr "ćśĺ°‹" - --#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988 -+#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990 - msgid "Recently Used" --msgstr "最近使用的" -+msgstr "最近使用" - --#: ../gtk/gtkfilechooserdefault.c:2361 -+#: ../gtk/gtkfilechooserdefault.c:2363 - msgid "Select which types of files are shown" - msgstr "é¸ć“‡éˇŻç¤şĺ“Şç¨®éˇžĺž‹çš„檔ćˇ" - --#: ../gtk/gtkfilechooserdefault.c:2720 -+#: ../gtk/gtkfilechooserdefault.c:2722 - #, c-format - msgid "Add the folder '%s' to the bookmarks" - msgstr "將資料夾「%să€ŤĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:2764 -+#: ../gtk/gtkfilechooserdefault.c:2766 - #, c-format - msgid "Add the current folder to the bookmarks" - msgstr "ĺ°‡ç›®ĺ‰Ťçš„čł‡ć–™ĺ¤ľĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:2766 -+#: ../gtk/gtkfilechooserdefault.c:2768 - #, c-format - msgid "Add the selected folders to the bookmarks" - msgstr "將已é¸çš„čł‡ć–™ĺ¤ľĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:2804 -+#: ../gtk/gtkfilechooserdefault.c:2806 - #, c-format - msgid "Remove the bookmark '%s'" - msgstr "移除書籤「%s」" - --#: ../gtk/gtkfilechooserdefault.c:2806 -+#: ../gtk/gtkfilechooserdefault.c:2808 - #, c-format - msgid "Bookmark '%s' cannot be removed" - msgstr "無法移除書籤「%s」" - --#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699 -+#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701 - msgid "Remove the selected bookmark" - msgstr "移除已é¸çš„書籤" - --#: ../gtk/gtkfilechooserdefault.c:3377 -+#: ../gtk/gtkfilechooserdefault.c:3379 - msgid "Remove" - msgstr "移除" - --#: ../gtk/gtkfilechooserdefault.c:3386 -+#: ../gtk/gtkfilechooserdefault.c:3388 - msgid "Rename..." - msgstr "重新命ĺŤâ€¦" - - #. Accessible object name for the file chooser's shortcuts pane --#: ../gtk/gtkfilechooserdefault.c:3550 -+#: ../gtk/gtkfilechooserdefault.c:3552 - msgid "Places" - msgstr "位置" - - #. Column header for the file chooser's shortcuts pane --#: ../gtk/gtkfilechooserdefault.c:3607 -+#: ../gtk/gtkfilechooserdefault.c:3609 - msgid "_Places" - msgstr "位置(_P)" - --#: ../gtk/gtkfilechooserdefault.c:3687 -+#: ../gtk/gtkfilechooserdefault.c:3689 - msgid "Add the selected folder to the Bookmarks" - msgstr "將已é¸çš„čł‡ć–™ĺ¤ľĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:3948 -+#: ../gtk/gtkfilechooserdefault.c:3950 - msgid "Could not select file" - msgstr "無法é¸ĺŹ–檔ćˇ" - --#: ../gtk/gtkfilechooserdefault.c:4173 -+#: ../gtk/gtkfilechooserdefault.c:4175 - msgid "_Visit this file" - msgstr "查閱這個檔ćˇ(_V)" - --#: ../gtk/gtkfilechooserdefault.c:4176 -+#: ../gtk/gtkfilechooserdefault.c:4178 - msgid "_Copy file's location" - msgstr "複製檔ćˇçš„位置(_C)" - --#: ../gtk/gtkfilechooserdefault.c:4179 -+#: ../gtk/gtkfilechooserdefault.c:4181 - msgid "_Add to Bookmarks" - msgstr "ĺŠ ĺ…Ąć›¸ç±¤(_A)" - --#: ../gtk/gtkfilechooserdefault.c:4186 -+#: ../gtk/gtkfilechooserdefault.c:4188 - msgid "Show _Hidden Files" - msgstr "顯示隱藏檔(_H)" - --#: ../gtk/gtkfilechooserdefault.c:4189 -+#: ../gtk/gtkfilechooserdefault.c:4191 - msgid "Show _Size Column" - msgstr "顯示大小欄位(_S)" - --#: ../gtk/gtkfilechooserdefault.c:4414 -+#: ../gtk/gtkfilechooserdefault.c:4416 - msgid "Files" - msgstr "檔ćˇ" - --#: ../gtk/gtkfilechooserdefault.c:4465 -+#: ../gtk/gtkfilechooserdefault.c:4467 - msgid "Name" - msgstr "ĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:4488 -+#: ../gtk/gtkfilechooserdefault.c:4490 - msgid "Size" - msgstr "大小" - --#: ../gtk/gtkfilechooserdefault.c:4502 -+#: ../gtk/gtkfilechooserdefault.c:4504 - msgid "Modified" - msgstr "已修改" - - #. Label --#: ../gtk/gtkfilechooserdefault.c:4595 -+#: ../gtk/gtkfilechooserdefault.c:4597 - msgid "_Name:" - msgstr "ĺŤç¨±(_N):" - --#: ../gtk/gtkfilechooserdefault.c:4826 -+#: ../gtk/gtkfilechooserdefault.c:4828 - msgid "Type a file name" - msgstr "輸入檔ćˇĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884 -+#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886 - msgid "Please select a folder below" - msgstr "č«‹é¸ć“‡ä¸‹éť˘çš„資料夾" - --#: ../gtk/gtkfilechooserdefault.c:4879 -+#: ../gtk/gtkfilechooserdefault.c:4881 - msgid "Please type a file name" - msgstr "請輸入檔ćˇĺŤç¨±" - - #. Create Folder --#: ../gtk/gtkfilechooserdefault.c:4950 -+#: ../gtk/gtkfilechooserdefault.c:4952 - msgid "Create Fo_lder" - msgstr "建立資料夾(_L)" - --#: ../gtk/gtkfilechooserdefault.c:4998 -+#: ../gtk/gtkfilechooserdefault.c:5000 - msgid "Search:" - msgstr "ćśĺ°‹ďĽš" - --#: ../gtk/gtkfilechooserdefault.c:5049 -+#: ../gtk/gtkfilechooserdefault.c:5051 - msgid "_Location:" - msgstr "位置(_L):" - --#: ../gtk/gtkfilechooserdefault.c:5500 -+#: ../gtk/gtkfilechooserdefault.c:5502 - msgid "Save in _folder:" - msgstr "儲ĺ於資料夾(_F):" - --#: ../gtk/gtkfilechooserdefault.c:5502 -+#: ../gtk/gtkfilechooserdefault.c:5504 - msgid "Create in _folder:" - msgstr "新增於資料夾(_F)：" - --#: ../gtk/gtkfilechooserdefault.c:6589 -+#: ../gtk/gtkfilechooserdefault.c:6591 - #, c-format - msgid "Could not read the contents of %s" - msgstr "無法讀取 %s 的內容" - --#: ../gtk/gtkfilechooserdefault.c:6593 -+#: ../gtk/gtkfilechooserdefault.c:6595 - msgid "Could not read the contents of the folder" - msgstr "無法讀取資料夾的內容" - --#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754 --#: ../gtk/gtkfilechooserdefault.c:6934 -+#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756 -+#: ../gtk/gtkfilechooserdefault.c:6936 - msgid "Unknown" - msgstr "不ćŽ" - --#: ../gtk/gtkfilechooserdefault.c:6701 -+#: ../gtk/gtkfilechooserdefault.c:6703 - msgid "%H:%M" - msgstr "%H:%M" - --#: ../gtk/gtkfilechooserdefault.c:6703 -+#: ../gtk/gtkfilechooserdefault.c:6705 - msgid "Yesterday at %H:%M" - msgstr "ć¨ĺ¤© %H:%M" - --#: ../gtk/gtkfilechooserdefault.c:7405 -+#: ../gtk/gtkfilechooserdefault.c:7407 - msgid "Cannot change to folder because it is not local" - msgstr "ç„ˇćł•é€˛ĺ…Ąčł‡ć–™ĺ¤ľďĽŚĺ› ç‚şĺ®ä¸ŤćŻćś¬ĺś°čł‡ć–™ĺ¤ľ" - --#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030 -+#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032 - #, c-format - msgid "Shortcut %s already exists" - msgstr "捷徑 %s 已經ĺ在" - --#: ../gtk/gtkfilechooserdefault.c:8120 -+#: ../gtk/gtkfilechooserdefault.c:8122 - #, c-format - msgid "Shortcut %s does not exist" - msgstr "捷徑 %s 不ĺ在" - --#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548 -+#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548 - #, c-format - msgid "A file named \"%s\" already exists. Do you want to replace it?" - msgstr "ĺŤç‚şă€Ś%s」的檔ćˇĺ·˛ĺ在。ćŻĺ¦č¦ĺŹ–代ĺ®ďĽź" - --#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552 -+#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552 - #, c-format - msgid "" - "The file already exists in \"%s\". Replacing it will overwrite its contents." - msgstr "該檔ćˇĺ·˛ĺ在於「%s」。取代ĺ®ćśč¦†č“‹ĺ®çš„內容。" - --#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559 -+#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559 - msgid "_Replace" - msgstr "取代(_R)" - --#: ../gtk/gtkfilechooserdefault.c:9181 -+#: ../gtk/gtkfilechooserdefault.c:9183 - msgid "Could not start the search process" - msgstr "無法開始ćśĺ°‹ç¨‹ĺşŹ" - --#: ../gtk/gtkfilechooserdefault.c:9182 -+#: ../gtk/gtkfilechooserdefault.c:9184 - msgid "" - "The program was not able to create a connection to the indexer daemon. " - "Please make sure it is running." - msgstr "ć¤ç¨‹ĺĽŹç„ˇćł•ĺ»şç«‹č‡ł indexer 伺服程式的連線。請確認ĺ®ćŻĺ¦ĺ·˛ĺź·čˇŚă€‚" - --#: ../gtk/gtkfilechooserdefault.c:9196 -+#: ../gtk/gtkfilechooserdefault.c:9198 - msgid "Could not send the search request" - msgstr "無法傳é€ćśĺ°‹č¦ć±‚" - --#: ../gtk/gtkfilechooserdefault.c:9806 -+#: ../gtk/gtkfilechooserdefault.c:9808 - #, c-format - msgid "Could not mount %s" - msgstr "無法掛載 %s" -@@ -1842,27 +1842,27 @@ msgstr "" - "č«‹čŻçµˇä˝ 的系統管ç†ĺ“ˇ" - - #. Description of --gtk-module=MODULES in --help output --#: ../gtk/gtkmain.c:446 -+#: ../gtk/gtkmain.c:447 - msgid "Load additional GTK+ modules" - msgstr "載入額外的 GTK+ 模組" - - #. Placeholder in --gtk-module=MODULES in --help output --#: ../gtk/gtkmain.c:447 -+#: ../gtk/gtkmain.c:448 - msgid "MODULES" - msgstr "模組" - - #. Description of --g-fatal-warnings in --help output --#: ../gtk/gtkmain.c:449 -+#: ../gtk/gtkmain.c:450 - msgid "Make all warnings fatal" - msgstr "把所有的č¦ĺ‘Šč¨ŠćŻé˝ç•¶ć嚴重錯誤" - - #. Description of --gtk-debug=FLAGS in --help output --#: ../gtk/gtkmain.c:452 -+#: ../gtk/gtkmain.c:453 - msgid "GTK+ debugging flags to set" - msgstr "ćş–ĺ‚™č¨ĺ®šçš„ GTK+ ĺµéŚŻć——標" - - #. Description of --gtk-no-debug=FLAGS in --help output --#: ../gtk/gtkmain.c:455 -+#: ../gtk/gtkmain.c:456 - msgid "GTK+ debugging flags to unset" - msgstr "準備去除的 GTK+ ĺµéŚŻć——標" - -@@ -1871,73 +1871,73 @@ msgstr "準備去除的 GTK+ ĺµéŚŻć——標" - #. * Do *not* translate it to "predefinito:LTR", if it - #. * it isn't default:LTR or default:RTL it will not work - #. --#: ../gtk/gtkmain.c:706 -+#: ../gtk/gtkmain.c:704 - msgid "default:LTR" - msgstr "default:LTR" - --#: ../gtk/gtkmain.c:774 -+#: ../gtk/gtkmain.c:772 - #, c-format - msgid "Cannot open display: %s" - msgstr "無法開啟畫面：%s" - --#: ../gtk/gtkmain.c:840 -+#: ../gtk/gtkmain.c:838 - msgid "GTK+ Options" - msgstr "GTK+ é¸é …" - --#: ../gtk/gtkmain.c:840 -+#: ../gtk/gtkmain.c:838 - msgid "Show GTK+ Options" - msgstr "顯示 GTK+ é¸é …" - --#: ../gtk/gtkmountoperation.c:532 -+#: ../gtk/gtkmountoperation.c:535 - msgid "Co_nnect" - msgstr "連線(_N)" - --#: ../gtk/gtkmountoperation.c:606 -+#: ../gtk/gtkmountoperation.c:609 - msgid "Connect As" - msgstr "連線身ĺ†" - --#: ../gtk/gtkmountoperation.c:615 -+#: ../gtk/gtkmountoperation.c:618 - msgid "_Anonymous" - msgstr "匿ĺŤ(_A)" - --#: ../gtk/gtkmountoperation.c:624 -+#: ../gtk/gtkmountoperation.c:627 - msgid "Registered U_ser" - msgstr "已註冊使用者(_S)" - --#: ../gtk/gtkmountoperation.c:635 -+#: ../gtk/gtkmountoperation.c:638 - msgid "_Username" - msgstr "使用者ĺŤç¨±(_U)" - --#: ../gtk/gtkmountoperation.c:640 -+#: ../gtk/gtkmountoperation.c:643 - msgid "_Domain" - msgstr "網域(_D)" - --#: ../gtk/gtkmountoperation.c:646 -+#: ../gtk/gtkmountoperation.c:649 - msgid "_Password" - msgstr "密碼(_P)" - --#: ../gtk/gtkmountoperation.c:668 -+#: ../gtk/gtkmountoperation.c:671 - msgid "Forget password _immediately" - msgstr "ç«‹ĺ»ĺżč¨ĺŻ†ç˘Ľ(_I)" - --#: ../gtk/gtkmountoperation.c:678 -+#: ../gtk/gtkmountoperation.c:681 - msgid "Remember password until you _logout" - msgstr "č¨ć†¶ĺŻ†ç˘Ľĺ°ç™»ĺ‡şäą‹ĺ‰Ť(_L)" - --#: ../gtk/gtkmountoperation.c:688 -+#: ../gtk/gtkmountoperation.c:691 - msgid "Remember _forever" - msgstr "ć°¸é č¨ä˝ŹĺŻ†ç˘Ľ(_F)" - --#: ../gtk/gtkmountoperation.c:1077 -+#: ../gtk/gtkmountoperation.c:1080 - #, c-format - msgid "Unknown Application (PID %d)" - msgstr "不ćŽçš„應用程式ďĽPID %d）" - --#: ../gtk/gtkmountoperation.c:1260 -+#: ../gtk/gtkmountoperation.c:1263 - msgid "Unable to end process" - msgstr "無法終ć˘ç¨‹ĺşŹ" - --#: ../gtk/gtkmountoperation.c:1297 -+#: ../gtk/gtkmountoperation.c:1300 - msgid "_End Process" - msgstr "終ć˘ç¨‹ĺşŹ(_E)" - -@@ -1980,14 +1980,14 @@ msgstr "第 %u é " - #. Translators: the format here is used to build the string that will be rendered - #. * in the number emblem. - #. --#: ../gtk/gtknumerableicon.c:481 -+#: ../gtk/gtknumerableicon.c:482 - #, c-format - msgctxt "Number format" - msgid "%d" - msgstr "%d" - --#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846 --#: ../gtk/gtkpapersize.c:886 -+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848 -+#: ../gtk/gtkpapersize.c:888 - msgid "Not a valid page setup file" - msgstr "不ćŻćś‰ć•çš„é 面č¨ĺ®šćŞ”ćˇ" - -@@ -2046,7 +2046,7 @@ msgstr "ĺ‘下路徑" - msgid "File System Root" - msgstr "檔ćˇçł»çµ±ć ą" - --#: ../gtk/gtkprintbackend.c:748 -+#: ../gtk/gtkprintbackend.c:750 - msgid "Authentication" - msgstr "é©—č‰" - -@@ -2112,29 +2112,29 @@ msgctxt "print operation status" - msgid "Finished with error" - msgstr "已完ć但發生錯誤" - --#: ../gtk/gtkprintoperation.c:2352 -+#: ../gtk/gtkprintoperation.c:2349 - #, c-format - msgid "Preparing %d" - msgstr "ćŁĺś¨ćş–ĺ‚™ %d" - --#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984 -+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983 - msgid "Preparing" - msgstr "ćŁĺś¨ćş–ĺ‚™" - --#: ../gtk/gtkprintoperation.c:2357 -+#: ../gtk/gtkprintoperation.c:2354 - #, c-format - msgid "Printing %d" - msgstr "ćŁĺś¨ć‰“印 %d" - --#: ../gtk/gtkprintoperation.c:3014 -+#: ../gtk/gtkprintoperation.c:3013 - msgid "Error creating print preview" - msgstr "建立打印é 覽時發生錯誤" - --#: ../gtk/gtkprintoperation.c:3017 -+#: ../gtk/gtkprintoperation.c:3016 - msgid "The most probable reason is that a temporary file could not be created." - msgstr "最可č˝çš„ĺŽźĺ› ćŻç„ˇćł•ĺ»şç«‹ćš«ĺ檔ćˇă€‚" - --#: ../gtk/gtkprintoperation-unix.c:302 -+#: ../gtk/gtkprintoperation-unix.c:307 - msgid "Error launching preview" - msgstr "執行é 覽時發生錯誤" - -@@ -3301,7 +3301,7 @@ msgstr "第 %2$d 行第 %3$d ĺ—有非é č¨çš„開始標č¨ă€Ś%1$s」" - msgid "Unexpected character data on line %d char %d" - msgstr "第 %d 行第 %d ĺ—有非é č¨çš„ĺ—符資料" - --#: ../gtk/gtkuimanager.c:2738 -+#: ../gtk/gtkuimanager.c:2694 - msgid "Empty" - msgstr "ç©şçš„" - -diff --git a/po/zh_TW.po b/po/zh_TW.po -index 785b127..979172e 100644 ---- a/po/zh_TW.po -+++ b/po/zh_TW.po -@@ -8,9 +8,9 @@ msgid "" - msgstr "" - "Project-Id-Version: gtk+ 3.3.11\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-09-05 20:10+0800\n" --"PO-Revision-Date: 2012-09-05 16:20+0800\n" --"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n" -+"POT-Creation-Date: 2012-11-07 02:40+0800\n" -+"PO-Revision-Date: 2012-11-01 22:07+0800\n" -+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" - "Language-Team: <>\n" - "Language: zh_TW\n" - "MIME-Version: 1.0\n" -@@ -69,7 +69,7 @@ msgstr "ćş–ĺ‚™č¨ĺ®šçš„ GDK ĺµéŚŻć——標" - #. Placeholder in --gdk-no-debug=FLAGS in --help output - #. Placeholder in --gtk-debug=FLAGS in --help output - #. Placeholder in --gtk-no-debug=FLAGS in --help output --#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456 -+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457 - msgid "FLAGS" - msgstr "旗標" - -@@ -699,7 +699,7 @@ msgstr "美工č¨č¨" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:156 -+#: ../gtk/gtkaccellabel.c:159 - msgctxt "keyboard label" - msgid "Shift" - msgstr "Shift" -@@ -709,7 +709,7 @@ msgstr "Shift" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:162 -+#: ../gtk/gtkaccellabel.c:165 - msgctxt "keyboard label" - msgid "Ctrl" - msgstr "Ctrl" -@@ -719,7 +719,7 @@ msgstr "Ctrl" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:168 -+#: ../gtk/gtkaccellabel.c:171 - msgctxt "keyboard label" - msgid "Alt" - msgstr "Alt" -@@ -729,7 +729,7 @@ msgstr "Alt" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:802 -+#: ../gtk/gtkaccellabel.c:805 - msgctxt "keyboard label" - msgid "Super" - msgstr "Super" -@@ -739,7 +739,7 @@ msgstr "Super" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:815 -+#: ../gtk/gtkaccellabel.c:818 - msgctxt "keyboard label" - msgid "Hyper" - msgstr "Hyper" -@@ -749,17 +749,17 @@ msgstr "Hyper" - #. * translated on keyboards used for your language, don't translate - #. * this. - #. --#: ../gtk/gtkaccellabel.c:829 -+#: ../gtk/gtkaccellabel.c:832 - msgctxt "keyboard label" - msgid "Meta" - msgstr "Meta" - --#: ../gtk/gtkaccellabel.c:845 -+#: ../gtk/gtkaccellabel.c:848 - msgctxt "keyboard label" - msgid "Space" - msgstr "Space" - --#: ../gtk/gtkaccellabel.c:848 -+#: ../gtk/gtkaccellabel.c:851 - msgctxt "keyboard label" - msgid "Backslash" - msgstr "Backslash" -@@ -795,7 +795,7 @@ msgstr "找不ĺ°ć‡‰ç”¨ç¨‹ĺĽŹ" - msgid "Select an application to open \"%s\"" - msgstr "č«‹é¸ć“‡č¦ç”¨äľ†é–‹ĺ•źă€Ś%s」的應用程式" - --#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654 -+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657 - #, c-format - msgid "No applications available to open \"%s\"" - msgstr "沒有程式可開啟「%s」的應用程式" -@@ -827,23 +827,23 @@ msgstr "ć¶é™¤é—śčŻ" - msgid "Show other applications" - msgstr "顯示其他的應用程式" - --#: ../gtk/gtkappchooserwidget.c:603 -+#: ../gtk/gtkappchooserwidget.c:606 - msgid "Default Application" - msgstr "é č¨çš„應用程式" - --#: ../gtk/gtkappchooserwidget.c:741 -+#: ../gtk/gtkappchooserwidget.c:744 - msgid "Recommended Applications" - msgstr "建č°çš„應用程式" - --#: ../gtk/gtkappchooserwidget.c:756 -+#: ../gtk/gtkappchooserwidget.c:759 - msgid "Related Applications" - msgstr "相關的應用程式" - --#: ../gtk/gtkappchooserwidget.c:770 -+#: ../gtk/gtkappchooserwidget.c:773 - msgid "Other Applications" - msgstr "其他的應用程式" - --#: ../gtk/gtkapplication.c:1552 -+#: ../gtk/gtkapplication.c:1558 - #, c-format - msgid "" - "%s cannot quit at this time:\n" -@@ -854,20 +854,20 @@ msgstr "" - "\n" - "%s" - --#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475 -+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480 - #: ../gtk/gtkprintoperation-win32.c:1445 - msgid "Application" - msgstr "應用程式" - --#: ../gtk/gtkassistant.c:1004 -+#: ../gtk/gtkassistant.c:1008 - msgid "C_ontinue" - msgstr "繼續(_O)" - --#: ../gtk/gtkassistant.c:1007 -+#: ../gtk/gtkassistant.c:1011 - msgid "Go _Back" - msgstr "後退(_B)" - --#: ../gtk/gtkassistant.c:1011 -+#: ../gtk/gtkassistant.c:1015 - msgid "_Finish" - msgstr "完ć(_F)" - -@@ -1006,7 +1006,7 @@ msgstr "無ć•" - #. * an accelerator when the cell is clicked to change the - #. * acelerator. - #. --#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745 -+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747 - msgid "New accelerator..." - msgstr "新增捷徑鍵…" - -@@ -1406,7 +1406,7 @@ msgstr "Caps Lock 已開啟" - msgid "Select a File" - msgstr "é¸ĺŹ–檔ćˇ" - --#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817 -+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819 - msgid "Desktop" - msgstr "桌面" - -@@ -1422,23 +1422,23 @@ msgstr "其他…" - msgid "Type name of new folder" - msgstr "請輸入新資料夾ĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:968 -+#: ../gtk/gtkfilechooserdefault.c:970 - msgid "Could not retrieve information about the file" - msgstr "無法取得關於檔ćˇçš„資訊" - --#: ../gtk/gtkfilechooserdefault.c:979 -+#: ../gtk/gtkfilechooserdefault.c:981 - msgid "Could not add a bookmark" - msgstr "ç„ˇćł•ĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:990 -+#: ../gtk/gtkfilechooserdefault.c:992 - msgid "Could not remove bookmark" - msgstr "無法移除書籤" - --#: ../gtk/gtkfilechooserdefault.c:1001 -+#: ../gtk/gtkfilechooserdefault.c:1003 - msgid "The folder could not be created" - msgstr "無法建立資料夾" - --#: ../gtk/gtkfilechooserdefault.c:1014 -+#: ../gtk/gtkfilechooserdefault.c:1016 - msgid "" - "The folder could not be created, as a file with the same name already " - "exists. Try using a different name for the folder, or rename the file first." -@@ -1446,26 +1446,26 @@ msgstr "" - "ć¤čł‡ć–™ĺ¤ľç„ˇćł•ĺ»şç«‹ďĽŚĺ› 為已有相ĺŚĺŤç¨±çš„檔ćˇĺ在。試著使用不ĺŚçš„資料夾ĺŤç¨±ďĽŚć–者" - "ĺ…重新命ĺŤč©˛ćŞ”ćˇă€‚" - --#: ../gtk/gtkfilechooserdefault.c:1028 -+#: ../gtk/gtkfilechooserdefault.c:1030 - msgid "You need to choose a valid filename." - msgstr "您需č¦é¸ć“‡ćś‰ć•çš„檔ćˇĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:1031 -+#: ../gtk/gtkfilechooserdefault.c:1033 - #, c-format - msgid "Cannot create a file under %s as it is not a folder" - msgstr "不č˝ĺś¨ %s 下建立檔ćˇďĽŚĺ› ç‚şĺ®ä¸ŤćŻčł‡ć–™ĺ¤ľ" - --#: ../gtk/gtkfilechooserdefault.c:1043 -+#: ../gtk/gtkfilechooserdefault.c:1045 - msgid "" - "You may only select folders. The item that you selected is not a folder; " - "try using a different item." - msgstr "您只č˝é¸ć“‡čł‡ć–™ĺ¤ľă€‚您所é¸ĺŹ–çš„é …ç›®ä¸ŤćŻčł‡ć–™ĺ¤ľďĽ›č«‹č©¦č‘—使用不ĺŚçš„é …ç›®ă€‚" - --#: ../gtk/gtkfilechooserdefault.c:1053 -+#: ../gtk/gtkfilechooserdefault.c:1055 - msgid "Invalid file name" - msgstr "無ć•çš„檔ćˇĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:1063 -+#: ../gtk/gtkfilechooserdefault.c:1065 - msgid "The folder contents could not be displayed" - msgstr "無法顯示資料夾內容" - -@@ -1473,218 +1473,218 @@ msgstr "無法顯示資料夾內容" - #. * is a hostname. Nautilus and the panel contain the same string - #. * to translate. - #. --#: ../gtk/gtkfilechooserdefault.c:1589 -+#: ../gtk/gtkfilechooserdefault.c:1591 - #, c-format - msgid "%1$s on %2$s" - msgstr "%1$s ć–Ľ %2$s" - --#: ../gtk/gtkfilechooserdefault.c:1738 -+#: ../gtk/gtkfilechooserdefault.c:1740 - msgid "Search" - msgstr "ćśĺ°‹" - --#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988 -+#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990 - msgid "Recently Used" --msgstr "最近使用的" -+msgstr "最近使用" - --#: ../gtk/gtkfilechooserdefault.c:2361 -+#: ../gtk/gtkfilechooserdefault.c:2363 - msgid "Select which types of files are shown" - msgstr "é¸ć“‡éˇŻç¤şĺ“Şç¨®éˇžĺž‹çš„檔ćˇ" - --#: ../gtk/gtkfilechooserdefault.c:2720 -+#: ../gtk/gtkfilechooserdefault.c:2722 - #, c-format - msgid "Add the folder '%s' to the bookmarks" - msgstr "將資料夾「%să€ŤĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:2764 -+#: ../gtk/gtkfilechooserdefault.c:2766 - #, c-format - msgid "Add the current folder to the bookmarks" - msgstr "ĺ°‡ç›®ĺ‰Ťçš„čł‡ć–™ĺ¤ľĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:2766 -+#: ../gtk/gtkfilechooserdefault.c:2768 - #, c-format - msgid "Add the selected folders to the bookmarks" - msgstr "將已é¸çš„čł‡ć–™ĺ¤ľĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:2804 -+#: ../gtk/gtkfilechooserdefault.c:2806 - #, c-format - msgid "Remove the bookmark '%s'" - msgstr "移除書籤「%s」" - --#: ../gtk/gtkfilechooserdefault.c:2806 -+#: ../gtk/gtkfilechooserdefault.c:2808 - #, c-format - msgid "Bookmark '%s' cannot be removed" - msgstr "無法移除書籤「%s」" - --#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699 -+#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701 - msgid "Remove the selected bookmark" - msgstr "移除已é¸çš„書籤" - --#: ../gtk/gtkfilechooserdefault.c:3377 -+#: ../gtk/gtkfilechooserdefault.c:3379 - msgid "Remove" - msgstr "移除" - --#: ../gtk/gtkfilechooserdefault.c:3386 -+#: ../gtk/gtkfilechooserdefault.c:3388 - msgid "Rename..." - msgstr "重新命ĺŤâ€¦" - - #. Accessible object name for the file chooser's shortcuts pane --#: ../gtk/gtkfilechooserdefault.c:3550 -+#: ../gtk/gtkfilechooserdefault.c:3552 - msgid "Places" - msgstr "位置" - - #. Column header for the file chooser's shortcuts pane --#: ../gtk/gtkfilechooserdefault.c:3607 -+#: ../gtk/gtkfilechooserdefault.c:3609 - msgid "_Places" - msgstr "位置(_P)" - --#: ../gtk/gtkfilechooserdefault.c:3687 -+#: ../gtk/gtkfilechooserdefault.c:3689 - msgid "Add the selected folder to the Bookmarks" - msgstr "將已é¸çš„čł‡ć–™ĺ¤ľĺŠ ĺ…Ąć›¸ç±¤" - --#: ../gtk/gtkfilechooserdefault.c:3948 -+#: ../gtk/gtkfilechooserdefault.c:3950 - msgid "Could not select file" - msgstr "無法é¸ĺŹ–檔ćˇ" - --#: ../gtk/gtkfilechooserdefault.c:4173 -+#: ../gtk/gtkfilechooserdefault.c:4175 - msgid "_Visit this file" - msgstr "查閱這個檔ćˇ(_V)" - --#: ../gtk/gtkfilechooserdefault.c:4176 -+#: ../gtk/gtkfilechooserdefault.c:4178 - msgid "_Copy file's location" - msgstr "複製檔ćˇçš„位置(_C)" - --#: ../gtk/gtkfilechooserdefault.c:4179 -+#: ../gtk/gtkfilechooserdefault.c:4181 - msgid "_Add to Bookmarks" - msgstr "ĺŠ ĺ…Ąć›¸ç±¤(_A)" - --#: ../gtk/gtkfilechooserdefault.c:4186 -+#: ../gtk/gtkfilechooserdefault.c:4188 - msgid "Show _Hidden Files" - msgstr "顯示隱藏檔(_H)" - --#: ../gtk/gtkfilechooserdefault.c:4189 -+#: ../gtk/gtkfilechooserdefault.c:4191 - msgid "Show _Size Column" - msgstr "顯示大小欄位(_S)" - --#: ../gtk/gtkfilechooserdefault.c:4414 -+#: ../gtk/gtkfilechooserdefault.c:4416 - msgid "Files" - msgstr "檔ćˇ" - --#: ../gtk/gtkfilechooserdefault.c:4465 -+#: ../gtk/gtkfilechooserdefault.c:4467 - msgid "Name" - msgstr "ĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:4488 -+#: ../gtk/gtkfilechooserdefault.c:4490 - msgid "Size" - msgstr "大小" - --#: ../gtk/gtkfilechooserdefault.c:4502 -+#: ../gtk/gtkfilechooserdefault.c:4504 - msgid "Modified" - msgstr "已修改" - - #. Label --#: ../gtk/gtkfilechooserdefault.c:4595 -+#: ../gtk/gtkfilechooserdefault.c:4597 - msgid "_Name:" - msgstr "ĺŤç¨±(_N):" - --#: ../gtk/gtkfilechooserdefault.c:4826 -+#: ../gtk/gtkfilechooserdefault.c:4828 - msgid "Type a file name" - msgstr "輸入檔ćˇĺŤç¨±" - --#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884 -+#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886 - msgid "Please select a folder below" - msgstr "č«‹é¸ć“‡ä¸‹éť˘çš„資料夾" - --#: ../gtk/gtkfilechooserdefault.c:4879 -+#: ../gtk/gtkfilechooserdefault.c:4881 - msgid "Please type a file name" - msgstr "請輸入檔ćˇĺŤç¨±" - - #. Create Folder --#: ../gtk/gtkfilechooserdefault.c:4950 -+#: ../gtk/gtkfilechooserdefault.c:4952 - msgid "Create Fo_lder" - msgstr "建立資料夾(_L)" - --#: ../gtk/gtkfilechooserdefault.c:4998 -+#: ../gtk/gtkfilechooserdefault.c:5000 - msgid "Search:" - msgstr "ćśĺ°‹ďĽš" - --#: ../gtk/gtkfilechooserdefault.c:5049 -+#: ../gtk/gtkfilechooserdefault.c:5051 - msgid "_Location:" - msgstr "位置(_L):" - --#: ../gtk/gtkfilechooserdefault.c:5500 -+#: ../gtk/gtkfilechooserdefault.c:5502 - msgid "Save in _folder:" - msgstr "儲ĺ於資料夾(_F):" - --#: ../gtk/gtkfilechooserdefault.c:5502 -+#: ../gtk/gtkfilechooserdefault.c:5504 - msgid "Create in _folder:" - msgstr "新增於資料夾(_F)：" - --#: ../gtk/gtkfilechooserdefault.c:6589 -+#: ../gtk/gtkfilechooserdefault.c:6591 - #, c-format - msgid "Could not read the contents of %s" - msgstr "無法讀取 %s 的內容" - --#: ../gtk/gtkfilechooserdefault.c:6593 -+#: ../gtk/gtkfilechooserdefault.c:6595 - msgid "Could not read the contents of the folder" - msgstr "無法讀取資料夾的內容" - --#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754 --#: ../gtk/gtkfilechooserdefault.c:6934 -+#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756 -+#: ../gtk/gtkfilechooserdefault.c:6936 - msgid "Unknown" - msgstr "不ćŽ" - --#: ../gtk/gtkfilechooserdefault.c:6701 -+#: ../gtk/gtkfilechooserdefault.c:6703 - msgid "%H:%M" - msgstr "%H:%M" - --#: ../gtk/gtkfilechooserdefault.c:6703 -+#: ../gtk/gtkfilechooserdefault.c:6705 - msgid "Yesterday at %H:%M" - msgstr "ć¨ĺ¤© %H:%M" - --#: ../gtk/gtkfilechooserdefault.c:7405 -+#: ../gtk/gtkfilechooserdefault.c:7407 - msgid "Cannot change to folder because it is not local" - msgstr "ç„ˇćł•é€˛ĺ…Ąčł‡ć–™ĺ¤ľďĽŚĺ› ç‚şĺ®ä¸ŤćŻćś¬ĺś°čł‡ć–™ĺ¤ľ" - --#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030 -+#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032 - #, c-format - msgid "Shortcut %s already exists" - msgstr "捷徑 %s 已經ĺ在" - --#: ../gtk/gtkfilechooserdefault.c:8120 -+#: ../gtk/gtkfilechooserdefault.c:8122 - #, c-format - msgid "Shortcut %s does not exist" - msgstr "捷徑 %s 不ĺ在" - --#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548 -+#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548 - #, c-format - msgid "A file named \"%s\" already exists. Do you want to replace it?" - msgstr "ĺŤç‚şă€Ś%s」的檔ćˇĺ·˛ĺ在。ćŻĺ¦č¦ĺŹ–代ĺ®ďĽź" - --#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552 -+#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552 - #, c-format - msgid "" - "The file already exists in \"%s\". Replacing it will overwrite its contents." - msgstr "該檔ćˇĺ·˛ĺ在於「%s」。取代ĺ®ćśč¦†č“‹ĺ®çš„內容。" - --#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559 -+#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559 - msgid "_Replace" - msgstr "取代(_R)" - --#: ../gtk/gtkfilechooserdefault.c:9181 -+#: ../gtk/gtkfilechooserdefault.c:9183 - msgid "Could not start the search process" - msgstr "無法開始ćśĺ°‹ç¨‹ĺşŹ" - --#: ../gtk/gtkfilechooserdefault.c:9182 -+#: ../gtk/gtkfilechooserdefault.c:9184 - msgid "" - "The program was not able to create a connection to the indexer daemon. " - "Please make sure it is running." - msgstr "ć¤ç¨‹ĺĽŹç„ˇćł•ĺ»şç«‹č‡ł indexer 伺服程式的連線。請確認ĺ®ćŻĺ¦ĺ·˛ĺź·čˇŚă€‚" - --#: ../gtk/gtkfilechooserdefault.c:9196 -+#: ../gtk/gtkfilechooserdefault.c:9198 - msgid "Could not send the search request" - msgstr "無法傳é€ćśĺ°‹č¦ć±‚" - --#: ../gtk/gtkfilechooserdefault.c:9806 -+#: ../gtk/gtkfilechooserdefault.c:9808 - #, c-format - msgid "Could not mount %s" - msgstr "無法掛載 %s" -@@ -1847,27 +1847,27 @@ msgstr "" - "č«‹čŻçµˇć‚¨çš„系統管ç†ĺ“ˇ" - - #. Description of --gtk-module=MODULES in --help output --#: ../gtk/gtkmain.c:446 -+#: ../gtk/gtkmain.c:447 - msgid "Load additional GTK+ modules" - msgstr "載入額外的 GTK+ 模組" - - #. Placeholder in --gtk-module=MODULES in --help output --#: ../gtk/gtkmain.c:447 -+#: ../gtk/gtkmain.c:448 - msgid "MODULES" - msgstr "模組" - - #. Description of --g-fatal-warnings in --help output --#: ../gtk/gtkmain.c:449 -+#: ../gtk/gtkmain.c:450 - msgid "Make all warnings fatal" - msgstr "把所有的č¦ĺ‘Šč¨ŠćŻé˝ç•¶ć嚴重錯誤" - - #. Description of --gtk-debug=FLAGS in --help output --#: ../gtk/gtkmain.c:452 -+#: ../gtk/gtkmain.c:453 - msgid "GTK+ debugging flags to set" - msgstr "ćş–ĺ‚™č¨ĺ®šçš„ GTK+ ĺµéŚŻć——標" - - #. Description of --gtk-no-debug=FLAGS in --help output --#: ../gtk/gtkmain.c:455 -+#: ../gtk/gtkmain.c:456 - msgid "GTK+ debugging flags to unset" - msgstr "準備去除的 GTK+ ĺµéŚŻć——標" - -@@ -1876,73 +1876,73 @@ msgstr "準備去除的 GTK+ ĺµéŚŻć——標" - #. * Do *not* translate it to "predefinito:LTR", if it - #. * it isn't default:LTR or default:RTL it will not work - #. --#: ../gtk/gtkmain.c:706 -+#: ../gtk/gtkmain.c:704 - msgid "default:LTR" - msgstr "default:LTR" - --#: ../gtk/gtkmain.c:774 -+#: ../gtk/gtkmain.c:772 - #, c-format - msgid "Cannot open display: %s" - msgstr "無法開啟畫面：%s" - --#: ../gtk/gtkmain.c:840 -+#: ../gtk/gtkmain.c:838 - msgid "GTK+ Options" - msgstr "GTK+ é¸é …" - --#: ../gtk/gtkmain.c:840 -+#: ../gtk/gtkmain.c:838 - msgid "Show GTK+ Options" - msgstr "顯示 GTK+ é¸é …" - --#: ../gtk/gtkmountoperation.c:532 -+#: ../gtk/gtkmountoperation.c:535 - msgid "Co_nnect" - msgstr "連線(_N)" - --#: ../gtk/gtkmountoperation.c:606 -+#: ../gtk/gtkmountoperation.c:609 - msgid "Connect As" - msgstr "連線身ĺ†" - --#: ../gtk/gtkmountoperation.c:615 -+#: ../gtk/gtkmountoperation.c:618 - msgid "_Anonymous" - msgstr "匿ĺŤ(_A)" - --#: ../gtk/gtkmountoperation.c:624 -+#: ../gtk/gtkmountoperation.c:627 - msgid "Registered U_ser" - msgstr "已註冊使用者(_S)" - --#: ../gtk/gtkmountoperation.c:635 -+#: ../gtk/gtkmountoperation.c:638 - msgid "_Username" - msgstr "使用者ĺŤç¨±(_U)" - --#: ../gtk/gtkmountoperation.c:640 -+#: ../gtk/gtkmountoperation.c:643 - msgid "_Domain" - msgstr "網域(_D)" - --#: ../gtk/gtkmountoperation.c:646 -+#: ../gtk/gtkmountoperation.c:649 - msgid "_Password" - msgstr "密碼(_P)" - --#: ../gtk/gtkmountoperation.c:668 -+#: ../gtk/gtkmountoperation.c:671 - msgid "Forget password _immediately" - msgstr "ç«‹ĺ»ĺżč¨ĺŻ†ç˘Ľ(_I)" - --#: ../gtk/gtkmountoperation.c:678 -+#: ../gtk/gtkmountoperation.c:681 - msgid "Remember password until you _logout" - msgstr "č¨ć†¶ĺŻ†ç˘Ľĺ°ç™»ĺ‡şäą‹ĺ‰Ť(_L)" - --#: ../gtk/gtkmountoperation.c:688 -+#: ../gtk/gtkmountoperation.c:691 - msgid "Remember _forever" - msgstr "ć°¸é č¨ä˝ŹĺŻ†ç˘Ľ(_F)" - --#: ../gtk/gtkmountoperation.c:1077 -+#: ../gtk/gtkmountoperation.c:1080 - #, c-format - msgid "Unknown Application (PID %d)" - msgstr "不ćŽçš„應用程式ďĽPID %d）" - --#: ../gtk/gtkmountoperation.c:1260 -+#: ../gtk/gtkmountoperation.c:1263 - msgid "Unable to end process" - msgstr "無法終ć˘ç¨‹ĺşŹ" - --#: ../gtk/gtkmountoperation.c:1297 -+#: ../gtk/gtkmountoperation.c:1300 - msgid "_End Process" - msgstr "終ć˘ç¨‹ĺşŹ(_E)" - -@@ -1985,14 +1985,14 @@ msgstr "第 %u é " - #. Translators: the format here is used to build the string that will be rendered - #. * in the number emblem. - #. --#: ../gtk/gtknumerableicon.c:481 -+#: ../gtk/gtknumerableicon.c:482 - #, c-format - msgctxt "Number format" - msgid "%d" - msgstr "%d" - --#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846 --#: ../gtk/gtkpapersize.c:886 -+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848 -+#: ../gtk/gtkpapersize.c:888 - msgid "Not a valid page setup file" - msgstr "不ćŻćś‰ć•çš„é 面č¨ĺ®šćŞ”ćˇ" - -@@ -2051,7 +2051,7 @@ msgstr "ĺ‘下路徑" - msgid "File System Root" - msgstr "檔ćˇçł»çµ±ć ą" - --#: ../gtk/gtkprintbackend.c:748 -+#: ../gtk/gtkprintbackend.c:750 - msgid "Authentication" - msgstr "é©—č‰" - -@@ -2117,29 +2117,29 @@ msgctxt "print operation status" - msgid "Finished with error" - msgstr "已完ć但發生錯誤" - --#: ../gtk/gtkprintoperation.c:2352 -+#: ../gtk/gtkprintoperation.c:2349 - #, c-format - msgid "Preparing %d" - msgstr "ćŁĺś¨ćş–ĺ‚™ %d" - --#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984 -+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983 - msgid "Preparing" - msgstr "ćŁĺś¨ćş–ĺ‚™" - --#: ../gtk/gtkprintoperation.c:2357 -+#: ../gtk/gtkprintoperation.c:2354 - #, c-format - msgid "Printing %d" - msgstr "ćŁĺś¨ĺ—印 %d" - --#: ../gtk/gtkprintoperation.c:3014 -+#: ../gtk/gtkprintoperation.c:3013 - msgid "Error creating print preview" - msgstr "建立ĺ—印é 覽時發生錯誤" - --#: ../gtk/gtkprintoperation.c:3017 -+#: ../gtk/gtkprintoperation.c:3016 - msgid "The most probable reason is that a temporary file could not be created." - msgstr "最可č˝çš„ĺŽźĺ› ćŻç„ˇćł•ĺ»şç«‹ćš«ĺ檔ćˇă€‚" - --#: ../gtk/gtkprintoperation-unix.c:302 -+#: ../gtk/gtkprintoperation-unix.c:307 - msgid "Error launching preview" - msgstr "執行é 覽時發生錯誤" - -@@ -3306,7 +3306,7 @@ msgstr "第 %2$d 行第 %3$d ĺ—有非é č¨çš„開始標č¨ă€Ś%1$s」" - msgid "Unexpected character data on line %d char %d" - msgstr "第 %d 行第 %d ĺ—有非é č¨çš„ĺ—ĺ…資料" - --#: ../gtk/gtkuimanager.c:2738 -+#: ../gtk/gtkuimanager.c:2694 - msgid "Empty" - msgstr "ç©şçš„" - -diff --git a/tests/testappchooser.c b/tests/testappchooser.c -index 76af238..80e8fb7 100644 ---- a/tests/testappchooser.c -+++ b/tests/testappchooser.c -@@ -16,6 +16,8 @@ - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.h" -+ - #include <stdlib.h> - #include <gtk/gtk.h> - -diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c -index 92fbb1a..1ab768c 100644 ---- a/tests/testappchooserbutton.c -+++ b/tests/testappchooserbutton.c -@@ -16,8 +16,9 @@ - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - */ - --#include <stdlib.h> -+#include "config.h" - -+#include <stdlib.h> - #include <gtk/gtk.h> - - #define CUSTOM_ITEM "custom-item" diff --git a/extra/gtk3/wacom.patch b/extra/gtk3/wacom.patch deleted file mode 100644 index 79ad84fc6..000000000 --- a/extra/gtk3/wacom.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c ---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 -+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 -@@ -331,6 +331,8 @@ - input_source = GDK_SOURCE_ERASER; - else if (strstr (tmp_name, "cursor")) - input_source = GDK_SOURCE_CURSOR; -+ else if (strstr (tmp_name, "finger")) -+ input_source = GDK_SOURCE_TOUCHSCREEN; - else if (strstr (tmp_name, "wacom") || - strstr (tmp_name, "pen")) - input_source = GDK_SOURCE_PEN; diff --git a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch deleted file mode 100644 index 06bce4a0f..000000000 --- a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001 -From: Sam Thursfield <sam.thursfield@codethink.co.uk> -Date: Thu, 03 May 2012 19:04:20 +0000 -Subject: Bug 672582 - Fix selection behavior inside <iframe> - -Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow -has had its own GdkWindow. This means we need to use the allocation -of the GtkScrolledWindow rather than its child GtkHTML widget when we -want to translate pointer coordinates relative to the iframe, because -a widget's GtkAllocation is relative to the parent GdkWindow. - -(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345) ---- -diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c -index 697b16e..6284855 100644 ---- a/gtkhtml/gtkhtml.c -+++ b/gtkhtml/gtkhtml.c -@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget, - gint *y) - { - while (GTK_HTML (widget)->iframe_parent) { -+ GtkWidget *scrolled_window; - GtkAllocation allocation; - -- gtk_widget_get_allocation (widget, &allocation); -+ scrolled_window = gtk_widget_get_parent (widget); -+ -+ g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget); -+ -+ gtk_widget_get_allocation (scrolled_window, &allocation); - - if (x) - *x += allocation.x - GTK_HTML (widget)->engine->x_offset; --- -cgit v0.9.0.2 diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD deleted file mode 100644 index ac67fdbd3..000000000 --- a/extra/gtkpod/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 175123 2013-01-14 08:37:19Z eric $ -# Contributor: Kevin Piche <kevin@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=gtkpod -pkgver=2.1.3 -pkgrel=1 -pkgdesc="A platform independent GUI for Apple's iPod using GTK3" -arch=('i686' 'x86_64' 'mips64el') -url="http://gtkpod.sourceforge.net" -license=('GPL') -depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3') -makedepends=('flex' 'intltool' 'libvorbis' 'faad2') -optdepends=('libmp4v2: MP4/h264 support' - 'vorbis-tools: OGG support' - 'libvorbis: OGG support' - 'id3v2: mp3 conversion support' - 'faad2: m4a conversion support') -install=gtkpod.install -options=('!libtool') -source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz" - gtkpod-2.1.3-gdl-3.6.patch) -md5sums=('57f04578de6e3262a436ec574422b144' - '8d725015081bd89bc8f9a4521d170aef') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch" - sed -i 's#python#python2#' scripts/sync-palm-jppy.py - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/gtkpod/gtkpod-2.1.2-anjuta.patch b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch deleted file mode 100644 index 08c64f71b..000000000 --- a/extra/gtkpod/gtkpod-2.1.2-anjuta.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/anjuta-app.c~ 2012-06-01 03:14:23.000000000 -0500 -+++ src/anjuta-app.c 2012-07-25 08:15:37.289630966 -0500 -@@ -501,7 +501,7 @@ - g_list_free(plugins_dirs); - - /* Preferences */ -- app->preferences = anjuta_preferences_new(app->plugin_manager); -+ app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA); - g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences); - - g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app); diff --git a/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch deleted file mode 100644 index b794fa11b..000000000 --- a/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c -=================================================================== ---- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c -+++ gtkpod-2.1.2/src/anjuta-action-callbacks.c -@@ -65,7 +65,7 @@ void - on_layout_lock_toggle (GtkAction *action, AnjutaApp *app) - { - if (app->layout_manager) -- g_object_set (app->layout_manager->master, "locked", -+ g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked", - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), - NULL); - } -Index: gtkpod-2.1.2/src/anjuta-app.c -=================================================================== ---- gtkpod-2.1.2.orig/src/anjuta-app.c -+++ gtkpod-2.1.2/src/anjuta-app.c -@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin - else if (g_strcmp0(pr_style, "Tabs") == 0) - style = GDL_SWITCHER_STYLE_TABS; - -- g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL); -+ g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL); - g_free(pr_style); - } - -@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj - gtk_widget_show(app->dock); - gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0); - -- dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock)); -+ dockbar = gdl_dock_bar_new(G_OBJECT(app->dock)); - gtk_widget_show(dockbar); - gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); - -- app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock)); -+ app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock)); - g_signal_connect (app->layout_manager, "notify::dirty", - G_CALLBACK (on_layout_dirty_notify), app); -- g_signal_connect (app->layout_manager->master, "notify::locked", -+ g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked", - G_CALLBACK (on_layout_locked_notify), app); - - /* UI engine */ diff --git a/extra/gtkpod/gtkpod.install b/extra/gtkpod/gtkpod.install deleted file mode 100644 index c5d357a38..000000000 --- a/extra/gtkpod/gtkpod.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/gutenprint/buildfix.patch b/extra/gutenprint/buildfix.patch deleted file mode 100644 index 6b17a4029..000000000 --- a/extra/gutenprint/buildfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up gutenprint-5.2.7/src/cups/commandtocanon.c.build gutenprint-5.2.7/src/cups/commandtocanon.c ---- gutenprint-5.2.7/src/cups/commandtocanon.c.build 2011-06-07 13:32:37.372042304 +0100 -+++ gutenprint-5.2.7/src/cups/commandtocanon.c 2011-06-07 13:32:41.270970750 +0100 -@@ -13,6 +13,7 @@ - - #include <cups/cups.h> - #include <ctype.h> -+#include <stdio.h> - #include <stdlib.h> - - -diff -up gutenprint-5.2.7/src/cups/commandtoepson.c.build gutenprint-5.2.7/src/cups/commandtoepson.c ---- gutenprint-5.2.7/src/cups/commandtoepson.c.build 2007-12-24 17:19:20.000000000 +0000 -+++ gutenprint-5.2.7/src/cups/commandtoepson.c 2011-06-07 13:32:35.656073794 +0100 -@@ -30,6 +30,7 @@ - - #include <cups/cups.h> - #include <ctype.h> -+#include <stdio.h> - #include <stdlib.h> - #include <string.h> - diff --git a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch b/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch deleted file mode 100644 index 9369c87bd..000000000 --- a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ca7743a63721c3dd1c166006539e356412466dcc Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Sun, 23 Sep 2012 18:51:32 +0000 -Subject: proxy: don't emit connected/added signals at object creation - -It's unnecessary to emit those signals when the object is created, and -it can cause weird side-effects if applications e.g. play a sound on -signal emission. - -https://bugzilla.gnome.org/show_bug.cgi?id=684677 ---- -diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c -index 1af6c34..37fc788 100644 ---- a/monitor/proxy/gproxyvolumemonitor.c -+++ b/monitor/proxy/gproxyvolumemonitor.c -@@ -955,6 +955,7 @@ g_proxy_volume_monitor_constructor (GType type, - GObjectClass *parent_class; - GError *error; - const char *dbus_name; -+ gchar *name_owner; - - G_LOCK (proxy_vm); - -@@ -1018,7 +1019,12 @@ g_proxy_volume_monitor_constructor (GType type, - /* listen to when the owner of the service appears/disappears */ - g_signal_connect (monitor->proxy, "notify::g-name-owner", G_CALLBACK (name_owner_changed), monitor); - /* initially seed drives/volumes/mounts if we have an owner */ -- name_owner_changed (G_OBJECT (monitor->proxy), NULL, monitor); -+ name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (monitor->proxy)); -+ if (name_owner != NULL) -+ { -+ seed_monitor (monitor); -+ g_free (name_owner); -+ } - - g_hash_table_insert (the_volume_monitors, (gpointer) type, object); - --- -cgit v0.9.0.2 diff --git a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch b/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch deleted file mode 100644 index 2d3bcb6c4..000000000 --- a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4a0915c25815647c165e7ca6047f3da84ece04ea Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Mon, 22 Oct 2012 13:07:04 +0000 -Subject: gdaemonmount: Check for a NULL GMountOperation when unmounting - -https://bugzilla.gnome.org/show_bug.cgi?id=686637 ---- -diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c -index 53f22b5..ca77648 100644 ---- a/client/gdaemonmount.c -+++ b/client/gdaemonmount.c -@@ -330,8 +330,9 @@ g_daemon_mount_unmount_with_operation (GMount *mount, - data = g_new0 (AsyncProxyCreate, 1); - data->mount = g_object_ref (mount); - data->mount_info = daemon_mount->mount_info; -- data->mount_operation = g_object_ref (mount_operation); - data->flags = flags; -+ if (mount_operation) -+ data->mount_operation = g_object_ref (mount_operation); - if (cancellable) - data->cancellable = g_object_ref (cancellable); - --- -cgit v0.9.0.2 diff --git a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch deleted file mode 100644 index e56a46ac6..000000000 --- a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5265dff7b56d892917640367414cf5d3f5e7ddb7 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek <tbzatek@redhat.com> -Date: Thu, 01 Nov 2012 13:37:37 +0000 -Subject: proxy volume monitor: Don't disable exit_on_close on session bus - -We're on shared session bus, let's exit when connection closes -(usually tied to running desktop session). - -https://bugzilla.gnome.org/show_bug.cgi?id=687074 -(cherry picked from commit f70800d655ca6b222625cd72af820f17404bdb4d) ---- -diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c -index 1af6c34..e0d17b7 100644 ---- a/monitor/proxy/gproxyvolumemonitor.c -+++ b/monitor/proxy/gproxyvolumemonitor.c -@@ -1418,7 +1418,6 @@ g_proxy_volume_monitor_setup_session_bus_connection (void) - g_error_free (error); - goto out; - } -- g_dbus_connection_set_exit_on_close (the_session_bus, FALSE); - - the_volume_monitors = g_hash_table_new (g_direct_hash, g_direct_equal); - --- -cgit v0.9.0.2 diff --git a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch deleted file mode 100644 index 1a09ef7e6..000000000 --- a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5dfdaf9a18971bf5504a0d3fe00f747a853ee800 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek <tbzatek@redhat.com> -Date: Thu, 01 Nov 2012 13:46:10 +0000 -Subject: proxy volume monitor: Don't force-close the session bus - -Simple fix to prevent bus closing on GIO module unload. - -https://bugzilla.gnome.org/show_bug.cgi?id=687074 ---- -diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c -index e0d17b7..df99935 100644 ---- a/monitor/proxy/gproxyvolumemonitor.c -+++ b/monitor/proxy/gproxyvolumemonitor.c -@@ -1435,7 +1435,6 @@ g_proxy_volume_monitor_teardown_session_bus_connection (void) - G_LOCK (proxy_vm); - if (the_session_bus != NULL) - { -- g_dbus_connection_close_sync (the_session_bus, NULL, NULL); - g_object_unref (the_session_bus); - the_session_bus = NULL; - --- -cgit v0.9.0.2 diff --git a/extra/hddtemp/hddtemp b/extra/hddtemp/hddtemp deleted file mode 100644 index 62f090808..000000000 --- a/extra/hddtemp/hddtemp +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PARAMS= -DRIVES= -[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp -PID=$(pidof -o %PPID /usr/sbin/hddtemp) -case "$1" in - start) - stat_busy "Starting HDDTemp" - [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon hddtemp - stat_done - fi - ;; - stop) - stat_busy "Stopping HDDTemp" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon hddtemp - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/hddtemp/hddtemp-0.3-beta15-reg-eip.patch b/extra/hddtemp/hddtemp-0.3-beta15-reg-eip.patch deleted file mode 100644 index 504a0366e..000000000 --- a/extra/hddtemp/hddtemp-0.3-beta15-reg-eip.patch +++ /dev/null @@ -1,22 +0,0 @@ -__USE_GNU needs to be in effect when including sys/ucontext.h, -and signal.h pulls it in in some setups. - -diff -up hddtemp-0.3-beta15/src/backtrace.c~ hddtemp-0.3-beta15/src/backtrace.c ---- hddtemp-0.3-beta15/src/backtrace.c~ 2006-04-19 05:38:14.000000000 +0300 -+++ hddtemp-0.3-beta15/src/backtrace.c 2010-02-14 21:59:47.000000000 +0200 -@@ -27,13 +27,12 @@ - #include <stdlib.h> - #include <unistd.h> - #include <linux/ptrace.h> -+#define __USE_GNU -+#include <ucontext.h> - #include <signal.h> - #include <bits/sigcontext.h> - #include <sys/param.h> - --#define __USE_GNU --#include <ucontext.h> -- - #define MAX_BTSIZE 64 - - void backtrace_handler(int n, siginfo_t *ist, void *extra) { diff --git a/extra/hddtemp/hddtemp.confd b/extra/hddtemp/hddtemp.confd deleted file mode 100644 index 6a1e18e0b..000000000 --- a/extra/hddtemp/hddtemp.confd +++ /dev/null @@ -1,2 +0,0 @@ -PARAMS="-q -l 127.0.0.1" -DRIVES="/dev/sda" diff --git a/extra/hddtemp/hddtemp.service b/extra/hddtemp/hddtemp.service deleted file mode 100644 index bc56d16b0..000000000 --- a/extra/hddtemp/hddtemp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Hard drive temperature monitor daemon - -[Service] -EnvironmentFile=/etc/conf.d/hddtemp -ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES - -[Install] -WantedBy=multi-user.target diff --git a/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch b/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch deleted file mode 100644 index 8ad67ee74..000000000 --- a/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch +++ /dev/null @@ -1,93 +0,0 @@ -From dbd00cfc3805b6f1ff794f7de0b52b1a7893401f Mon Sep 17 00:00:00 2001 -From: Alexandre Bique <bique.alexandre@gmail.com> -Date: Thu, 15 Nov 2012 20:43:41 +0100 -Subject: [PATCH 07/12] Check that added torrents from the disk are still on - the disk. -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - hefur/fs-tree-white-list.cc | 20 ++++++++++++++++++++ - hefur/fs-tree-white-list.hh | 1 + - hefur/torrent-db.hh | 4 +++- - 3 files changed, 24 insertions(+), 1 deletion(-) - -diff --git a/hefur/fs-tree-white-list.cc b/hefur/fs-tree-white-list.cc -index f493e95..61714d0 100644 ---- a/hefur/fs-tree-white-list.cc -+++ b/hefur/fs-tree-white-list.cc -@@ -54,10 +54,30 @@ namespace hefur - } - - void -+ FsTreeWhiteList::check() -+ { -+ std::vector<m::StringRef> keys; -+ auto db = Hefur::instance().torrentDb(); -+ m::SharedMutex::Locker locker(db->torrents_lock_); -+ db->torrents_.foreach([this, &keys] (Torrent::Ptr torrent) { -+ if (::strncmp(torrent->path().c_str(), root_.c_str(), root_.size())) -+ return; -+ -+ struct ::stat st; -+ if (::stat(torrent->path().c_str(), &st) && errno == ENOENT) -+ keys.push_back(torrent->key()); -+ }); -+ -+ for (auto it = keys.begin(); it != keys.end(); ++it) -+ db->torrents_.erase(*it); -+ } -+ -+ void - FsTreeWhiteList::loopScan() - { - do { - scan(); -+ check(); - } while (!stop_.timedWait(m::time() + rescan_interval_)); - } - } -diff --git a/hefur/fs-tree-white-list.hh b/hefur/fs-tree-white-list.hh -index c32bcd4..643fb78 100644 ---- a/hefur/fs-tree-white-list.hh -+++ b/hefur/fs-tree-white-list.hh -@@ -30,6 +30,7 @@ namespace hefur - * When a .torrent is found, call TorrentDb::addTorrent(). - */ - void scan(); -+ void check(); - - private: - /** -diff --git a/hefur/torrent-db.hh b/hefur/torrent-db.hh -index a1e5d38..e25ed33 100644 ---- a/hefur/torrent-db.hh -+++ b/hefur/torrent-db.hh -@@ -17,6 +17,7 @@ namespace hefur - { - class StatHandler; - class PeersHandler; -+ class FsTreeWhiteList; - - /** - * This is the "in memory" torrent database. -@@ -63,6 +64,7 @@ namespace hefur - friend class StatHandler; - friend class PeersHandler; - friend class FileHandler; -+ friend class FsTreeWhiteList; - - /** helper to use torrent->key() as a key for the trie */ - static inline m::StringRef torrentKey(Torrent::Ptr torrent) { -@@ -77,7 +79,7 @@ namespace hefur - m::Future<bool> cleanup_stop_; - m::Thread cleanup_thread_; - m::SharedMutex torrents_lock_; -- torrents_type torrents_; -+ torrents_type torrents_; - }; - } - --- -1.8.0.1 - diff --git a/extra/hefur/Replace-by-amp-in-stat.html.patch b/extra/hefur/Replace-by-amp-in-stat.html.patch deleted file mode 100644 index a11406a2f..000000000 --- a/extra/hefur/Replace-by-amp-in-stat.html.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6986df22d293b7a149f51d4d8ba4a995645a4560 Mon Sep 17 00:00:00 2001 -From: Alexandre Bique <bique.alexandre@gmail.com> -Date: Sun, 4 Nov 2012 14:08:47 +0100 -Subject: [PATCH 03/12] Replace & by & in stat.html. -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - www/tpl/stat.html | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/www/tpl/stat.html b/www/tpl/stat.html -index 3234679..1e3b148 100644 ---- a/www/tpl/stat.html -+++ b/www/tpl/stat.html -@@ -21,7 +21,7 @@ - {{*torrents}} - <tr> - <td> -- <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&dn={{name|u}}&tr={{tracker_udp|u}}&tr={{tracker_http|u}}" -+ <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&dn={{name|u}}&tr={{tracker_udp|u}}&tr={{tracker_http|u}}" - title="Magnet link"> - <img src="/img/magnet-icon.gif"/> - </a> --- -1.8.0.1 - diff --git a/extra/hercules/PKGBUILD b/extra/hercules/PKGBUILD deleted file mode 100644 index 752eea7e7..000000000 --- a/extra/hercules/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 151558 2012-02-27 17:50:18Z pierre $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Kevin Piche <kevin@archlinux.org> - -pkgname=hercules -pkgver=3.07 -pkgrel=2.1 -pkgdesc="A software implementation of the mainframe System/370 and ESA/390 architectures" -url="http://www.hercules-390.org/" -source=("http://www.hercules-390.org/$pkgname-$pkgver.tar.gz") -arch=('i686' 'x86_64' 'mips64el') -license=('custom') -options=('!libtool') -depends=('bzip2' 'libgcrypt' 'zlib') -md5sums=('a12aa1645b0695b25b7fc0c9a3ccab3a') - -build() { - cd $srcdir/$pkgname-$pkgver - # Change module extension from .la to .so. - sed '/HDL_MODULE_SUFFIX/ s/\.la/.so/' -i hdl.h - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - install -D -m644 COPYRIGHT \ - $pkgdir/usr/share/licenses/hercules/qpl1 -} diff --git a/extra/herqq/PKGBUILD b/extra/herqq/PKGBUILD deleted file mode 100644 index ccb97cb0e..000000000 --- a/extra/herqq/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=herqq -pkgver=1.0.0 -pkgrel=1 -pkgdesc="A software library for building UPnP devices (HUPnP)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.herqq.org/" -license=('GPL') -depends=('qt') -source=("http://downloads.sourceforge.net/hupnp/${pkgname}-${pkgver}.zip") -md5sums=('45a0632f7c7b64bc0fdab852d36c1e61') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - qmake PREFIX=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD deleted file mode 100644 index d003d86ff..000000000 --- a/extra/hplip/PKGBUILD +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 172170 2012-11-30 15:22:14Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor : RĂ©my Oudompheng <remy@archlinux.org> -# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> - -pkgname=hplip -pkgver=3.12.11 -pkgrel=2 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" -arch=('i686' 'x86_64') -url="http://hplipopensource.com" -license=('GPL') -depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'net-snmp>=5.7.1' 'wget') -makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') -optdepends=('cups: for printing support' - 'python2-dbus: for dbus support' - 'sane: for scanner support' - 'python2-imaging: for commandline scanning support' - 'python2-notify: for Desktop notification support' - 'rpcbind: for network support' - 'python2-pyqt: for running hp-toolbox' - 'python2-gobject2: for running hp-toolbox' - 'hplip-plugin: binary blobs for specific devices' - 'libusbx: for advanced usb support') -options=('!libtool') -install=hplip.install -source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} - cups-1.6-buildfix.diff) - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix build with cups 1.6 - FC hplip-ipp-accessors.patch - patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff" - - export PYTHON=python2 - - find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py - sed -i 's|python ./print.py|python2 ./print.py|' scan.py - sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py - sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py - sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - - # fix rc script path - FS#31921 - sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py - - # https://bugs.archlinux.org/task/30085 - hack found in Gentoo - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip - # The hpcups driver does not use foomatic-rip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || return 1 - mv ${i}.temp ${i} - done - - export AUTOMAKE='automake --foreign' - autoreconf --force --install - - ./configure --prefix=/usr \ - --enable-qt4 \ - --disable-foomatic-rip-hplip-install \ - --enable-foomatic-ppd-install \ - --enable-hpcups-install \ - --enable-new-hpcups \ - --enable-cups-ppd-install \ - --enable-cups-drv-install \ - --enable-hpijs-install \ - --enable-foomatic-drv-install \ - --enable-pp-build \ - --enable-udev-acl-rules #--help - - make -} - -package() { - #cd "$srcdir/$pkgname-$pkgver" - cd "$srcdir/$pkgname-${pkgver/.a/a}" - make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install - # remove config provided by sane and autostart of hp-daemon - rm -rf "$pkgdir"/etc/{sane.d,xdg} - # remove HAL .fdi file because HAL is no longer used - rm -rf "$pkgdir"/usr/share/hal - # log dir should not be world writeable - chmod 775 "$pkgdir"/var/log/hp{,/tmp} -} -md5sums=('6caadc4a9e49076c284b146e2dce2937' - '835d3b854d097f229a32291338fa2320' - 'ef64578c6cb3ce252dbdcb0f1c2f4a47') diff --git a/extra/hplip/cups-1.6-buildfix.diff b/extra/hplip/cups-1.6-buildfix.diff deleted file mode 100644 index 8341a1610..000000000 --- a/extra/hplip/cups-1.6-buildfix.diff +++ /dev/null @@ -1,392 +0,0 @@ -diff -up hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors hplip-3.12.6/prnt/cupsext/cupsext.c ---- hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors 2012-06-18 12:41:19.000000000 +0200 -+++ hplip-3.12.6/prnt/cupsext/cupsext.c 2012-07-19 17:11:47.606524137 +0200 -@@ -87,6 +87,46 @@ typedef int Py_ssize_t; - #define PY_SSIZE_T_MIN INT_MIN - #endif - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetCount(attr) attr->num_values -+#define ippGetGroupTag(attr) attr->group_tag -+#define ippGetValueTag(attr) attr->value_tag -+#define ippGetName(attr) attr->name -+#define ippGetBoolean(attr, element) attr->values[element].boolean -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetStatusCode(ipp) ipp->request.status.status_code -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+ -+static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) -+{ -+ ipp->request.op.operation_id = op; -+ return (1); -+} -+ -+static int ippSetRequestId( ipp_t *ipp, int request_id ) -+{ -+ ipp->request.any.request_id = request_id; -+ return (1); -+} -+#endif - - int g_num_options = 0; - cups_option_t * g_options; -@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self, - request = ippNew(); - language = cupsLangDefault(); - -- request->request.op.operation_id = CUPS_GET_PRINTERS; -- request->request.any.request_id = 1; -+ ippSetOperation( request, CUPS_GET_PRINTERS ); -+ ippSetRequestId ( request, 1); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, - "attributes-charset", NULL, cupsLangEncoding( language ) ); -@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self, - ipp_pstate_t state; - int i = 0; - -- for ( attr = response->attrs; attr != NULL; attr = attr->next ) -+ for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) ) - { -- while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER ) -- attr = attr->next; -+ while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER ) -+ attr = ippNextAttribute( response ); - - if ( attr == NULL ) - break; -@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self, - state = IPP_PRINTER_IDLE; - accepting = 0; - -- while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER ) -+ while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER ) - { -- if ( strcmp( attr->name, "printer-name" ) == 0 && -- attr->value_tag == IPP_TAG_NAME ) -- name = attr->values[ 0 ].string.text; -- -- else if ( strcmp( attr->name, "device-uri" ) == 0 && -- attr->value_tag == IPP_TAG_URI ) -- device_uri = attr->values[ 0 ].string.text; -- -- else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 && -- attr->value_tag == IPP_TAG_URI ) -- printer_uri = attr->values[ 0 ].string.text; -- -- else if ( strcmp( attr->name, "printer-info" ) == 0 && -- attr->value_tag == IPP_TAG_TEXT ) -- info = attr->values[ 0 ].string.text; -- -- else if ( strcmp( attr->name, "printer-location" ) == 0 && -- attr->value_tag == IPP_TAG_TEXT ) -- location = attr->values[ 0 ].string.text; -- -- else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 && -- attr->value_tag == IPP_TAG_TEXT ) -- make_model = attr->values[ 0 ].string.text; -- -- else if ( strcmp( attr->name, "printer-state" ) == 0 && -- attr->value_tag == IPP_TAG_ENUM ) -- state = ( ipp_pstate_t ) attr->values[ 0 ].integer; -- -- else if (!strcmp(attr->name, "printer-is-accepting-jobs") && -- attr->value_tag == IPP_TAG_BOOLEAN) -- accepting = attr->values[ 0 ].boolean; -+ if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 && -+ ippGetValueTag( attr ) == IPP_TAG_NAME ) -+ name = ippGetString( attr, 0, NULL ); -+ -+ else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 && -+ ippGetValueTag( attr ) == IPP_TAG_URI ) -+ device_uri = ippGetString( attr, 0, NULL ); -+ -+ else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 && -+ ippGetValueTag( attr ) == IPP_TAG_URI ) -+ printer_uri = ippGetString( attr, 0, NULL ); -+ -+ else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 && -+ ippGetValueTag( attr ) == IPP_TAG_TEXT ) -+ info = ippGetString( attr, 0, NULL ); -+ -+ else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 && -+ ippGetValueTag( attr ) == IPP_TAG_TEXT ) -+ location = ippGetString( attr, 0, NULL ); -+ -+ else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 && -+ ippGetValueTag( attr ) == IPP_TAG_TEXT ) -+ make_model = ippGetString( attr, 0, NULL ); -+ -+ else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 && -+ ippGetValueTag( attr ) == IPP_TAG_ENUM ) -+ state = ( ipp_pstate_t ) ippGetInteger( attr, 0 ); -+ -+ else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") && -+ ippGetValueTag( attr ) == IPP_TAG_BOOLEAN) -+ accepting = ippGetBoolean( attr, 0 ); - -- attr = attr->next; -+ attr = ippNextAttribute( response ); - } - - if ( device_uri == NULL ) -@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self, - request = ippNew(); - language = cupsLangDefault(); - -- request->request.op.operation_id = CUPS_ADD_PRINTER; -- request->request.any.request_id = 1; -+ ippSetOperation( request, CUPS_ADD_PRINTER ); -+ ippSetRequestId ( request, 1 ); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, - "attributes-charset", NULL, cupsLangEncoding( language ) ); -@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self, - } - else - { -- status = response->request.status.status_code; -+ status = ippGetStatusCode( response ); - //ippDelete( response ); - r = 1; - } -@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self, - */ - request = ippNew(); - -- request->request.op.operation_id = CUPS_DELETE_PRINTER; -- request->request.op.request_id = 1; -+ ippSetOperation( request, CUPS_DELETE_PRINTER ); -+ ippSetRequestId ( request, 1 ); - - language = cupsLangDefault(); - -@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self, - */ - response = cupsDoRequest( http, request, "/admin/" ); - -- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) -+ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) - { - r = 1; - } -@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject * - - request = ippNew(); - -- request->request.op.operation_id = CUPS_SET_DEFAULT; -- request->request.op.request_id = 1; -+ ippSetOperation( request, CUPS_SET_DEFAULT ); -+ ippSetRequestId ( request, 1 ); - - language = cupsLangDefault(); - -@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject * - - response = cupsDoRequest( http, request, "/admin/" ); - -- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) -+ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) - { - r = 1; - } -@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * se - - request = ippNew(); - -- request->request.op.operation_id = op; -- request->request.op.request_id = 1; -+ ippSetOperation( request, op ); -+ ippSetRequestId ( request, 1 ); - - language = cupsLangDefault(); - -@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * se - - response = cupsDoRequest(http, request, "/admin/"); - -- if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT)) -+ if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT)) - { - r = 1; - } -@@ -837,7 +877,7 @@ abort: - if ( response != NULL ) - ippDelete( response ); - -- return Py_BuildValue( "i", r );; -+ return Py_BuildValue( "i", r ); - } - - -@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self, - - request = ippNew(); - -- request->request.op.operation_id = CUPS_GET_PPDS; -- request->request.op.request_id = 1; -+ ippSetOperation( request, CUPS_GET_PPDS ); -+ ippSetRequestId ( request, 1 ); - - language = cupsLangDefault(); - -@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self, - if ((response = cupsDoRequest(http, request, "/")) != NULL) - { - -- for (attr = response->attrs; attr; attr = attr->next) -+ for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response )) - { - PyObject *dict; - char *ppdname = NULL; - -- while (attr && attr->group_tag != IPP_TAG_PRINTER) -- attr = attr->next; -+ while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER) -+ attr = ippNextAttribute( response ); - - if (!attr) - break; - - dict = PyDict_New (); - -- for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next) -+ for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response )) - { - PyObject *val = NULL; - -- if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME) -+ if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME) - { -- ppdname = attr->values[0].string.text; -+ ppdname = ippGetString( attr, 0, NULL ); - - //sprintf( buf, "print '%s'", ppdname); - //PyRun_SimpleString( buf ); - } - -- else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD) -- //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) || -- // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) || -- // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) || -- // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT)) -+ else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD) -+ //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) || -+ // (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) || -+ // (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) || -+ // (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT)) - { -- val = PyObj_from_UTF8(attr->values[0].string.text); -+ val = PyObj_from_UTF8(ippGetString( attr, 0, NULL )); - } - - if (val) - { -- PyDict_SetItemString (dict, attr->name, val); -+ PyDict_SetItemString (dict, ippGetName( attr ), val); - Py_DECREF (val); - } - } -diff -up hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors hplip-3.12.6/scan/sane/hpaio.c ---- hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors 2012-06-18 12:42:51.000000000 +0200 -+++ hplip-3.12.6/scan/sane/hpaio.c 2012-07-19 17:12:34.557848760 +0200 -@@ -47,6 +47,43 @@ - #define DEBUG_DECLARE_ONLY - #include "sanei_debug.h" - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetGroupTag(attr) attr->group_tag -+#define ippGetValueTag(attr) attr->value_tag -+#define ippGetName(attr) attr->name -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+ -+static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) -+{ -+ ipp->request.op.operation_id = op; -+ return (1); -+} -+ -+static int ippSetRequestId( ipp_t *ipp, int request_id ) -+{ -+ ipp->request.any.request_id = request_id; -+ return (1); -+} -+#endif -+ - static SANE_Device **DeviceList = NULL; - - static int AddDeviceList(char *uri, char *model, SANE_Device ***pd) -@@ -186,8 +223,8 @@ static int GetCupsPrinters(char ***print - /* Assemble the IPP request */ - request = ippNew(); - -- request->request.op.operation_id = CUPS_GET_PRINTERS; -- request->request.any.request_id = 1; -+ ippSetOperation( request, CUPS_GET_PRINTERS ); -+ ippSetRequestId( request, 1 ); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8"); - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en"); -@@ -197,20 +234,20 @@ static int GetCupsPrinters(char ***print - if ((response = cupsDoRequest(http, request, "/")) == NULL) - goto bugout; - -- for (attr = response->attrs; attr != NULL; attr = attr->next) -+ for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response )) - { - /* Skip leading attributes until we hit a printer. */ -- while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER) -- attr = attr->next; -+ while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER) -+ attr = ippNextAttribute( response ); - - if (attr == NULL) - break; - -- while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) -+ while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER) - { -- if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0) -+ if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0) - cnt++; -- attr = attr->next; -+ attr = ippNextAttribute( response ); - } - - if (attr == NULL) diff --git a/extra/hplip/hplip.install b/extra/hplip/hplip.install deleted file mode 100644 index 74532cde3..000000000 --- a/extra/hplip/hplip.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - cat << EOF - -NOTE ----- -# If you want to use this driver with sane: -# echo "hpaio" >> /etc/sane.d/dll.conf - -EOF -} - -post_upgrade() { - if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then - # important upgrade notice - echo "> Please remove your printer in cups, then add it" - echo "> back and reconfigure it to make it work again!" - fi -} diff --git a/extra/hspell/hspell-1.0.sharedlib.patch b/extra/hspell/hspell-1.0.sharedlib.patch deleted file mode 100644 index 81467c3e9..000000000 --- a/extra/hspell/hspell-1.0.sharedlib.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: hspell-1.0/Makefile.in -=================================================================== ---- hspell-1.0.orig/Makefile.in -+++ hspell-1.0/Makefile.in -@@ -51,7 +51,7 @@ LDFLAGS=@LDFLAGS@ - - # Our TARGETS variable chooses what to compile. Some things are - # optionally compiled depending on --enable-* paramters to configure. --TARGETS = @TARGETS@ -+TARGETS = @TARGETS@ libhspell.a - all: $(TARGETS) - - # SEDCMD controls on whether objective-kinuyim - about 130,000 rare verb -@@ -76,7 +76,8 @@ clean: - hebrew.wgz.lingsizes.tmp dmask.c install.js \ - spell-he.xpi he.dic he.aff README-he.txt \ - README_he_IL.txt he_IL.dic he_IL.aff he_IL.zip \ -- specfilter.o specfilter -+ specfilter.o specfilter \ -+ libhspell.so.0 libhspell.so *.lo - rm -f hebeng/install.js hebeng/heb-eng.aff hebeng/heb-eng.dic \ - hebeng/README-he.txt hebeng/README-en-US.txt \ - hebeng/spell-heb-eng.xpi -@@ -113,6 +114,9 @@ install: all - test -d $(DESTDIR)$(LIBDIR) || mkdir -m 755 -p $(DESTDIR)$(LIBDIR) - cp libhspell.a $(DESTDIR)$(LIBDIR)/ - chmod 644 $(DESTDIR)$(LIBDIR)/libhspell.a -+ cp libhspell.so.0 $(DESTDIR)$(LIBDIR)/ -+ chmod 755 $(DESTDIR)$(LIBDIR)/libhspell.so.0 -+ ln -sf libhspell.so.0 $(DESTDIR)$(LIBDIR)/libhspell.so - test -d $(DESTDIR)$(INCLUDEDIR) || mkdir -m 755 -p $(DESTDIR)$(INCLUDEDIR) - cp hspell.h linginfo.h $(DESTDIR)$(INCLUDEDIR)/ - chmod 644 $(DESTDIR)$(INCLUDEDIR)/hspell.h $(DESTDIR)$(INCLUDEDIR)/linginfo.h -@@ -166,19 +170,30 @@ libhspell.a: dict_radix.o gimatria.o cor - ar cr $@ $^ - -ranlib $@ - --$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.a -- $(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.a $(LIBS) -+EXTRAOBJECTSPIC=$(EXTRAOBJECTS:.o=.lo) -+ -+%.lo: %.c -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -o $@ $< -+ -+libhspell.so.0: dict_radix.lo gimatria.lo corlist.lo libhspell.lo $(EXTRAOBJECTSPIC) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,libhspell.so.0 $^ -lz -+ ln -sf libhspell.so.0 libhspell.so -+ -+$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.so.0 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.so.0 $(LIBS) - - # remember to update this dependency list once in a while... - libhspell.o dict_radix.o find_sizes.o: dict_radix.h - dict_radix.o linginfo.o: gzbuffered.h - libhspell.o mk_he_affix.o: prefixes.c -+libhspell.lo mk_he_affix.lo: prefixes.c - hspell.o: hash.h tclHash.h - tclHash.o: tclHash.h - corlist.o gimatria.o hspell.o libhspell.o: hspell.h - hspell.o libhspell.o linginfo.o: linginfo.h hspell.h - linginfo.o: dmask.c - specfilter.o: prefixes.c -+specfilter.lo: prefixes.c - - prefixes.c: genprefixes.pl PrefixBits.pl - $(PERL) -w ./genprefixes.pl >prefixes.c diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog deleted file mode 100644 index 94fd62244..000000000 --- a/extra/htop/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -2012-02-19 Angel Velasquez <angvp@archlinux.org> - * Version bump to 1.0.1 - -2011-10-19 Andrea Scarpino <andrea@archlinux.org> - * Enable cgroup support (FS#26155) - * Add lsof and strace optional depends (FS#25778) - * Fix crash when column is less than 40 (closes FS#25823) - -2011-05-17 Angel Velasquez <angvp@archlinux.org> - * Added patch to fix --sort-key (closes FS#23224) - -2009-09-21 Eric Belanger <eric@archlinux.org> - - * htop 0.8.3-1 - * Upstream update - * Built with vserver and openvz support (close FS#12755) - -2008-12-09 Alexander Fehr <pizzapunk gmail com> - - * htop-0.8.1-1: - * New upstream release - * New maintainer - * Added patch to fix FS#12235 - * Enabled Unicode support - * Added ChangeLog diff --git a/extra/hugin/gcc47.patch b/extra/hugin/gcc47.patch deleted file mode 100644 index 3814b871c..000000000 --- a/extra/hugin/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp ---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000 -+++ hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000 -@@ -27,6 +27,7 @@ - - #include <math.h> - #include <stdlib.h> -+#include <unistd.h> - #include "Utilities.h" - - using namespace std; diff --git a/extra/hugin/hugin.install b/extra/hugin/hugin.install deleted file mode 100644 index 362749233..000000000 --- a/extra/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/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD deleted file mode 100644 index bce36b141..000000000 --- a/extra/hydrogen/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 175681 2013-01-19 13:13:55Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: K. Piche <kpiche@rogers.com> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=hydrogen -pkgver=0.9.5.1 -pkgrel=1 -pkgdesc="Advanced Drum Machine" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.hydrogen-music.org/" -depends=('libarchive' 'liblrdf' 'qt' 'jack') -makedepends=('scons') -#options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - lrdf_raptor2.patch - install.patch) -md5sums=('52f3a528705818c65acf546a3be4c6fb' - '2124851e890f46158189b5fa90006d40' - 'ce3a83a069b55e46aa532b55e803c9a5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export QTDIR=/usr - patch -Np1 -i "${srcdir}/lrdf_raptor2.patch" - # http://www.assembla.com/spaces/hydrogen/tickets/204 - patch -Np0 -i "${srcdir}/install.patch" - scons prefix=/usr libarchive=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - scons DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/hydrogen/install.patch b/extra/hydrogen/install.patch deleted file mode 100644 index 2e6e707a1..000000000 --- a/extra/hydrogen/install.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** Sconstruct.org 2011-11-06 12:15:40.018119106 +0100 ---- Sconstruct 2011-11-06 12:16:21.124122432 +0100 -*************** -*** 298,304 **** - - for N in glob.glob('./data/i18n/hydrogen.*'): - env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N)) -- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img")) - - #add every img in ./data/img to the install list. - os.path.walk("./data/img/",install_images,env) ---- 298,303 ---- diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch deleted file mode 100644 index ec176b716..000000000 --- a/extra/hydrogen/lrdf_raptor2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct ---- hydrogen-0.9.5.old/Sconstruct 2011-08-11 18:00:07.889112348 +0800 -+++ hydrogen-0.9.5/Sconstruct 2011-08-11 18:00:34.945632437 +0800 -@@ -83,6 +83,7 @@ - includes.append( './' ) - includes.append( 'gui/src/' ) - includes.append( '3rdparty/install/include' ) -+ includes.append( '/usr/include/raptor2' ) - - if sys.platform == "darwin": - ldflags.append( '-L/opt/local/lib' ) diff --git a/extra/hylafax/configure-6.0.5.patch b/extra/hylafax/configure-6.0.5.patch deleted file mode 100644 index e1f1126a5..000000000 --- a/extra/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/extra/hylafax/hylafax-libtiff4.patch b/extra/hylafax/hylafax-libtiff4.patch deleted file mode 100644 index 4a49511f8..000000000 --- a/extra/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/extra/icedtea-web-java7/fix_firefox_crash.diff b/extra/icedtea-web-java7/fix_firefox_crash.diff deleted file mode 100644 index cd02aba0a..000000000 --- a/extra/icedtea-web-java7/fix_firefox_crash.diff +++ /dev/null @@ -1,228 +0,0 @@ - -# HG changeset patch -# User Adam Domurad <adomurad@redhat.com> -# Date 1340899207 14400 -# Node ID a49edd57b1b332b431222b1c225189fe51676193 -# Parent d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4 -Fixes invalid plugin table error that sometimes occurs. -The invalid plugin table error was happening when the API that was -being compiled with had a larger size than that of the browser. -The plugin now only checks if the minimal subset it uses exists. - -diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc ---- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 08 13:44:25 2012 -0400 -+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 28 12:00:07 2012 -0400 -@@ -2022,105 +2022,48 @@ - PLUGIN_DEBUG ("plugin_data_destroy return\n"); - } - --// FACTORY FUNCTIONS -- --// Provides the browser with pointers to the plugin functions that we --// implement and initializes a local table with browser functions that --// we may wish to call. Called once, after browser startup and before --// the first plugin instance is created. --// The field 'initialized' is set to true once this function has --// finished. If 'initialized' is already true at the beginning of --// this function, then it is evident that NP_Initialize has already --// been called. There is no need to call this function more than once and --// this workaround avoids any duplicate calls. --NPError --NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) -+static bool -+initialize_browser_functions(const NPNetscapeFuncs* browserTable) - { -- PLUGIN_DEBUG ("NP_Initialize\n"); -- -- if ((browserTable == NULL) || (pluginTable == NULL)) -+#if MOZILLA_VERSION_COLLAPSED < 1090100 -+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall) -+#else -+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl) -+#endif -+ -+ //Determine the size in bytes, as a difference of the address past the last used field -+ //And the browser table address -+ size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable; -+ -+ // compare the reported size versus the size we required -+ if (browserTable->size < usedSize) - { -- PLUGIN_ERROR ("Browser or plugin function table is NULL."); -- -- return NPERR_INVALID_FUNCTABLE_ERROR; -+ return false; - } - -- // Ensure that the major version of the plugin API that the browser -- // expects is not more recent than the major version of the API that -- // we've implemented. -- if ((browserTable->version >> 8) > NP_VERSION_MAJOR) -- { -- PLUGIN_ERROR ("Incompatible version."); -- -- return NPERR_INCOMPATIBLE_VERSION_ERROR; -- } -- -- // Ensure that the plugin function table we've received is large -- // enough to store the number of functions that we may provide. -- if (pluginTable->size < sizeof (NPPluginFuncs)) -- { -- PLUGIN_ERROR ("Invalid plugin function table."); -- -- return NPERR_INVALID_FUNCTABLE_ERROR; -- } -- -- // Ensure that the browser function table is large enough to store -- // the number of browser functions that we may use. -- if (browserTable->size < sizeof (NPNetscapeFuncs)) -- { -- fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n"); -- } -- -- // Store in a local table the browser functions that we may use. -- browser_functions.size = browserTable->size; -- browser_functions.version = browserTable->version; -- browser_functions.geturlnotify = browserTable->geturlnotify; -- browser_functions.geturl = browserTable->geturl; -- browser_functions.posturlnotify = browserTable->posturlnotify; -- browser_functions.posturl = browserTable->posturl; -- browser_functions.requestread = browserTable->requestread; -- browser_functions.newstream = browserTable->newstream; -- browser_functions.write = browserTable->write; -- browser_functions.destroystream = browserTable->destroystream; -- browser_functions.status = browserTable->status; -- browser_functions.uagent = browserTable->uagent; -- browser_functions.memalloc = browserTable->memalloc; -- browser_functions.memfree = browserTable->memfree; -- browser_functions.memflush = browserTable->memflush; -- browser_functions.reloadplugins = browserTable->reloadplugins; -- browser_functions.getJavaEnv = browserTable->getJavaEnv; -- browser_functions.getJavaPeer = browserTable->getJavaPeer; -- browser_functions.getvalue = browserTable->getvalue; -- browser_functions.setvalue = browserTable->setvalue; -- browser_functions.invalidaterect = browserTable->invalidaterect; -- browser_functions.invalidateregion = browserTable->invalidateregion; -- browser_functions.forceredraw = browserTable->forceredraw; -- browser_functions.getstringidentifier = browserTable->getstringidentifier; -- browser_functions.getstringidentifiers = browserTable->getstringidentifiers; -- browser_functions.getintidentifier = browserTable->getintidentifier; -- browser_functions.identifierisstring = browserTable->identifierisstring; -- browser_functions.utf8fromidentifier = browserTable->utf8fromidentifier; -- browser_functions.intfromidentifier = browserTable->intfromidentifier; -- browser_functions.createobject = browserTable->createobject; -- browser_functions.retainobject = browserTable->retainobject; -- browser_functions.releaseobject = browserTable->releaseobject; -- browser_functions.invoke = browserTable->invoke; -- browser_functions.invokeDefault = browserTable->invokeDefault; -- browser_functions.evaluate = browserTable->evaluate; -- browser_functions.getproperty = browserTable->getproperty; -- browser_functions.setproperty = browserTable->setproperty; -- browser_functions.removeproperty = browserTable->removeproperty; -- browser_functions.hasproperty = browserTable->hasproperty; -- browser_functions.hasmethod = browserTable->hasmethod; -- browser_functions.releasevariantvalue = browserTable->releasevariantvalue; -- browser_functions.setexception = browserTable->setexception; -- browser_functions.pluginthreadasynccall = browserTable->pluginthreadasynccall; --#if MOZILLA_VERSION_COLLAPSED >= 1090100 -- browser_functions.getvalueforurl = browserTable->getvalueforurl; -- browser_functions.setvalueforurl = browserTable->setvalueforurl; --#endif -- -- // Return to the browser the plugin functions that we implement. -+ //Ensure any unused fields are NULL -+ memset(&browser_functions, 0, sizeof(NPNetscapeFuncs)); -+ //Copy fields according to given size -+ memcpy(&browser_functions, browserTable, browserTable->size); -+ -+ return true; -+} -+ -+/* Set the plugin table to the correct contents, taking care not to write past -+ * the provided object space */ -+static bool -+initialize_plugin_table(NPPluginFuncs* pluginTable) -+{ -+#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue) -+ -+ //Determine the size in bytes, as a difference of the address past the last used field -+ //And the browser table address -+ size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable; -+ -+ // compare the reported size versus the size we required -+ if (pluginTable->size < usedSize) -+ return false; -+ - pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; - pluginTable->size = sizeof (NPPluginFuncs); - -@@ -2150,6 +2093,68 @@ - pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue); - #endif - -+ return true; -+} -+ -+// FACTORY FUNCTIONS -+ -+// Provides the browser with pointers to the plugin functions that we -+// implement and initializes a local table with browser functions that -+// we may wish to call. Called once, after browser startup and before -+// the first plugin instance is created. -+// The field 'initialized' is set to true once this function has -+// finished. If 'initialized' is already true at the beginning of -+// this function, then it is evident that NP_Initialize has already -+// been called. There is no need to call this function more than once and -+// this workaround avoids any duplicate calls. -+NPError -+NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) -+{ -+ PLUGIN_DEBUG ("NP_Initialize\n"); -+ -+ if ((browserTable == NULL) || (pluginTable == NULL)) -+ { -+ PLUGIN_ERROR ("Browser or plugin function table is NULL."); -+ -+ return NPERR_INVALID_FUNCTABLE_ERROR; -+ } -+ -+ // Ensure that the major version of the plugin API that the browser -+ // expects is not more recent than the major version of the API that -+ // we've implemented. -+ if ((browserTable->version >> 8) > NP_VERSION_MAJOR) -+ { -+ PLUGIN_ERROR ("Incompatible version."); -+ -+ return NPERR_INCOMPATIBLE_VERSION_ERROR; -+ } -+ -+ // Copy into a global table (browser_functions) the browser functions that we may use. -+ // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED -+ // within this function -+ bool browser_functions_supported = initialize_browser_functions(browserTable); -+ -+ // Check if everything we rely on is supported -+ if ( !browser_functions_supported ) -+ { -+ PLUGIN_ERROR ("Invalid browser function table."); -+ -+ return NPERR_INVALID_FUNCTABLE_ERROR; -+ } -+ -+ // Return to the browser the plugin functions that we implement. -+ // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED -+ // within this function -+ bool plugin_functions_supported = initialize_plugin_table(pluginTable); -+ -+ // Check if everything we rely on is supported -+ if ( !plugin_functions_supported ) -+ { -+ PLUGIN_ERROR ("Invalid plugin function table."); -+ -+ return NPERR_INVALID_FUNCTABLE_ERROR; -+ } -+ - // Re-setting the above tables multiple times is OK (as the - // browser may change its function locations). However - // anything beyond this point should only run once. - diff --git a/extra/icedtea-web/fix_firefox_crash.diff b/extra/icedtea-web/fix_firefox_crash.diff deleted file mode 100644 index cd02aba0a..000000000 --- a/extra/icedtea-web/fix_firefox_crash.diff +++ /dev/null @@ -1,228 +0,0 @@ - -# HG changeset patch -# User Adam Domurad <adomurad@redhat.com> -# Date 1340899207 14400 -# Node ID a49edd57b1b332b431222b1c225189fe51676193 -# Parent d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4 -Fixes invalid plugin table error that sometimes occurs. -The invalid plugin table error was happening when the API that was -being compiled with had a larger size than that of the browser. -The plugin now only checks if the minimal subset it uses exists. - -diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc ---- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 08 13:44:25 2012 -0400 -+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 28 12:00:07 2012 -0400 -@@ -2022,105 +2022,48 @@ - PLUGIN_DEBUG ("plugin_data_destroy return\n"); - } - --// FACTORY FUNCTIONS -- --// Provides the browser with pointers to the plugin functions that we --// implement and initializes a local table with browser functions that --// we may wish to call. Called once, after browser startup and before --// the first plugin instance is created. --// The field 'initialized' is set to true once this function has --// finished. If 'initialized' is already true at the beginning of --// this function, then it is evident that NP_Initialize has already --// been called. There is no need to call this function more than once and --// this workaround avoids any duplicate calls. --NPError --NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) -+static bool -+initialize_browser_functions(const NPNetscapeFuncs* browserTable) - { -- PLUGIN_DEBUG ("NP_Initialize\n"); -- -- if ((browserTable == NULL) || (pluginTable == NULL)) -+#if MOZILLA_VERSION_COLLAPSED < 1090100 -+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall) -+#else -+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl) -+#endif -+ -+ //Determine the size in bytes, as a difference of the address past the last used field -+ //And the browser table address -+ size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable; -+ -+ // compare the reported size versus the size we required -+ if (browserTable->size < usedSize) - { -- PLUGIN_ERROR ("Browser or plugin function table is NULL."); -- -- return NPERR_INVALID_FUNCTABLE_ERROR; -+ return false; - } - -- // Ensure that the major version of the plugin API that the browser -- // expects is not more recent than the major version of the API that -- // we've implemented. -- if ((browserTable->version >> 8) > NP_VERSION_MAJOR) -- { -- PLUGIN_ERROR ("Incompatible version."); -- -- return NPERR_INCOMPATIBLE_VERSION_ERROR; -- } -- -- // Ensure that the plugin function table we've received is large -- // enough to store the number of functions that we may provide. -- if (pluginTable->size < sizeof (NPPluginFuncs)) -- { -- PLUGIN_ERROR ("Invalid plugin function table."); -- -- return NPERR_INVALID_FUNCTABLE_ERROR; -- } -- -- // Ensure that the browser function table is large enough to store -- // the number of browser functions that we may use. -- if (browserTable->size < sizeof (NPNetscapeFuncs)) -- { -- fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n"); -- } -- -- // Store in a local table the browser functions that we may use. -- browser_functions.size = browserTable->size; -- browser_functions.version = browserTable->version; -- browser_functions.geturlnotify = browserTable->geturlnotify; -- browser_functions.geturl = browserTable->geturl; -- browser_functions.posturlnotify = browserTable->posturlnotify; -- browser_functions.posturl = browserTable->posturl; -- browser_functions.requestread = browserTable->requestread; -- browser_functions.newstream = browserTable->newstream; -- browser_functions.write = browserTable->write; -- browser_functions.destroystream = browserTable->destroystream; -- browser_functions.status = browserTable->status; -- browser_functions.uagent = browserTable->uagent; -- browser_functions.memalloc = browserTable->memalloc; -- browser_functions.memfree = browserTable->memfree; -- browser_functions.memflush = browserTable->memflush; -- browser_functions.reloadplugins = browserTable->reloadplugins; -- browser_functions.getJavaEnv = browserTable->getJavaEnv; -- browser_functions.getJavaPeer = browserTable->getJavaPeer; -- browser_functions.getvalue = browserTable->getvalue; -- browser_functions.setvalue = browserTable->setvalue; -- browser_functions.invalidaterect = browserTable->invalidaterect; -- browser_functions.invalidateregion = browserTable->invalidateregion; -- browser_functions.forceredraw = browserTable->forceredraw; -- browser_functions.getstringidentifier = browserTable->getstringidentifier; -- browser_functions.getstringidentifiers = browserTable->getstringidentifiers; -- browser_functions.getintidentifier = browserTable->getintidentifier; -- browser_functions.identifierisstring = browserTable->identifierisstring; -- browser_functions.utf8fromidentifier = browserTable->utf8fromidentifier; -- browser_functions.intfromidentifier = browserTable->intfromidentifier; -- browser_functions.createobject = browserTable->createobject; -- browser_functions.retainobject = browserTable->retainobject; -- browser_functions.releaseobject = browserTable->releaseobject; -- browser_functions.invoke = browserTable->invoke; -- browser_functions.invokeDefault = browserTable->invokeDefault; -- browser_functions.evaluate = browserTable->evaluate; -- browser_functions.getproperty = browserTable->getproperty; -- browser_functions.setproperty = browserTable->setproperty; -- browser_functions.removeproperty = browserTable->removeproperty; -- browser_functions.hasproperty = browserTable->hasproperty; -- browser_functions.hasmethod = browserTable->hasmethod; -- browser_functions.releasevariantvalue = browserTable->releasevariantvalue; -- browser_functions.setexception = browserTable->setexception; -- browser_functions.pluginthreadasynccall = browserTable->pluginthreadasynccall; --#if MOZILLA_VERSION_COLLAPSED >= 1090100 -- browser_functions.getvalueforurl = browserTable->getvalueforurl; -- browser_functions.setvalueforurl = browserTable->setvalueforurl; --#endif -- -- // Return to the browser the plugin functions that we implement. -+ //Ensure any unused fields are NULL -+ memset(&browser_functions, 0, sizeof(NPNetscapeFuncs)); -+ //Copy fields according to given size -+ memcpy(&browser_functions, browserTable, browserTable->size); -+ -+ return true; -+} -+ -+/* Set the plugin table to the correct contents, taking care not to write past -+ * the provided object space */ -+static bool -+initialize_plugin_table(NPPluginFuncs* pluginTable) -+{ -+#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue) -+ -+ //Determine the size in bytes, as a difference of the address past the last used field -+ //And the browser table address -+ size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable; -+ -+ // compare the reported size versus the size we required -+ if (pluginTable->size < usedSize) -+ return false; -+ - pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; - pluginTable->size = sizeof (NPPluginFuncs); - -@@ -2150,6 +2093,68 @@ - pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue); - #endif - -+ return true; -+} -+ -+// FACTORY FUNCTIONS -+ -+// Provides the browser with pointers to the plugin functions that we -+// implement and initializes a local table with browser functions that -+// we may wish to call. Called once, after browser startup and before -+// the first plugin instance is created. -+// The field 'initialized' is set to true once this function has -+// finished. If 'initialized' is already true at the beginning of -+// this function, then it is evident that NP_Initialize has already -+// been called. There is no need to call this function more than once and -+// this workaround avoids any duplicate calls. -+NPError -+NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) -+{ -+ PLUGIN_DEBUG ("NP_Initialize\n"); -+ -+ if ((browserTable == NULL) || (pluginTable == NULL)) -+ { -+ PLUGIN_ERROR ("Browser or plugin function table is NULL."); -+ -+ return NPERR_INVALID_FUNCTABLE_ERROR; -+ } -+ -+ // Ensure that the major version of the plugin API that the browser -+ // expects is not more recent than the major version of the API that -+ // we've implemented. -+ if ((browserTable->version >> 8) > NP_VERSION_MAJOR) -+ { -+ PLUGIN_ERROR ("Incompatible version."); -+ -+ return NPERR_INCOMPATIBLE_VERSION_ERROR; -+ } -+ -+ // Copy into a global table (browser_functions) the browser functions that we may use. -+ // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED -+ // within this function -+ bool browser_functions_supported = initialize_browser_functions(browserTable); -+ -+ // Check if everything we rely on is supported -+ if ( !browser_functions_supported ) -+ { -+ PLUGIN_ERROR ("Invalid browser function table."); -+ -+ return NPERR_INVALID_FUNCTABLE_ERROR; -+ } -+ -+ // Return to the browser the plugin functions that we implement. -+ // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED -+ // within this function -+ bool plugin_functions_supported = initialize_plugin_table(pluginTable); -+ -+ // Check if everything we rely on is supported -+ if ( !plugin_functions_supported ) -+ { -+ PLUGIN_ERROR ("Invalid plugin function table."); -+ -+ return NPERR_INVALID_FUNCTABLE_ERROR; -+ } -+ - // Re-setting the above tables multiple times is OK (as the - // browser may change its function locations). However - // anything beyond this point should only run once. - diff --git a/extra/icu/changeset_32780.diff b/extra/icu/changeset_32780.diff deleted file mode 100644 index a06c3d2ab..000000000 --- a/extra/icu/changeset_32780.diff +++ /dev/null @@ -1,67 +0,0 @@ -Index: /icu/trunk/source/test/intltest/strtest.cpp
-===================================================================
---- /icu/trunk/source/test/intltest/strtest.cpp (revision 32779)
-+++ /icu/trunk/source/test/intltest/strtest.cpp (revision 32780)
-@@ -1,5 +1,5 @@
- /********************************************************************
- * COPYRIGHT:
-- * Copyright (c) 1997-2011, International Business Machines Corporation and
-+ * Copyright (c) 1997-2012, International Business Machines Corporation and
- * others. All Rights Reserved.
- ********************************************************************/
-@@ -95,5 +95,5 @@
- StringTest::Test_U_STRING() {
- U_STRING_INIT(ustringVar, "aZ0 -", 5);
-- if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 ||
-+ if( u_strlen(ustringVar)!=5 ||
- ustringVar[0]!=0x61 ||
- ustringVar[1]!=0x5a ||
-Index: /icu/trunk/source/common/unicode/ustring.h
-===================================================================
---- /icu/trunk/source/common/unicode/ustring.h (revision 32779)
-+++ /icu/trunk/source/common/unicode/ustring.h (revision 32780)
-@@ -940,5 +940,5 @@
- */
- #if defined(U_DECLARE_UTF16)
--# define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs)
-+# define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs)
- /**@stable ICU 2.0 */
- # define U_STRING_INIT(var, cs, length)
-Index: /icu/trunk/source/common/unicode/platform.h
-===================================================================
---- /icu/trunk/source/common/unicode/platform.h (revision 32779)
-+++ /icu/trunk/source/common/unicode/platform.h (revision 32780)
-@@ -665,7 +665,7 @@
- * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but
- * does not support u"abc" string literals.
-- * C++11 requires support for UTF-16 literals
-+ * C++11 and C11 require support for UTF-16 literals
- */
--# if (defined(__cplusplus) && __cplusplus >= 201103L)
-+# if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
- # define U_HAVE_CHAR16_T 1
- # else
-Index: /icu/trunk/source/common/unicode/umachine.h
-===================================================================
---- /icu/trunk/source/common/unicode/umachine.h (revision 32779)
-+++ /icu/trunk/source/common/unicode/umachine.h (revision 32780)
-@@ -257,5 +257,5 @@
- /**
- * \var UChar
-- * Define UChar to be char16_t, if available,
-+ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t),
- * or wchar_t if that is 16 bits wide; always assumed to be unsigned.
- * If neither is available, then define UChar to be uint16_t.
-@@ -267,8 +267,8 @@
- * @stable ICU 4.4
- */
--
--/* Define UChar to be compatible with char16_t or wchar_t if possible. */
--#if U_HAVE_CHAR16_T
-- typedef char16_t UChar;
-+#if defined(UCHAR_TYPE)
-+ typedef UCHAR_TYPE UChar;
-+/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers
-+ typedef char16_t UChar; */
- #elif U_SIZEOF_WCHAR_T==2
- typedef wchar_t UChar;
diff --git a/extra/ifplugd/ifdown.01-route.sh b/extra/ifplugd/ifdown.01-route.sh deleted file mode 100755 index cfa0e0069..000000000 --- a/extra/ifplugd/ifdown.01-route.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# same as up... -/sbin/route del $1
\ No newline at end of file diff --git a/extra/ifplugd/ifplugd.action b/extra/ifplugd/ifplugd.action deleted file mode 100644 index 07895bcad..000000000 --- a/extra/ifplugd/ifplugd.action +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# ifplugd.action script for Arch Linux -# - -. /etc/rc.conf -. /etc/rc.d/functions - -plugscript() { # arguments are ifup|ifdown, interface_name - for script in /etc/ifplugd/$1.d/*.sh; do - [[ -x $script ]] && "$script" $2 - done - return 0 -} - -case $2 in - up) - /etc/rc.d/network ifup "$1" - plugscript ifup "$1" - ;; - down) - plugscript ifdown "$1" - /etc/rc.d/network ifdown $1 - ;; - *) - echo "Wrong arguments" >&2 - ;; -esac - -exit 1 diff --git a/extra/ifplugd/ifup.01-route.sh b/extra/ifplugd/ifup.01-route.sh deleted file mode 100755 index 6be07208d..000000000 --- a/extra/ifplugd/ifup.01-route.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# ugly way to load up gateway, since -# al's net configuration doesn't associate -# gateways with specific interfaces. -/sbin/route add $gateway diff --git a/extra/ifplugd/ifup.02-ntpdate.sh b/extra/ifplugd/ifup.02-ntpdate.sh deleted file mode 100755 index 4e53daff9..000000000 --- a/extra/ifplugd/ifup.02-ntpdate.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -ntpdate ru.pool.ntp.org | logger diff --git a/extra/ilmbase/tests-compile-fixes.patch b/extra/ilmbase/tests-compile-fixes.patch deleted file mode 100644 index 27dc24ac6..000000000 --- a/extra/ilmbase/tests-compile-fixes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h ---- ilmbase-1.0.2/Imath/ImathMatrix.h 2010-07-17 00:48:40.000000000 +0200 -+++ ilmbase-1.0.2.new/Imath/ImathMatrix.h 2011-04-25 10:15:21.121608420 +0200 -@@ -49,6 +49,8 @@ - #include "ImathVec.h" - #include "ImathShear.h" - -+#include <cstdlib> -+#include <cstring> - #include <iostream> - #include <iomanip> - diff --git a/extra/inkscape/libpng15.patch b/extra/inkscape/libpng15.patch deleted file mode 100644 index e24913ed6..000000000 --- a/extra/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/extra/inkscape/poppler20.patch b/extra/inkscape/poppler20.patch deleted file mode 100644 index ecb74603f..000000000 --- a/extra/inkscape/poppler20.patch +++ /dev/null @@ -1,642 +0,0 @@ -diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp ---- old/src/extension/internal/pdfinput/pdf-parser.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/pdf-parser.cpp 2012-05-13 21:07:11.334781215 +0200 -@@ -367,14 +367,14 @@ - for (i = 0; i < obj->arrayGetLength(); ++i) { - obj->arrayGet(i, &obj2); - if (!obj2.isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - obj2.free(); - return; - } - obj2.free(); - } - } else if (!obj->isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - return; - } - parser = new Parser(xref, new Lexer(xref, obj), gFalse); -@@ -419,7 +419,7 @@ - - // too many arguments - something is wrong - } else { -- error(getPos(), const_cast<char*>("Too many args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Too many args in content stream")); - if (printCommands) { - printf("throwing away arg: "); - obj.print(stdout); -@@ -436,7 +436,7 @@ - - // args at end with no command - if (numArgs > 0) { -- error(getPos(), const_cast<char*>("Leftover args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream")); - if (printCommands) { - printf("%d leftovers:", numArgs); - for (i = 0; i < numArgs; ++i) { -@@ -502,7 +502,7 @@ - name = cmd->getCmd(); - if (!(op = findOp(name))) { - if (ignoreUndef == 0) -- error(getPos(), const_cast<char*>("Unknown operator '%s'"), name); -+ error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name); - return; - } - -@@ -510,26 +510,26 @@ - argPtr = args; - if (op->numArgs >= 0) { - if (numArgs < op->numArgs) { -- error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); -+ error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); - return; - } - if (numArgs > op->numArgs) { - #if 0 -- error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name); -+ error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name); - #endif - argPtr += numArgs - op->numArgs; - numArgs = op->numArgs; - } - } else { - if (numArgs > -op->numArgs) { -- error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), -+ error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), - numArgs, name); - return; - } - } - for (i = 0; i < numArgs; ++i) { - if (!checkArg(&argPtr[i], op->tchk[i])) { -- error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), -+ error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), - i, name, argPtr[i].getTypeName()); - return; - } -@@ -690,7 +690,7 @@ - return; - } - if (!obj1.isDict()) { -- error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); -+ error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); - obj1.free(); - return; - } -@@ -705,7 +705,7 @@ - if (state->parseBlendMode(&obj2, &mode)) { - state->setBlendMode(mode); - } else { -- error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); - } - } - obj2.free(); -@@ -764,7 +764,7 @@ - state->setTransfer(funcs); - } - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); - } - obj2.free(); - -@@ -784,7 +784,7 @@ - funcs[0] = Function::parse(&obj3); - if (funcs[0]->getInputSize() != 1 || - funcs[0]->getOutputSize() != 1) { -- error(getPos(), -+ error(errInternal, getPos(), - const_cast<char*>("Invalid transfer function in soft mask in ExtGState")); - delete funcs[0]; - funcs[0] = NULL; -@@ -809,11 +809,7 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj5); --#endif - } - obj5.free(); - if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { -@@ -840,15 +836,15 @@ - delete funcs[0]; - } - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj4.free(); - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj3.free(); - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); - } - } - obj2.free(); -@@ -876,7 +872,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -884,7 +880,7 @@ - dict->lookup(const_cast<char*>("BBox"), &obj1); - if (!obj1.isArray()) { - obj1.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -1012,19 +1008,11 @@ - - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setFillColorSpace(colorSpace); -@@ -1032,7 +1020,7 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (fill)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)")); - } - } - -@@ -1043,19 +1031,11 @@ - - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setStrokeColorSpace(colorSpace); -@@ -1063,7 +1043,7 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (stroke)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)")); - } - } - -@@ -1072,7 +1052,7 @@ - int i; - - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); - return; - } - state->setFillPattern(NULL); -@@ -1088,7 +1068,7 @@ - int i; - - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1109,7 +1089,7 @@ - if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1120,23 +1100,15 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setFillPattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - state->setFillPattern(NULL); -@@ -1161,7 +1133,7 @@ - ->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1172,23 +1144,15 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setStrokePattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1212,7 +1176,7 @@ - - void PdfParser::opLineTo(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in lineto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in lineto")); - return; - } - state->lineTo(args[0].getNum(), args[1].getNum()); -@@ -1222,7 +1186,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto")); - return; - } - x1 = args[0].getNum(); -@@ -1238,7 +1202,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto1")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto1")); - return; - } - x1 = state->getCurX(); -@@ -1254,7 +1218,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto2")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto2")); - return; - } - x1 = args[0].getNum(); -@@ -1282,7 +1246,7 @@ - - void PdfParser::opClosePath(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in closepath")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in closepath")); - return; - } - state->closePath(); -@@ -1298,7 +1262,7 @@ - - void PdfParser::opStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in stroke")); - return; - } - if (state->isPath()) { -@@ -1314,7 +1278,7 @@ - - void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke")); - return; - } - state->closePath(); -@@ -1331,7 +1295,7 @@ - - void PdfParser::opFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill")); - return; - } - if (state->isPath()) { -@@ -1347,7 +1311,7 @@ - - void PdfParser::opEOFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill")); - return; - } - if (state->isPath()) { -@@ -1363,7 +1327,7 @@ - - void PdfParser::opFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1376,7 +1340,7 @@ - - void PdfParser::opCloseFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1388,7 +1352,7 @@ - - void PdfParser::opEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1399,7 +1363,7 @@ - - void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1440,7 +1404,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), - pattern->getType()); - break; - } -@@ -1459,7 +1423,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), - pattern->getType()); - break; - } -@@ -1579,15 +1543,9 @@ - double *matrix = NULL; - GBool savedState = gFalse; - --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (!(shading = res->lookupShading(args[0].getName(), NULL))) { - return; - } --#else -- if (!(shading = res->lookupShading(args[0].getName()))) { -- return; -- } --#endif - - // save current graphics state - if (shading->getType() != 2 && shading->getType() != 3) { -@@ -2156,7 +2114,7 @@ - - void PdfParser::opShowText(Object args[], int numArgs) { - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show")); - return; - } - if (fontChanged) { -@@ -2170,7 +2128,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/show")); - return; - } - if (fontChanged) { -@@ -2188,7 +2146,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/set/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/set/show")); - return; - } - if (fontChanged) { -@@ -2211,7 +2169,7 @@ - int i; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show/space")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show/space")); - return; - } - if (fontChanged) { -@@ -2236,7 +2194,7 @@ - } else if (obj.isString()) { - doShowText(obj.getString()); - } else { -- error(getPos(), const_cast<char*>("Element of show/space array must be number or string")); -+ error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string")); - } - obj.free(); - } -@@ -2334,7 +2292,7 @@ - if (charProc.isStream()) { - //parse(&charProc, gFalse); // TODO: parse into SVG font - } else { -- error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); -+ error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); - } - //out->endType3Char(state); - if (resDict) { -@@ -2410,7 +2368,7 @@ - return; - } - if (!obj1.isStream()) { -- error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); -+ error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); - obj1.free(); - return; - } -@@ -2426,9 +2384,9 @@ - /* out->psXObject(obj1.getStream(), - obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/ - } else if (obj2.isName()) { -- error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); -+ error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); - } else { -- error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); -+ error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); - } - obj2.free(); - obj1.free(); -@@ -2559,11 +2517,7 @@ - } - } - if (!obj1.isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - colorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- colorSpace = GfxColorSpace::parse(&obj1); --#endif - } else if (csMode == streamCSDeviceGray) { - colorSpace = new GfxDeviceGrayColorSpace(); - } else if (csMode == streamCSDeviceRGB) { -@@ -2648,11 +2602,7 @@ - obj2.free(); - } - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - maskColorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- maskColorSpace = GfxColorSpace::parse(&obj1); --#endif - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2758,7 +2708,7 @@ - err2: - obj1.free(); - err1: -- error(getPos(), const_cast<char*>("Bad image parameters")); -+ error(errInternal, getPos(), const_cast<char*>("Bad image parameters")); - } - - void PdfParser::doForm(Object *str) { -@@ -2783,7 +2733,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -2791,7 +2741,7 @@ - dict->lookup(const_cast<char*>("BBox"), &bboxObj); - if (!bboxObj.isArray()) { - bboxObj.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -2827,11 +2777,7 @@ - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj3); --#endif - } - obj3.free(); - if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { -@@ -2990,7 +2936,7 @@ - parser->getObj(&obj); - while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) { - if (!obj.isName()) { -- error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); -+ error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); - obj.free(); - } else { - key = copyString(obj.getName()); -@@ -3005,7 +2951,7 @@ - parser->getObj(&obj); - } - if (obj.isEOF()) { -- error(getPos(), const_cast<char*>("End of file in inline image")); -+ error(errInternal, getPos(), const_cast<char*>("End of file in inline image")); - obj.free(); - dict.free(); - return NULL; -@@ -3020,11 +2966,11 @@ - } - - void PdfParser::opImageData(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'ID' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator")); - } - - void PdfParser::opEndImage(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'EI' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator")); - } - - //------------------------------------------------------------------------ -diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp ---- old/src/extension/internal/pdfinput/svg-builder.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/svg-builder.cpp 2012-05-13 20:45:22.303804308 +0200 -@@ -961,9 +961,7 @@ - _font_style = sp_repr_css_attr_new(); - GfxFont *font = state->getFont(); - // Store original name -- if (font->getOrigName()) { -- _font_specification = font->getOrigName()->getCString(); -- } else if (font->getName()) { -+ if (font->getName()) { - _font_specification = font->getName()->getCString(); - } else { - _font_specification = (char*) "Arial"; diff --git a/extra/irqbalance/irqbalance-2011-08-09.patch b/extra/irqbalance/irqbalance-2011-08-09.patch deleted file mode 100644 index fcdb8bdbf..000000000 --- a/extra/irqbalance/irqbalance-2011-08-09.patch +++ /dev/null @@ -1,1584 +0,0 @@ -diff --git a/ChangeLog b/ChangeLog -deleted file mode 100644 -index f5e9428..0000000 ---- a/ChangeLog -+++ /dev/null -@@ -1,3 +0,0 @@ --This is all tracked in the SVN repo. This file is just here to keep the --autotools from complaining -- -diff --git a/Makefile.am b/Makefile.am -index 9847232..188e34f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -22,17 +22,17 @@ - - AUTOMAKE_OPTIONS = no-dependencies - ACLOCAL_AMFLAGS = -I m4 --EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4 misc/irqbalance.service -- -+EXTRA_DIST = INSTALL COPYING autogen.sh misc/irqbalance.service -+ - INCLUDES = -I${top_srcdir} --LIBS = $(CAPNG_LDADD) $(GLIB_LIBS) @LIBS@ --AM_CFLAGS = $(GLIB_CFLAGS) -+AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB_CFLAGS) - AM_CPPFLAGS = -W -Wall -Wshadow -Wformat -Wundef -D_GNU_SOURCE - noinst_HEADERS = bitmap.h constants.h cpumask.h irqbalance.h non-atomic.h \ - types.h - sbin_PROGRAMS = irqbalance - irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \ -- irqlist.c numa.c placement.c powermode.c procinterrupts.c -+ irqlist.c numa.c placement.c procinterrupts.c -+irqbalance_LDADD = $(LIBCAP_NG_LIBS) $(GLIB_LIBS) - dist_man_MANS = irqbalance.1 - - CONFIG_CLEAN_FILES = debug*.list config/* -@@ -40,3 +40,6 @@ clean-generic: - rm -rf autom4te*.cache - rm -f *.rej *.orig *~ - -+if LOCAL_GLIB -+SUBDIRS = glib-local -+endif -diff --git a/NEWS b/NEWS -deleted file mode 100644 -index 7cc0277..0000000 ---- a/NEWS -+++ /dev/null -@@ -1 +0,0 @@ --No news currently -diff --git a/README b/README -deleted file mode 100644 -index e69de29..0000000 -diff --git a/activate.c b/activate.c -index 292c44a..02fc8dc 100644 ---- a/activate.c -+++ b/activate.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2006, Intel Corporation -+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> - * - * This file is part of irqbalance - * -@@ -31,34 +32,63 @@ - - #include "irqbalance.h" - -+static int check_affinity(struct irq_info *info, cpumask_t applied_mask) -+{ -+ cpumask_t current_mask; -+ char buf[PATH_MAX]; -+ char *line = NULL; -+ size_t size = 0; -+ FILE *file; -+ -+ sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq); -+ file = fopen(buf, "r"); -+ if (!file) -+ return 1; -+ if (getline(&line, &size, file)==0) { -+ free(line); -+ fclose(file); -+ return 1; -+ } -+ cpumask_parse_user(line, strlen(line), current_mask); -+ fclose(file); -+ free(line); -+ -+ return cpus_equal(applied_mask, current_mask); -+} - - static void activate_mapping(struct irq_info *info, void *data __attribute__((unused))) - { - char buf[PATH_MAX]; - FILE *file; - cpumask_t applied_mask; -+ int valid_mask = 0; -+ -+ if ((hint_policy == HINT_POLICY_EXACT) && -+ (!cpus_empty(info->affinity_hint))) { -+ applied_mask = info->affinity_hint; -+ valid_mask = 1; -+ } else if (info->assigned_obj) { -+ applied_mask = info->assigned_obj->mask; -+ valid_mask = 1; -+ if ((hint_policy == HINT_POLICY_SUBSET) && -+ (!cpus_empty(info->affinity_hint))) -+ cpus_and(applied_mask, applied_mask, info->affinity_hint); -+ } - - /* - * only activate mappings for irqs that have moved - */ -- if (!info->moved) -+ if (!info->moved && (!valid_mask || check_affinity(info, applied_mask))) - return; - - if (!info->assigned_obj) - return; - -- - sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq); - file = fopen(buf, "w"); - if (!file) - return; - -- if ((hint_policy == HINT_POLICY_EXACT) && -- (!cpus_empty(info->affinity_hint))) -- applied_mask = info->affinity_hint; -- else -- applied_mask = info->assigned_obj->mask; -- - cpumask_scnprintf(buf, PATH_MAX, applied_mask); - fprintf(file, "%s", buf); - fclose(file); -diff --git a/autogen.sh b/autogen.sh -index 5ad9f14..b792e8b 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -1,4 +1,5 @@ - #! /bin/sh - set -x -e -+mkdir -p m4 - # --no-recursive is available only in recent autoconf versions - autoreconf -fv --install -diff --git a/classify.c b/classify.c -index 124dab0..05b3bfb 100644 ---- a/classify.c -+++ b/classify.c -@@ -52,6 +52,8 @@ static short class_codes[MAX_CLASS] = { - }; - - static GList *interrupts_db; -+static GList *new_irq_list; -+static GList *banned_irqs; - - #define SYSDEV_DIR "/sys/bus/pci/devices" - -@@ -63,6 +65,30 @@ static gint compare_ints(gconstpointer a, gconstpointer b) - return ai->irq - bi->irq; - } - -+void add_banned_irq(int irq) -+{ -+ struct irq_info find, *new; -+ GList *entry; -+ -+ find.irq = irq; -+ entry = g_list_find_custom(banned_irqs, &find, compare_ints); -+ if (entry) -+ return; -+ -+ new = calloc(sizeof(struct irq_info), 1); -+ if (!new) { -+ if (debug_mode) -+ printf("No memory to ban irq %d\n", irq); -+ return; -+ } -+ -+ new->irq = irq; -+ -+ banned_irqs = g_list_append(banned_irqs, new); -+ return; -+} -+ -+ - /* - * Inserts an irq_info struct into the intterupts_db list - * devpath points to the device directory in sysfs for the -@@ -90,6 +116,13 @@ static struct irq_info *add_one_irq_to_db(const char *devpath, int irq) - return NULL; - } - -+ entry = g_list_find_custom(banned_irqs, &find, compare_ints); -+ if (entry) { -+ if (debug_mode) -+ printf("SKIPPING BANNED IRQ %d\n", irq); -+ return NULL; -+ } -+ - new = calloc(sizeof(struct irq_info), 1); - if (!new) - return NULL; -@@ -175,6 +208,43 @@ out: - return new; - } - -+static int check_for_irq_ban(char *path, int irq) -+{ -+ char *cmd; -+ int rc; -+ -+ if (!banscript) -+ return 0; -+ -+ cmd = alloca(strlen(path)+strlen(banscript)+32); -+ if (!cmd) -+ return 0; -+ -+ sprintf(cmd, "%s %s %d",banscript, path, irq); -+ rc = system(cmd); -+ -+ /* -+ * The system command itself failed -+ */ -+ if (rc == -1) { -+ if (debug_mode) -+ printf("%s failed, please check the --banscript option\n", cmd); -+ else -+ syslog(LOG_INFO, "%s failed, please check the --banscript option\n", cmd); -+ return 0; -+ } -+ -+ if (WEXITSTATUS(rc)) { -+ if (debug_mode) -+ printf("irq %d is baned by %s\n", irq, banscript); -+ else -+ syslog(LOG_INFO, "irq %d is baned by %s\n", irq, banscript); -+ return 1; -+ } -+ return 0; -+ -+} -+ - /* - * Figures out which interrupt(s) relate to the device we're looking at in dirname - */ -@@ -199,6 +269,10 @@ static void build_one_dev_entry(const char *dirname) - irqnum = strtol(entry->d_name, NULL, 10); - if (irqnum) { - sprintf(path, "%s/%s", SYSDEV_DIR, dirname); -+ if (check_for_irq_ban(path, irqnum)) { -+ add_banned_irq(irqnum); -+ continue; -+ } - new = add_one_irq_to_db(path, irqnum); - if (!new) - continue; -@@ -221,6 +295,11 @@ static void build_one_dev_entry(const char *dirname) - */ - if (irqnum) { - sprintf(path, "%s/%s", SYSDEV_DIR, dirname); -+ if (check_for_irq_ban(path, irqnum)) { -+ add_banned_irq(irqnum); -+ goto done; -+ } -+ - new = add_one_irq_to_db(path, irqnum); - if (!new) - goto done; -@@ -248,6 +327,8 @@ void rebuild_irq_db(void) - { - DIR *devdir = opendir(SYSDEV_DIR); - struct dirent *entry; -+ GList *gentry; -+ struct irq_info *ninfo, *iinfo; - - free_irq_db(); - -@@ -263,22 +344,46 @@ void rebuild_irq_db(void) - build_one_dev_entry(entry->d_name); - - } while (entry != NULL); -+ - closedir(devdir); -+ -+ if (!new_irq_list) -+ return; -+ gentry = g_list_first(new_irq_list); -+ while(gentry) { -+ ninfo = gentry->data; -+ iinfo = get_irq_info(ninfo->irq); -+ new_irq_list = g_list_remove(gentry, ninfo); -+ if (!iinfo) { -+ if (debug_mode) -+ printf("Adding untracked IRQ %d to database\n", ninfo->irq); -+ interrupts_db = g_list_append(interrupts_db, ninfo); -+ } else -+ free(ninfo); -+ -+ gentry = g_list_first(new_irq_list); -+ } -+ g_list_free(new_irq_list); -+ new_irq_list = NULL; -+ - } - --struct irq_info *add_misc_irq(int irq) -+struct irq_info *add_new_irq(int irq) - { -- struct irq_info *new; -+ struct irq_info *new, *nnew; - - new = calloc(sizeof(struct irq_info), 1); -- if (!new) -+ nnew = calloc(sizeof(struct irq_info), 1); -+ if (!new || !nnew) - return NULL; - - new->irq = irq; - new->type = IRQ_TYPE_LEGACY; - new->class = IRQ_OTHER; - new->numa_node = get_numa_node(-1); -+ memcpy(nnew, new, sizeof(struct irq_info)); - interrupts_db = g_list_append(interrupts_db, new); -+ new_irq_list = g_list_append(new_irq_list, nnew); - return new; - } - -@@ -307,7 +412,7 @@ struct irq_info *get_irq_info(int irq) - void migrate_irq(GList **from, GList **to, struct irq_info *info) - { - GList *entry; -- struct irq_info find, *tmp;; -+ struct irq_info find, *tmp; - - find.irq = info->irq; - entry = g_list_find_custom(*from, &find, compare_ints); -@@ -325,18 +430,9 @@ static gint sort_irqs(gconstpointer A, gconstpointer B) - a = (struct irq_info*)A; - b = (struct irq_info*)B; - -- if (a->class < b->class) -- return 1; -- if (a->class > b->class) -- return -1; -- if (a->load < b->load) -- return 1; -- if (a->load > b->load) -- return -1; -- if (a<b) -+ if (a->class < b->class || a->load < b->load || a < b) - return 1; - return -1; -- - } - - void sort_irq_list(GList **list) -diff --git a/configure.ac b/configure.ac -index eed55ba..1230d66 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,49 +1,12 @@ --dnl --define([AC_INIT_NOTICE], --[### Generated automatically using autoconf version] AC_ACVERSION [ --### Copyright 2009 Steve Grubb <sgrubb@redhat.com> --### --### Permission is hereby granted, free of charge, to any person obtaining a --### copy of this software and associated documentation files (the "Software"), --### to deal in the Software without restriction, including without limitation --### the rights to use, copy, modify, merge, publish, distribute, sublicense, --### and/or sell copies of the Software, and to permit persons to whom the --### Software is furnished to do so, subject to the following conditions: --### --### The above copyright notice and this permission notice shall be included --### in all copies or substantial portions of the Software. --### --### THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --### IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --### FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL --### THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR --### OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --### ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --### OTHER DEALINGS IN THE SOFTWARE. --### --### For usage, run `./configure --help' --### For more detailed information on installation, read the file `INSTALL'. --### --### If configuration succeeds, status is in the file `config.status'. --### A log of configuration tests is in `config.log'. --]) -- --AC_REVISION($Revision: 1.3 $)dnl - AC_INIT(irqbalance,1.0.3) - AC_PREREQ(2.12)dnl - AM_CONFIG_HEADER(config.h) - --echo Configuring irqbalance $VERSION -- - AC_CONFIG_MACRO_DIR([m4]) --AC_CANONICAL_TARGET --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AM_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) - --AC_MSG_NOTICE() --AC_MSG_NOTICE([Checking for programs]) -- - AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_AWK -@@ -55,9 +18,6 @@ AS_IF([test "$enable_numa" = "no"],[ - ac_cv_lib_numa_numa_available=no - ]) - --AC_MSG_NOTICE --AC_MSG_NOTICE([echo Checking for header files]) -- - AC_HEADER_STDC - AC_CHECK_HEADERS([numa.h]) - -@@ -70,10 +30,57 @@ AC_C_CONST - AC_C_INLINE - AM_PROG_CC_C_O - --PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) --LIBCAP_NG_PATH -+AC_ARG_WITH([glib2], -+ [AS_HELP_STRING([--without-glib2], -+ [Don't use system glib2 library. Use local implementation instead.])], -+ [], -+ [with_glib2=check]) -+ -+local_glib2= -+AS_IF( -+ [test "x$with_glib2" = xyes], -+ [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])], -+ -+ [test "x$with_glib2" = xno], -+ [local_glib2="yes"], -+ -+ [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28], [], [local_glib2="yes"])] -+) -+ -+AS_IF( -+ [test "x$local_glib2" = xyes], -+ [ -+ GLIB_CFLAGS=-I./glib-local -+ GLIB_LIBS=glib-local/libglib.a -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_MSG_WARN(Using locale implementation of GList functions) -+ ] -+) -+ -+AM_CONDITIONAL([LOCAL_GLIB], [test "x$local_glib2" = "xyes"]) -+ -+AC_ARG_WITH([libcap-ng], -+ AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@])) -+ -+AS_IF( -+ [test "x$libcap_ng" != "xno"], -+ [ -+ PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng], -+ [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])], -+ [ -+ AS_IF( -+ [test "x$libcap_ng" = "xyes"], -+ [ -+ AC_MSG_ERROR([libcap-ng not found]) -+ ] -+ ) -+ ] -+ ) -+ ] -+) - --AC_OUTPUT(Makefile) -+AC_OUTPUT(Makefile glib-local/Makefile) - - AC_MSG_NOTICE() - AC_MSG_NOTICE([irqbalance Version: $VERSION]) -diff --git a/cputree.c b/cputree.c -index af4fd3a..9568967 100644 ---- a/cputree.c -+++ b/cputree.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2006, Intel Corporation -+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> - * - * This file is part of irqbalance - * -diff --git a/glib-local/Makefile.am b/glib-local/Makefile.am -new file mode 100644 -index 0000000..336b56e ---- /dev/null -+++ b/glib-local/Makefile.am -@@ -0,0 +1,8 @@ -+## Process this file with automake to produce Makefile.in -+noinst_LIBRARIES = libglib.a -+ -+libglib_a_SOURCES = glist.c -+ -+libglib_a_CFLAGS = @GLIB_CFLAGS@ -+ -+noinst_HEADERS = glib.h glist.h -diff --git a/glib-local/glib.h b/glib-local/glib.h -new file mode 100644 -index 0000000..5874892 ---- /dev/null -+++ b/glib-local/glib.h -@@ -0,0 +1 @@ -+#include <glist.h> -diff --git a/glib-local/glist.c b/glib-local/glist.c -new file mode 100644 -index 0000000..6fa1761 ---- /dev/null -+++ b/glib-local/glist.c -@@ -0,0 +1,381 @@ -+#include <stdlib.h> -+ -+#include "glist.h" -+ -+/** -+ * g_list_free: -+ * @list: a #GList -+ * -+ * Frees all of the memory used by a #GList. -+ * The freed elements are returned to the slice allocator. -+ * -+ * <note><para> -+ * If list elements contain dynamically-allocated memory, -+ * you should either use g_list_free_full() or free them manually -+ * first. -+ * </para></note> -+ */ -+void -+g_list_free (GList *list) -+{ -+ GList *l = list; -+ -+ while(l) { -+ GList *tmp = l->next; -+ free(l); -+ l = tmp; -+ } -+} -+ -+/** -+ * g_list_last: -+ * @list: a #GList -+ * -+ * Gets the last element in a #GList. -+ * -+ * Returns: the last element in the #GList, -+ * or %NULL if the #GList has no elements -+ */ -+GList* -+g_list_last (GList *list) -+{ -+ if (list) -+ { -+ while (list->next) -+ list = list->next; -+ } -+ -+ return list; -+} -+ -+/** -+ * g_list_append: -+ * @list: a pointer to a #GList -+ * @data: the data for the new element -+ * -+ * Adds a new element on to the end of the list. -+ * -+ * <note><para> -+ * The return value is the new start of the list, which -+ * may have changed, so make sure you store the new value. -+ * </para></note> -+ * -+ * <note><para> -+ * Note that g_list_append() has to traverse the entire list -+ * to find the end, which is inefficient when adding multiple -+ * elements. A common idiom to avoid the inefficiency is to prepend -+ * the elements and reverse the list when all elements have been added. -+ * </para></note> -+ * -+ * |[ -+ * /* Notice that these are initialized to the empty list. */ -+ * GList *list = NULL, *number_list = NULL; -+ * -+ * /* This is a list of strings. */ -+ * list = g_list_append (list, "first"); -+ * list = g_list_append (list, "second"); -+ * -+ * /* This is a list of integers. */ -+ * number_list = g_list_append (number_list, GINT_TO_POINTER (27)); -+ * number_list = g_list_append (number_list, GINT_TO_POINTER (14)); -+ * ]| -+ * -+ * Returns: the new start of the #GList -+ */ -+GList* -+g_list_append (GList *list, -+ gpointer data) -+{ -+ GList *new_list; -+ GList *last; -+ -+ new_list = malloc(sizeof(*new_list)); -+ new_list->data = data; -+ new_list->next = NULL; -+ -+ if (list) -+ { -+ last = g_list_last (list); -+ /* g_assert (last != NULL); */ -+ last->next = new_list; -+ new_list->prev = last; -+ -+ return list; -+ } -+ else -+ { -+ new_list->prev = NULL; -+ return new_list; -+ } -+} -+ -+static inline GList* -+_g_list_remove_link (GList *list, -+ GList *link) -+{ -+ if (link) -+ { -+ if (link->prev) -+ link->prev->next = link->next; -+ if (link->next) -+ link->next->prev = link->prev; -+ -+ if (link == list) -+ list = list->next; -+ -+ link->next = NULL; -+ link->prev = NULL; -+ } -+ -+ return list; -+} -+ -+/** -+ * g_list_delete_link: -+ * @list: a #GList -+ * @link_: node to delete from @list -+ * -+ * Removes the node link_ from the list and frees it. -+ * Compare this to g_list_remove_link() which removes the node -+ * without freeing it. -+ * -+ * Returns: the new head of @list -+ */ -+GList* -+g_list_delete_link (GList *list, -+ GList *link_) -+{ -+ list = _g_list_remove_link (list, link_); -+ free (link_); -+ -+ return list; -+} -+ -+/** -+ * g_list_first: -+ * @list: a #GList -+ * -+ * Gets the first element in a #GList. -+ * -+ * Returns: the first element in the #GList, -+ * or %NULL if the #GList has no elements -+ */ -+GList* -+g_list_first (GList *list) -+{ -+ if (list) -+ { -+ while (list->prev) -+ list = list->prev; -+ } -+ -+ return list; -+} -+ -+static GList * -+g_list_sort_merge (GList *l1, -+ GList *l2, -+ GFunc compare_func, -+ gpointer user_data) -+{ -+ GList list, *l, *lprev; -+ gint cmp; -+ -+ l = &list; -+ lprev = NULL; -+ -+ while (l1 && l2) -+ { -+ cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data); -+ -+ if (cmp <= 0) -+ { -+ l->next = l1; -+ l1 = l1->next; -+ } -+ else -+ { -+ l->next = l2; -+ l2 = l2->next; -+ } -+ l = l->next; -+ l->prev = lprev; -+ lprev = l; -+ } -+ l->next = l1 ? l1 : l2; -+ l->next->prev = l; -+ -+ return list.next; -+} -+ -+static GList* -+g_list_sort_real (GList *list, -+ GFunc compare_func, -+ gpointer user_data) -+{ -+ GList *l1, *l2; -+ -+ if (!list) -+ return NULL; -+ if (!list->next) -+ return list; -+ -+ l1 = list; -+ l2 = list->next; -+ -+ while ((l2 = l2->next) != NULL) -+ { -+ if ((l2 = l2->next) == NULL) -+ break; -+ l1 = l1->next; -+ } -+ l2 = l1->next; -+ l1->next = NULL; -+ -+ return g_list_sort_merge (g_list_sort_real (list, compare_func, user_data), -+ g_list_sort_real (l2, compare_func, user_data), -+ compare_func, -+ user_data); -+} -+ -+/** -+ * g_list_sort: -+ * @list: a #GList -+ * @compare_func: the comparison function used to sort the #GList. -+ * This function is passed the data from 2 elements of the #GList -+ * and should return 0 if they are equal, a negative value if the -+ * first element comes before the second, or a positive value if -+ * the first element comes after the second. -+ * -+ * Sorts a #GList using the given comparison function. -+ * -+ * Returns: the start of the sorted #GList -+ */ -+/** -+ * GCompareFunc: -+ * @a: a value. -+ * @b: a value to compare with. -+ * @Returns: negative value if @a < @b; zero if @a = @b; positive -+ * value if @a > @b. -+ * -+ * Specifies the type of a comparison function used to compare two -+ * values. The function should return a negative integer if the first -+ * value comes before the second, 0 if they are equal, or a positive -+ * integer if the first value comes after the second. -+ **/ -+GList * -+g_list_sort (GList *list, -+ GCompareFunc compare_func) -+{ -+ return g_list_sort_real (list, (GFunc) compare_func, NULL); -+ -+} -+ -+/** -+ * g_list_length: -+ * @list: a #GList -+ * -+ * Gets the number of elements in a #GList. -+ * -+ * <note><para> -+ * This function iterates over the whole list to -+ * count its elements. -+ * </para></note> -+ * -+ * Returns: the number of elements in the #GList -+ */ -+guint -+g_list_length (GList *list) -+{ -+ guint length; -+ -+ length = 0; -+ while (list) -+ { -+ length++; -+ list = list->next; -+ } -+ -+ return length; -+} -+ -+/** -+ * g_list_foreach: -+ * @list: a #GList -+ * @func: the function to call with each element's data -+ * @user_data: user data to pass to the function -+ * -+ * Calls a function for each element of a #GList. -+ */ -+/** -+ * GFunc: -+ * @data: the element's data. -+ * @user_data: user data passed to g_list_foreach() or -+ * g_slist_foreach(). -+ * -+ * Specifies the type of functions passed to g_list_foreach() and -+ * g_slist_foreach(). -+ **/ -+void -+g_list_foreach (GList *list, -+ GFunc func, -+ gpointer user_data) -+{ -+ while (list) -+ { -+ GList *next = list->next; -+ (*func) (list->data, user_data); -+ list = next; -+ } -+} -+ -+/** -+ * g_list_free_full: -+ * @list: a pointer to a #GList -+ * @free_func: the function to be called to free each element's data -+ * -+ * Convenience method, which frees all the memory used by a #GList, and -+ * calls the specified destroy function on every element's data. -+ * -+ * Since: 2.28 -+ */ -+void -+g_list_free_full (GList *list, -+ GDestroyNotify free_func) -+{ -+ g_list_foreach (list, (GFunc) free_func, NULL); -+ g_list_free (list); -+} -+ -+/** -+ * g_list_find_custom: -+ * @list: a #GList -+ * @data: user data passed to the function -+ * @func: the function to call for each element. -+ * It should return 0 when the desired element is found -+ * -+ * Finds an element in a #GList, using a supplied function to -+ * find the desired element. It iterates over the list, calling -+ * the given function which should return 0 when the desired -+ * element is found. The function takes two #gconstpointer arguments, -+ * the #GList element's data as the first argument and the -+ * given user data. -+ * -+ * Returns: the found #GList element, or %NULL if it is not found -+ */ -+GList* -+g_list_find_custom (GList *list, -+ gconstpointer data, -+ GCompareFunc func) -+{ -+ g_return_val_if_fail (func != NULL, list); -+ -+ while (list) -+ { -+ if (! func (list->data, data)) -+ return list; -+ list = list->next; -+ } -+ -+ return NULL; -+} -diff --git a/glib-local/glist.h b/glib-local/glist.h -new file mode 100644 -index 0000000..47f2cfe ---- /dev/null -+++ b/glib-local/glist.h -@@ -0,0 +1,56 @@ -+#ifndef __G_LIST_H__ -+#define __G_LIST_H__ -+ -+typedef int gint; -+typedef unsigned int guint; -+typedef void* gpointer; -+typedef const void *gconstpointer; -+typedef gint (*GCompareFunc) (gconstpointer a, -+ gconstpointer b); -+typedef gint (*GCompareDataFunc) (gconstpointer a, -+ gconstpointer b, -+ gpointer user_data); -+typedef void (*GFunc) (gpointer data, -+ gpointer user_data); -+typedef void (*GDestroyNotify) (gpointer data); -+ -+struct _GList; -+typedef struct _GList GList; -+ -+struct _GList -+{ -+ gpointer data; -+ GList *next; -+ GList *prev; -+}; -+ -+/* Doubly linked lists -+ */ -+void g_list_free (GList *list); -+GList* g_list_append (GList *list, -+ gpointer data); -+GList* g_list_delete_link (GList *list, -+ GList *link_); -+GList* g_list_first (GList *list); -+GList* g_list_sort (GList *list, -+ GCompareFunc compare_func); -+guint g_list_length (GList *list); -+void g_list_foreach (GList *list, -+ GFunc func, -+ gpointer user_data); -+void g_list_free_full (GList *list, -+ GDestroyNotify free_func); -+GList* g_list_find_custom (GList *list, -+ gconstpointer data, -+ GCompareFunc func); -+ -+#define g_list_previous(list) ((list) ? (((GList *)(list))->prev) : NULL) -+#define g_list_next(list) ((list) ? (((GList *)(list))->next) : NULL) -+ -+#define g_return_val_if_fail(expr,val) do { \ -+ if (expr) { } else \ -+ { \ -+ return (val); \ -+ } } while(0); -+ -+#endif /* __G_LIST_H__ */ -diff --git a/irqbalance.1 b/irqbalance.1 -index 55fc15f..20105bc 100644 ---- a/irqbalance.1 -+++ b/irqbalance.1 -@@ -39,7 +39,11 @@ Causes irqbalance to be run once, after which the daemon exits - .TP - - .B --debug --Causes irqbalance to run in the foreground and extra debug information to be printed -+Causes irqbalance to print extra debug information. Implies --foreground -+ -+.TP -+.B --foreground -+Causes irqbalance to run in the foreground (without --debug) - - .TP - .B --hintpolicy=[exact | subset | ignore] -@@ -62,6 +66,30 @@ average cpu softirq workload, and no cpus are more than 1 standard deviation - above (and have more than 1 irq assigned to them), attempt to place 1 cpu in - powersave mode. In powersave mode, a cpu will not have any irqs balanced to it, - in an effort to prevent that cpu from waking up without need. -+ -+.TP -+.B --banirq=<irqnum> -+Add the specified irq list to the set of banned irqs. irqbalance will not affect -+the affinity of any irqs on the banned list, allowing them to be specified -+manually. This option is addative and can be specified multiple times -+ -+.TP -+.B --banscript=<script> -+Execute the specified script for each irq that is discovered, passing the sysfs -+path to the associated device as the first argument, and the irq vector as the -+second. An exit value of 0 tells irqbalance that this interrupt should balanced -+and managed as a normal irq, while a non-zero exit code indicates this irq -+should be ignored by irqbalance completely (see --banirq above). Use of this -+script provides users the ability to dynamically select which irqs get exluded -+from balancing, and provides an opportunity for manual affinity setting in one -+single code point. -+ -+.TP -+.B --pid=<file> -+Have irqbalance write its process id to the specified file. By default no -+pidfile is written. The written pidfile is automatically unlinked when -+irqbalance exits. -+ - .SH "ENVIRONMENT VARIABLES" - .TP - .B IRQBALANCE_ONESHOT -@@ -75,9 +103,10 @@ Same as --debug - .B IRQBALANCE_BANNED_CPUS - Provides a mask of cpus which irqbalance should ignore and never assign interrupts to - -+.SH "SIGNALS" - .TP --.B IRQBALANCE_BANNED_INTERRUPTS --A list of space delimited IRQ numbers that irqbalance should not touch -+.B SIGHUP -+Forces a rescan of the available irqs and system topology - - .SH "Homepage" - http://code.google.com/p/irqbalance -diff --git a/irqbalance.c b/irqbalance.c -index 99c5db7..fbe6ac6 100644 ---- a/irqbalance.c -+++ b/irqbalance.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2006, Intel Corporation -+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> - * - * This file is part of irqbalance - * -@@ -27,6 +28,10 @@ - #include <syslog.h> - #include <unistd.h> - #include <signal.h> -+#include <time.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - #ifdef HAVE_GETOPT_LONG - #include <getopt.h> - #endif -@@ -39,12 +44,15 @@ - volatile int keep_going = 1; - int one_shot_mode; - int debug_mode; -+int foreground_mode; - int numa_avail; --int need_cpu_rescan; -+int need_rescan; - extern cpumask_t banned_cpus; - enum hp_e hint_policy = HINT_POLICY_SUBSET; - unsigned long power_thresh = ULONG_MAX; - unsigned long long cycle_count = 0; -+char *pidfile = NULL; -+char *banscript = NULL; - - void sleep_approx(int seconds) - { -@@ -64,32 +72,45 @@ void sleep_approx(int seconds) - struct option lopts[] = { - {"oneshot", 0, NULL, 'o'}, - {"debug", 0, NULL, 'd'}, -+ {"foreground", 0, NULL, 'f'}, - {"hintpolicy", 1, NULL, 'h'}, - {"powerthresh", 1, NULL, 'p'}, -+ {"banirq", 1 , NULL, 'i'}, -+ {"banscript", 1, NULL, 'b'}, -+ {"pid", 1, NULL, 's'}, - {0, 0, 0, 0} - }; - - static void usage(void) - { -- printf("irqbalance [--oneshot | -o] [--debug | -d] [--hintpolicy= | -h [exact|subset|ignore]]\n"); -- printf(" [--powerthresh= | -p <off> | <n>]\n"); -+ printf("irqbalance [--oneshot | -o] [--debug | -d] [--foreground | -f] [--hintpolicy= | -h [exact|subset|ignore]]\n"); -+ printf(" [--powerthresh= | -p <off> | <n>] [--banirq= | -i <n>]\n"); - } - - static void parse_command_line(int argc, char **argv) - { - int opt; - int longind; -+ unsigned long val; - - while ((opt = getopt_long(argc, argv, -- "odh:p:", -+ "odfh:i:p:s:", - lopts, &longind)) != -1) { - - switch(opt) { - case '?': - usage(); - exit(1); -+ break; -+ case 'b': -+ banscript = strdup(optarg); -+ break; - case 'd': - debug_mode=1; -+ foreground_mode=1; -+ break; -+ case 'f': -+ foreground_mode=1; - break; - case 'h': - if (!strncmp(optarg, "exact", strlen(optarg))) -@@ -103,6 +124,14 @@ static void parse_command_line(int argc, char **argv) - exit(1); - } - break; -+ case 'i': -+ val = strtoull(optarg, NULL, 10); -+ if (val == ULONG_MAX) { -+ usage(); -+ exit(1); -+ } -+ add_banned_irq((int)val); -+ break; - case 'p': - if (!strncmp(optarg, "off", strlen(optarg))) - power_thresh = ULONG_MAX; -@@ -117,6 +146,9 @@ static void parse_command_line(int argc, char **argv) - case 'o': - one_shot_mode=1; - break; -+ case 's': -+ pidfile = optarg; -+ break; - } - } - } -@@ -172,18 +204,34 @@ static void handler(int signum) - keep_going = 0; - } - -+static void force_rescan(int signum) -+{ -+ if (cycle_count) -+ need_rescan = 1; -+} -+ - int main(int argc, char** argv) - { -- struct sigaction action; -+ struct sigaction action, hupaction; - - #ifdef HAVE_GETOPT_LONG - parse_command_line(argc, argv); - #else -- if (argc>1 && strstr(argv[1],"--debug")) -+ if (argc>1 && strstr(argv[1],"--debug")) { - debug_mode=1; -+ foreground_mode=1; -+ } -+ if (argc>1 && strstr(argv[1],"--foreground")) -+ foreground_mode=1; - if (argc>1 && strstr(argv[1],"--oneshot")) - one_shot_mode=1; - #endif -+ -+ /* -+ * Open the syslog connection -+ */ -+ openlog(argv[0], 0, LOG_DAEMON); -+ - if (getenv("IRQBALANCE_BANNED_CPUS")) { - cpumask_parse_user(getenv("IRQBALANCE_BANNED_CPUS"), strlen(getenv("IRQBALANCE_BANNED_CPUS")), banned_cpus); - } -@@ -212,17 +260,35 @@ int main(int argc, char** argv) - - - /* On single core UP systems irqbalance obviously has no work to do */ -- if (core_count<2) -+ if (core_count<2) { -+ char *msg = "Balaincing is ineffective on systems with a " -+ "single cache domain. Shutting down\n"; -+ -+ if (debug_mode) -+ printf("%s", msg); -+ else -+ syslog(LOG_INFO, "%s", msg); - exit(EXIT_SUCCESS); -+ } - /* On dual core/hyperthreading shared cache systems just do a one shot setup */ - if (cache_domain_count==1) - one_shot_mode = 1; - -- if (!debug_mode) -+ if (!foreground_mode) { -+ int pidfd = -1; - if (daemon(0,0)) - exit(EXIT_FAILURE); -+ /* Write pidfile */ -+ if (pidfile && (pidfd = open(pidfile, -+ O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) { -+ char str[16]; -+ snprintf(str, sizeof(str), "%u\n", getpid()); -+ write(pidfd, str, strlen(str)); -+ close(pidfd); -+ } -+ } - -- openlog(argv[0], 0, LOG_DAEMON); - - #ifdef HAVE_LIBCAP_NG - // Drop capabilities -@@ -236,6 +302,11 @@ int main(int argc, char** argv) - parse_proc_interrupts(); - parse_proc_stat(); - -+ hupaction.sa_handler = force_rescan; -+ sigemptyset(&hupaction.sa_mask); -+ hupaction.sa_flags = 0; -+ sigaction(SIGHUP, &hupaction, NULL); -+ - while (keep_going) { - sleep_approx(SLEEP_INTERVAL); - if (debug_mode) -@@ -247,8 +318,8 @@ int main(int argc, char** argv) - parse_proc_stat(); - - /* cope with cpu hotplug -- detected during /proc/interrupts parsing */ -- if (need_cpu_rescan) { -- need_cpu_rescan = 0; -+ if (need_rescan) { -+ need_rescan = 0; - /* if there's a hotplug event we better turn off power mode for a bit until things settle */ - power_mode = 0; - if (debug_mode) -@@ -282,5 +353,10 @@ int main(int argc, char** argv) - - } - free_object_tree(); -+ -+ /* Remove pidfile */ -+ if (!foreground_mode && pidfile) -+ unlink(pidfile); -+ - return EXIT_SUCCESS; - } -diff --git a/irqbalance.h b/irqbalance.h -index 4e85325..e46f31f 100644 ---- a/irqbalance.h -+++ b/irqbalance.h -@@ -9,6 +9,7 @@ - #include <stdint.h> - #include <glib.h> - #include <syslog.h> -+#include <limits.h> - - #include "types.h" - #ifdef HAVE_NUMA_H -@@ -40,7 +41,6 @@ void dump_tree(void); - - void activate_mappings(void); - void account_for_nic_stats(void); --void check_power_mode(void); - void clear_cpu_tree(void); - void pci_numa_scan(void); - -@@ -64,10 +64,11 @@ enum hp_e { - extern int debug_mode; - extern int one_shot_mode; - extern int power_mode; --extern int need_cpu_rescan; -+extern int need_rescan; - extern enum hp_e hint_policy; - extern unsigned long long cycle_count; - extern unsigned long power_thresh; -+extern char *banscript; - - /* - * Numa node access routines -@@ -103,10 +104,11 @@ extern int get_cpu_count(void); - */ - extern void rebuild_irq_db(void); - extern void free_irq_db(void); -+extern void add_banned_irq(int irq); - extern void for_each_irq(GList *list, void (*cb)(struct irq_info *info, void *data), void *data); - extern struct irq_info *get_irq_info(int irq); - extern void migrate_irq(GList **from, GList **to, struct irq_info *info); --extern struct irq_info *add_misc_irq(int irq); -+extern struct irq_info *add_new_irq(int irq); - #define irq_numa_node(irq) ((irq)->numa_node) - - -diff --git a/irqlist.c b/irqlist.c -index c29ee84..2523173 100644 ---- a/irqlist.c -+++ b/irqlist.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2006, Intel Corporation -+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> - * - * This file is part of irqbalance - * -@@ -45,6 +46,7 @@ struct load_balance_info { - unsigned int num_within; - unsigned int num_over; - unsigned int num_under; -+ unsigned int num_powersave; - struct topo_obj *powersave; - }; - -@@ -106,13 +108,16 @@ static void migrate_overloaded_irqs(struct topo_obj *obj, void *data) - struct load_balance_info *info = data; - int deviation; - -+ if (obj->powersave_mode) -+ info->num_powersave++; -+ - /* - * Don't rebalance irqs on objects whos load is below the average - */ - if (obj->load <= info->avg_load) { - if ((obj->load + info->std_deviation) <= info->avg_load) { - info->num_under++; -- if (!info->powersave) -+ if (power_thresh != ULONG_MAX && !info->powersave) - if (!obj->powersave_mode) - info->powersave = obj; - } else -@@ -172,13 +177,13 @@ void update_migration_status(void) - { - struct load_balance_info info; - find_overloaded_objs(cpus, info); -- if (cycle_count > 5) { -+ if (power_thresh != ULONG_MAX && cycle_count > 5) { - if (!info.num_over && (info.num_under >= power_thresh) && info.powersave) { - syslog(LOG_INFO, "cpu %d entering powersave mode\n", info.powersave->number); - info.powersave->powersave_mode = 1; - if (g_list_length(info.powersave->interrupts) > 0) - for_each_irq(info.powersave->interrupts, force_irq_migration, NULL); -- } else if (info.num_over) { -+ } else if ((info.num_over) && (info.num_powersave)) { - syslog(LOG_INFO, "Load average increasing, re-enabling all cpus for irq balancing\n"); - for_each_object(cpus, clear_powersave_mode, NULL); - } -diff --git a/m4/cap-ng.m4 b/m4/cap-ng.m4 -deleted file mode 100644 -index 0024edc..0000000 ---- a/m4/cap-ng.m4 -+++ /dev/null -@@ -1,40 +0,0 @@ --# libcap-ng.m4 - Checks for the libcap-ng support --# Copyright (c) 2009 Steve Grubb sgrubb@redhat.com --# --AC_DEFUN([LIBCAP_NG_PATH], --[ -- AC_ARG_WITH(libcap-ng, -- [ --with-libcap-ng=[auto/yes/no] Add Libcap-ng support [default=auto]],, -- with_libcap_ng=auto) -- -- # Check for Libcap-ng API -- # -- # libcap-ng detection -- -- if test x$with_libcap_ng = xno ; then -- have_libcap_ng=no; -- else -- # Start by checking for header file -- AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no) -- -- # See if we have libcap-ng library -- AC_CHECK_LIB(cap-ng, capng_clear, -- CAPNG_LDADD=-lcap-ng,) -- -- # Check results are usable -- if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then -- AC_MSG_ERROR(libcap-ng support was requested and the library was not found) -- fi -- if test x$CAPNG_LDADD != x -a $capng_headers = no ; then -- AC_MSG_ERROR(libcap-ng libraries found but headers are missing) -- fi -- fi -- AC_SUBST(CAPNG_LDADD) -- AC_MSG_CHECKING(whether to use libcap-ng) -- if test x$CAPNG_LDADD != x ; then -- AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support]) -- AC_MSG_RESULT(yes) -- else -- AC_MSG_RESULT(no) -- fi --]) -diff --git a/misc/irqbalance.env b/misc/irqbalance.env -new file mode 100644 -index 0000000..bd87e3d ---- /dev/null -+++ b/misc/irqbalance.env -@@ -0,0 +1,26 @@ -+# irqbalance is a daemon process that distributes interrupts across -+# CPUS on SMP systems. The default is to rebalance once every 10 -+# seconds. This is the environment file that is specified to systemd via the -+# EnvironmentFile key in the service unit file (or via whatever method the init -+# system you're using has. -+# -+# ONESHOT=yes -+# after starting, wait for a minute, then look at the interrupt -+# load and balance it once; after balancing exit and do not change -+# it again. -+#IRQBALANCE_ONESHOT= -+ -+# -+# IRQBALANCE_BANNED_CPUS -+# 64 bit bitmask which allows you to indicate which cpu's should -+# be skipped when reblancing irqs. Cpu numbers which have their -+# corresponding bits set to one in this mask will not have any -+# irq's assigned to them on rebalance -+# -+#IRQBALANCE_BANNED_CPUS= -+ -+# -+# IRQBALANCE_ARGS -+# append any args here to the irqbalance daemon as documented in the man page -+# -+#IRQBALANCE_ARGS= -diff --git a/misc/irqbalance.service b/misc/irqbalance.service -index f349616..3139a83 100644 ---- a/misc/irqbalance.service -+++ b/misc/irqbalance.service -@@ -3,9 +3,8 @@ Description=irqbalance daemon - After=syslog.target - - [Service] --EnvironmentFile=/etc/sysconfig/irqbalance --Type=forking --ExecStart=/usr/sbin/irqbalance $ONESHOT -+EnvironmentFile=/path/to/irqbalance.env -+ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS - - [Install] - WantedBy=multi-user.target -diff --git a/numa.c b/numa.c -index 710ed67..96703bd 100644 ---- a/numa.c -+++ b/numa.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2006, Intel Corporation -+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> - * - * This file is part of irqbalance - * -@@ -106,11 +107,11 @@ void build_numa_node_list(void) - static void free_numa_node(gpointer data) - { - struct topo_obj *obj = data; -- if (data == &unspecified_node) -- return; -- - g_list_free(obj->children); -- free(data); -+ g_list_free(obj->interrupts); -+ -+ if (data != &unspecified_node) -+ free(data); - } - - void free_numa_node_list(void) -diff --git a/placement.c b/placement.c -index 108ccc9..1172849 100644 ---- a/placement.c -+++ b/placement.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2006, Intel Corporation -+ * Copyright (C) 2012, Neil Horman <nhoramn@tuxdriver.com> - * - * This file is part of irqbalance - * -@@ -48,7 +49,7 @@ static void find_best_object(struct topo_obj *d, void *data) - /* - * Don't consider the unspecified numa node here - */ -- if ((d->obj_type == OBJ_TYPE_NODE) && (d->number == -1)) -+ if (numa_avail && (d->obj_type == OBJ_TYPE_NODE) && (d->number == -1)) - return; - - /* -diff --git a/powermode.c b/powermode.c -deleted file mode 100644 -index 82ba490..0000000 ---- a/powermode.c -+++ /dev/null -@@ -1,34 +0,0 @@ --/* -- * Copyright (C) 2006, Intel Corporation -- * -- * This file is part of irqbalance -- * -- * This program file 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; version 2 of the License. -- * -- * This program is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- * for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program in a file named COPYING; if not, write to the -- * Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, -- * Boston, MA 02110-1301 USA -- */ --#include "config.h" --#include <stdio.h> --#include <stdlib.h> --#include <unistd.h> --#include <stdint.h> --#include <string.h> -- --#include "irqbalance.h" -- -- --void check_power_mode(void) --{ --} -- -diff --git a/procinterrupts.c b/procinterrupts.c -index 4d3b07b..431fffa 100644 ---- a/procinterrupts.c -+++ b/procinterrupts.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2006, Intel Corporation -+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> - * - * This file is part of irqbalance - * -@@ -32,6 +33,8 @@ - - #define LINESIZE 4096 - -+extern cpumask_t banned_cpus; -+ - static int proc_int_has_msi = 0; - static int msi_found_in_sysfs = 0; - -@@ -80,8 +83,12 @@ void parse_proc_interrupts(void) - c++; - number = strtoul(line, NULL, 10); - info = get_irq_info(number); -- if (!info) -- info = add_misc_irq(number); -+ if (!info) { -+ if (!cycle_count) -+ continue; -+ need_rescan = 1; -+ info = add_new_irq(number); -+ } - - count = 0; - cpunr = 0; -@@ -97,7 +104,7 @@ void parse_proc_interrupts(void) - cpunr++; - } - if (cpunr != core_count) -- need_cpu_rescan = 1; -+ need_rescan = 1; - - info->last_irq_count = info->irq_count; - info->irq_count = count; -@@ -217,6 +224,9 @@ void parse_proc_stat(void) - - cpunr = strtoul(&line[3], NULL, 10); - -+ if (cpu_isset(cpunr, banned_cpus)) -+ continue; -+ - rc = sscanf(line, "%*s %*d %*d %*d %*d %*d %d %d", &irq_load, &softirq_load); - if (rc < 2) - break; diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD deleted file mode 100644 index 8ae4c3c15..000000000 --- a/extra/ivtv-utils/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 155905 2012-04-09 00:12:19Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=ivtv-utils -pkgver=1.4.1 -pkgrel=5 -pkgdesc="Userspace utilities for Hauppauge PVR cards" -arch=('i686' 'x86_64') -license=('GPL') -url="http://ivtvdriver.org" -source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz" - "http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz") -depends=('gcc-libs') -md5sums=('3a4219d698262ca2b28e41f0f547b0a2' - 'b9a871f1c569025be9c48a77b3515faf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" PREFIX=/usr install - - cd "${srcdir}" - for file in v4l-cx2341x-dec.fw v4l-cx2341x-enc.fw v4l-pvrusb2-24xxx-01.fw v4l-pvrusb2-29xxx-01.fw v4l-cx2341x-init.mpg; do - install -D -m644 $file "${pkgdir}/usr/lib/firmware/$file" - done - - # FS#15133 - files already provided by the kernel-headers package - rm -rf "${pkgdir}"/usr/include - # Resolve conflict with v4l-utils - rm -f "${pkgdir}"/usr/bin/v4l2-ctl -} diff --git a/extra/java7-openjdk/disable_Werror.diff b/extra/java7-openjdk/disable_Werror.diff deleted file mode 100644 index fa8887a10..000000000 --- a/extra/java7-openjdk/disable_Werror.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +0200 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2012-06-14 15:32:44.967695139 +0200 -@@ -150,7 +150,7 @@ - endif - - # Compiler warnings are treated as errors --WARNINGS_ARE_ERRORS = -Werror -+#WARNINGS_ARE_ERRORS = -Werror - - # Except for a few acceptable ones - # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/extra/kdebase-workspace/fix-freeze.patch b/extra/kdebase-workspace/fix-freeze.patch deleted file mode 100644 index 1926baebc..000000000 --- a/extra/kdebase-workspace/fix-freeze.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/kwin/tabbox/clientmodel.cpp b/kwin/tabbox/clientmodel.cpp -index 9591bab..a67d979 100644 ---- a/kwin/tabbox/clientmodel.cpp -+++ b/kwin/tabbox/clientmodel.cpp -@@ -188,7 +188,7 @@ void ClientModel::createClientList(int desktop, bool partialReset) - switch(tabBox->config().clientSwitchingMode()) { - case TabBoxConfig::FocusChainSwitching: { - TabBoxClient* c = start; -- if (!c) { -+ if (!tabBox->isInFocusChain(c)) { - QSharedPointer<TabBoxClient> firstClient = tabBox->firstClientFocusChain().toStrongRef(); - if (firstClient) { - c = firstClient.data(); -diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp -index d96d0bd..7a08d37 100644 ---- a/kwin/tabbox/tabbox.cpp -+++ b/kwin/tabbox/tabbox.cpp -@@ -112,6 +112,14 @@ QWeakPointer< TabBoxClient > TabBoxHandlerImpl::firstClientFocusChain() const - } - } - -+bool TabBoxHandlerImpl::isInFocusChain(TabBoxClient *client) const -+{ -+ if (TabBoxClientImpl *c = static_cast<TabBoxClientImpl*>(client)) { -+ return Workspace::self()->globalFocusChain().contains(c->client()); -+ } -+ return false; -+} -+ - int TabBoxHandlerImpl::nextDesktopFocusChain(int desktop) const - { - return m_tabBox->nextDesktopFocusChain(desktop); -diff --git a/kwin/tabbox/tabbox.h b/kwin/tabbox/tabbox.h -index 6652f93..bba0b39 100644 ---- a/kwin/tabbox/tabbox.h -+++ b/kwin/tabbox/tabbox.h -@@ -52,6 +52,7 @@ public: - virtual QString desktopName(int desktop) const; - virtual QWeakPointer< TabBoxClient > nextClientFocusChain(TabBoxClient* client) const; - virtual QWeakPointer< TabBoxClient > firstClientFocusChain() const; -+ virtual bool isInFocusChain (TabBoxClient* client) const; - virtual int nextDesktopFocusChain(int desktop) const; - virtual int numberOfDesktops() const; - virtual TabBoxClientList stackingOrder() const; -diff --git a/kwin/tabbox/tabboxhandler.h b/kwin/tabbox/tabboxhandler.h -index 7abddfc..d9a6122 100644 ---- a/kwin/tabbox/tabboxhandler.h -+++ b/kwin/tabbox/tabboxhandler.h -@@ -119,6 +119,7 @@ public: - * @since 4.9.1 - **/ - virtual QWeakPointer<TabBoxClient> firstClientFocusChain() const = 0; -+ virtual bool isInFocusChain(TabBoxClient* client) const = 0; - /** - * @param client The client whose desktop name should be retrieved - * @return The desktop name of the given TabBoxClient. If the client is diff --git a/extra/kdebase-workspace/fix-krunner-crash.patch b/extra/kdebase-workspace/fix-krunner-crash.patch deleted file mode 100644 index 2bdf0b512..000000000 --- a/extra/kdebase-workspace/fix-krunner-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp -index ee55571..2f45153 100644 ---- a/libs/plasmagenericshell/panelshadows.cpp -+++ b/libs/plasmagenericshell/panelshadows.cpp -@@ -122,7 +122,7 @@ void PanelShadows::Private::initPixmap(const QString &element) - { - #ifdef Q_WS_X11 - QPixmap pix = q->pixmap(element); -- if (pix.handle() == 0) { -+ if (!pix.isNull() && pix.handle() == 0) { - Pixmap xPix = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), pix.width(), pix.height(), 32); - QPixmap tempPix = QPixmap::fromX11Pixmap(xPix, QPixmap::ExplicitlyShared); - tempPix.fill(Qt::transparent); diff --git a/extra/kdebase-workspace/fix-mesa9.patch b/extra/kdebase-workspace/fix-mesa9.patch deleted file mode 100644 index 4c5fca408..000000000 --- a/extra/kdebase-workspace/fix-mesa9.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 6cf057777555a5d0c834de3a0165a62916cf3b40 -Author: Fredrik Höglund <fredrik@kde.org> -Date: Tue Oct 30 18:20:00 2012 +0100 - - kwin/glx: Avoid MSAA configs in initBufferConfigs() - - It appears that we're accidentally choosing an MSAA config with the - Intel driver in Mesa 9.0. So change the algorithm to take the values - of GLX_SAMPLES and GLX_SAMPLE_BUFFERS into account. - - Found by Kenneth Graunke. - -diff --git a/kwin/scene_opengl_glx.cpp b/kwin/scene_opengl_glx.cpp -index 1fe2f18..cf7933b 100644 ---- a/kwin/scene_opengl_glx.cpp -+++ b/kwin/scene_opengl_glx.cpp -@@ -270,12 +270,15 @@ bool SceneOpenGL::initBufferConfigs() - fbcbuffer_nondb = NULL; - - for (int i = 0; i < 2; i++) { -- int back, stencil, depth, caveat, alpha; -+ int back, stencil, depth, caveat, msaa_buffers, msaa_samples, alpha; - back = i > 0 ? INT_MAX : 1; - stencil = INT_MAX; - depth = INT_MAX; - caveat = INT_MAX; -+ msaa_buffers = INT_MAX; -+ msaa_samples = INT_MAX; - alpha = 0; -+ - for (int j = 0; j < cnt; j++) { - XVisualInfo *vi; - int visual_depth; -@@ -322,10 +325,26 @@ bool SceneOpenGL::initBufferConfigs() - GLX_CONFIG_CAVEAT, &caveat_value); - if (caveat_value > caveat) - continue; -+ -+ int msaa_buffers_value; -+ glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLE_BUFFERS, -+ &msaa_buffers_value); -+ if (msaa_buffers_value > msaa_buffers) -+ continue; -+ -+ int msaa_samples_value; -+ glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLES, -+ &msaa_samples_value); -+ if (msaa_samples_value > msaa_samples) -+ continue; -+ - back = back_value; - stencil = stencil_value; - depth = depth_value; - caveat = caveat_value; -+ msaa_buffers = msaa_buffers_value; -+ msaa_samples = msaa_samples_value; -+ - if (i > 0) - fbcbuffer_nondb = fbconfigs[ j ]; - else diff --git a/extra/kdebase-workspace/fixpath.patch b/extra/kdebase-workspace/fixpath.patch deleted file mode 100644 index be2b8383e..000000000 --- a/extra/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/extra/kdebase-workspace/kdm b/extra/kdebase-workspace/kdm deleted file mode 100644 index 799d58f4b..000000000 --- a/extra/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/extra/kdebase-workspace/logind-support.patch b/extra/kdebase-workspace/logind-support.patch deleted file mode 100644 index 9de205400..000000000 --- a/extra/kdebase-workspace/logind-support.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Lukas Tinkl <lukas@kde.org> -Date: Fri, 05 Oct 2012 09:57:13 +0000 -Subject: store the filedescriptor in a member variable -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1 ---- -store the filedescriptor in a member variable - -make systemd-inhibit work as intended, PowerDevil now handles -power/sleep/lid buttons as intended - -BUG: 307412 ---- - - ---- a/powerdevil/daemon/powerdevilpolicyagent.cpp -+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp -@@ -29,7 +29,6 @@ - #include <QtDBus/QDBusPendingReply> - #include <QtDBus/QDBusConnectionInterface> - #include <QtDBus/QDBusServiceWatcher> --#include <QtDBus/QDBusUnixFileDescriptor> - - #include <KGlobal> - #include <KDebug> -@@ -225,6 +224,9 @@ - onActiveSessionChanged(m_activeSessionPath); - - // inhibit systemd handling of power/sleep/lid buttons -+ // http://www.freedesktop.org/wiki/Software/systemd/inhibit -+ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); -+ - QVariantList args; - args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what - args << "PowerDevil"; // who -@@ -232,8 +234,9 @@ - args << "block"; // mode - QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args); - desc.waitForFinished(); -- if (desc.isValid() && desc.value().isValid()) { -- kDebug() << "systemd powersave events handling inhibited"; -+ if (desc.isValid()) { -+ m_systemdInhibitFd = desc.value(); -+ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); - } - else - kWarning() << "failed to inhibit systemd powersave handling"; - ---- a/powerdevil/daemon/powerdevilpolicyagent.h -+++ b/powerdevil/daemon/powerdevilpolicyagent.h -@@ -27,6 +27,7 @@ - #include <QtCore/QWeakPointer> - - #include <QtDBus/QDBusContext> -+#include <QtDBus/QDBusUnixFileDescriptor> - - #include <kdemacros.h> - -@@ -108,6 +109,7 @@ - QString m_activeSessionPath; - QWeakPointer< QDBusInterface > m_sdSessionInterface; - QWeakPointer< QDBusInterface > m_sdSeatInterface; -+ QDBusUnixFileDescriptor m_systemdInhibitFd; - - // ConsoleKit support - bool m_ckAvailable; - diff --git a/extra/kdebase-workspace/logind-support2.patch b/extra/kdebase-workspace/logind-support2.patch deleted file mode 100644 index e36757f6a..000000000 --- a/extra/kdebase-workspace/logind-support2.patch +++ /dev/null @@ -1,124 +0,0 @@ -commit 80e9e6e48ff5b84962f3a8543ee06bcd4f122623 -Author: Lukáš Tinkl <lukas@kde.org> -Date: Tue Oct 30 11:32:52 2012 +0100 - - move systemd inhibition initialization to a slot - - and call it on resume. It looks like the filedescriptor - goes away when you suspend so we need to recreate it. - - BUG: 307412 - -diff --git a/powerdevil/daemon/powerdevilcore.cpp b/powerdevil/daemon/powerdevilcore.cpp -index df79667..7f24cbb 100644 ---- a/powerdevil/daemon/powerdevilcore.cpp -+++ b/powerdevil/daemon/powerdevilcore.cpp -@@ -127,8 +127,6 @@ void Core::onBackendReady() - this, SLOT(onAcAdapterStateChanged(PowerDevil::BackendInterface::AcAdapterState))); - connect(m_backend, SIGNAL(batteryRemainingTimeChanged(qulonglong)), - this, SLOT(onBatteryRemainingTimeChanged(qulonglong))); -- connect(m_backend, SIGNAL(resumeFromSuspend()), -- this, SLOT(onResumeFromSuspend())); - connect(KIdleTime::instance(), SIGNAL(timeoutReached(int,int)), - this, SLOT(onKIdleTimeoutReached(int,int))); - connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()), -@@ -139,6 +137,9 @@ void Core::onBackendReady() - // Set up the policy agent - PowerDevil::PolicyAgent::instance()->init(); - -+ connect(m_backend, SIGNAL(resumeFromSuspend()), -+ this, SLOT(onResumeFromSuspend())); -+ - // Initialize the action pool, which will also load the needed startup actions. - PowerDevil::ActionPool::instance()->init(this); - -@@ -601,6 +602,7 @@ void Core::onResumeFromSuspend() - "/ScreenSaver", - QDBusConnection::sessionBus()); - iface.SimulateUserActivity(); -+ PowerDevil::PolicyAgent::instance()->setupSystemdInhibition(); - - emit resumingFromSuspend(); - } -diff --git a/powerdevil/daemon/powerdevilpolicyagent.cpp b/powerdevil/daemon/powerdevilpolicyagent.cpp -index 70588db..0777846 100644 ---- a/powerdevil/daemon/powerdevilpolicyagent.cpp -+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp -@@ -88,6 +88,7 @@ PolicyAgent *PolicyAgent::instance() - PolicyAgent::PolicyAgent(QObject* parent) - : QObject(parent) - , m_sdAvailable(false) -+ , m_systemdInhibitFd(-1) - , m_ckAvailable(false) - , m_sessionIsBeingInterrupted(false) - , m_lastCookie(0) -@@ -223,23 +224,7 @@ void PolicyAgent::onSessionHandlerRegistered(const QString & serviceName) - - onActiveSessionChanged(m_activeSessionPath); - -- // inhibit systemd handling of power/sleep/lid buttons -- // http://www.freedesktop.org/wiki/Software/systemd/inhibit -- kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); -- -- QVariantList args; -- args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what -- args << "PowerDevil"; // who -- args << "KDE handles power events"; // why -- args << "block"; // mode -- QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args); -- desc.waitForFinished(); -- if (desc.isValid()) { -- m_systemdInhibitFd = desc.value(); -- kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); -- } -- else -- kWarning() << "failed to inhibit systemd powersave handling"; -+ setupSystemdInhibition(); - - kDebug() << "systemd support initialized"; - } else if (serviceName == CONSOLEKIT_SERVICE) { -@@ -552,6 +537,31 @@ void PolicyAgent::releaseAllInhibitions() - } - } - -+void PolicyAgent::setupSystemdInhibition() -+{ -+ if (m_systemdInhibitFd.fileDescriptor() != -1) -+ return; -+ -+ // inhibit systemd handling of power/sleep/lid buttons -+ // http://www.freedesktop.org/wiki/Software/systemd/inhibit -+ QDBusInterface managerIface(SYSTEMD_LOGIN1_SERVICE, SYSTEMD_LOGIN1_PATH, SYSTEMD_LOGIN1_MANAGER_IFACE, QDBusConnection::systemBus()); -+ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); -+ -+ QVariantList args; -+ args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what -+ args << "PowerDevil"; // who -+ args << "KDE handles power events"; // why -+ args << "block"; // mode -+ QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args); -+ desc.waitForFinished(); -+ if (desc.isValid()) { -+ m_systemdInhibitFd = desc.value(); -+ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); -+ } -+ else -+ kWarning() << "failed to inhibit systemd powersave handling"; -+} -+ - } - - #include "powerdevilpolicyagent.moc" -diff --git a/powerdevil/daemon/powerdevilpolicyagent.h b/powerdevil/daemon/powerdevilpolicyagent.h -index a046497..f1e8c03 100644 ---- a/powerdevil/daemon/powerdevilpolicyagent.h -+++ b/powerdevil/daemon/powerdevilpolicyagent.h -@@ -74,6 +74,8 @@ public: - - RequiredPolicies unavailablePolicies(); - -+ void setupSystemdInhibition(); -+ - public Q_SLOTS: - // Exported slots - uint AddInhibition(uint types, const QString &appName, const QString &reason); diff --git a/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff b/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff deleted file mode 100644 index 9f328ec60..000000000 --- a/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff +++ /dev/null @@ -1,232 +0,0 @@ -diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp -index f92cab5..af16954 100644 ---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp -+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp -@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor - m_additionalInfoTextColor(), - m_overlay(), - m_rating(), -- m_roleEditor(0) -+ m_roleEditor(0), -+ m_oldRoleEditor(0) - { - } - -@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget() - m_textInfo.clear(); - - delete m_roleEditor; -+ delete m_oldRoleEditor; - } - - void KStandardItemListWidget::setLayout(Layout layout) -@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const - this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant))); - disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), - this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); -- // Do not delete the role editor using deleteLater() because we might be -- // inside a nested event loop which has been started by one of its event -- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()). -- m_roleEditor->deleteWhenIdle(); -+ m_oldRoleEditor = m_roleEditor; -+ m_roleEditor->hide(); - m_roleEditor = 0; - } - return; -+ } else if (m_oldRoleEditor) { -+ // Delete the old editor before constructing the new one to -+ // prevent a memory leak. -+ m_oldRoleEditor->deleteLater(); -+ m_oldRoleEditor = 0; - } - - Q_ASSERT(!m_roleEditor); -@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const - - void KStandardItemListWidget::closeRoleEditor() - { -+ disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)), -+ this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant))); -+ disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), -+ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); -+ - if (m_roleEditor->hasFocus()) { - // If the editing was not ended by a FocusOut event, we have - // to transfer the keyboard focus back to the KItemListContainer. - scene()->views()[0]->parentWidget()->setFocus(); - } - -- disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)), -- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant))); -- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), -- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); -- -- // Do not delete the role editor using deleteLater() because we might be -- // inside a nested event loop which has been started by one of its event -- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()). -- m_roleEditor->deleteWhenIdle(); -+ m_oldRoleEditor = m_roleEditor; -+ m_roleEditor->hide(); - m_roleEditor = 0; - } - -diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h -index 787722d..386f60e 100644 ---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h -+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h -@@ -241,6 +241,7 @@ private: - QPixmap m_rating; - - KItemListRoleEditor* m_roleEditor; -+ KItemListRoleEditor* m_oldRoleEditor; - - friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to - // share a common layout calculation -diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp -index 78dbfe9..1e4b5fd 100644 ---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp -+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp -@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) : - KTextEdit(parent), - m_index(0), - m_role(), -- m_blockFinishedSignal(false), -- m_eventHandlingLevel(0), -- m_deleteAfterEventHandling(false) -+ m_blockFinishedSignal(false) - { - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); -@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const - return m_role; - } - --void KItemListRoleEditor::deleteWhenIdle() --{ -- if (m_eventHandlingLevel > 0) { -- // We are handling an event at the moment. It could be that we -- // are in a nested event loop run by contextMenuEvent() or a -- // call of mousePressEvent() which results in drag&drop. -- // -> do not call deleteLater() to prevent a crash when we -- // return from the nested event loop. -- m_deleteAfterEventHandling = true; -- } else { -- deleteLater(); -- } --} -- - bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event) - { - if (watched == parentWidget() && event->type() == QEvent::Resize) { -@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event) - - bool KItemListRoleEditor::event(QEvent* event) - { -- ++m_eventHandlingLevel; -- - if (event->type() == QEvent::FocusOut) { - QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event); - if (focusEvent->reason() != Qt::PopupFocusReason) { - emitRoleEditingFinished(); - } - } -- -- const int result = KTextEdit::event(event); -- --m_eventHandlingLevel; -- -- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) { -- // Schedule this object for deletion and make sure that we do not try -- // to deleteLater() again when the DeferredDelete event is received. -- deleteLater(); -- m_deleteAfterEventHandling = false; -- } -- -- return result; --} -- --bool KItemListRoleEditor::viewportEvent(QEvent* event) --{ -- ++m_eventHandlingLevel; -- const bool result = KTextEdit::viewportEvent(event); -- --m_eventHandlingLevel; -- -- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) { -- // Schedule this object for deletion and make sure that we do not try -- // to deleteLater() again when the DeferredDelete event is received. -- deleteLater(); -- m_deleteAfterEventHandling = false; -- } -- -- return result; -+ return KTextEdit::event(event); - } - - void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) -@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) - return; - case Qt::Key_Enter: - case Qt::Key_Return: -- // TODO: find a better way to fix the bug 309760 -- clearFocus(); // emitRoleEditingFinished(); results in a crash -+ emitRoleEditingFinished(); - event->accept(); - return; - default: -diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h -index a2f7058..aa2c977 100644 ---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h -+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h -@@ -47,15 +47,6 @@ public: - void setRole(const QByteArray& role); - QByteArray role() const; - -- /** -- * Calls deleteLater() if no event is being handled at the moment. -- * Otherwise, the deletion is deferred until the event handling is -- * finished. This prevents that the deletion happens inside a nested -- * event loop which might be run in contextMenuEvent() or -- * mouseMoveEvent() because this would probably cause a crash. -- */ -- void deleteWhenIdle(); -- - virtual bool eventFilter(QObject* watched, QEvent* event); - - signals: -@@ -64,7 +55,6 @@ signals: - - protected: - virtual bool event(QEvent* event); -- virtual bool viewportEvent(QEvent* event); - virtual void keyPressEvent(QKeyEvent* event); - - private slots: -@@ -85,8 +75,6 @@ private: - int m_index; - QByteArray m_role; - bool m_blockFinishedSignal; -- int m_eventHandlingLevel; -- bool m_deleteAfterEventHandling; - }; - - #endif -diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp -index 70a7394..0e97c5a 100644 ---- a/dolphin/src/views/dolphinview.cpp -+++ b/dolphin/src/views/dolphinview.cpp -@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState() - - QSet<int> selectedItems = selectionManager->selectedItems(); - -- for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) { -+ QList<KUrl>::iterator it = m_selectedUrls.begin(); -+ while (it != m_selectedUrls.end()) { - const int index = m_model->index(*it); - if (index >= 0) { - selectedItems.insert(index); -- m_selectedUrls.erase(it); -+ it = m_selectedUrls.erase(it); -+ } else { -+ ++it; - } - } - diff --git a/extra/kdebindings-korundum/korundum-4.8.0-ruby19.patch b/extra/kdebindings-korundum/korundum-4.8.0-ruby19.patch deleted file mode 100644 index ac4d32ae9..000000000 --- a/extra/kdebindings-korundum/korundum-4.8.0-ruby19.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 korundum-4.8.0/src/krubypluginfactory.cpp ---- korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 2011-07-27 13:37:29.000000000 -0500 -+++ korundum-4.8.0/src/krubypluginfactory.cpp 2012-02-17 08:30:38.785635819 -0600 -@@ -39,7 +39,7 @@ - extern "C" { - extern VALUE rb_load_path; - extern VALUE qt_internal_module; --void Init_prelude(void); -+// void Init_prelude(void); - } - - // -@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+// Init_prelude(); - #endif - - ruby_incpush(QFile::encodeName(program.path())); -@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv) - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+// Init_prelude(); - #endif - - ruby_incpush(QFile::encodeName(program.path())); diff --git a/extra/kdebindings-python/pyqt495.patch b/extra/kdebindings-python/pyqt495.patch deleted file mode 100644 index b8a9df258..000000000 --- a/extra/kdebindings-python/pyqt495.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Luca Beltrame <lbeltrame@kde.org> -Date: Mon, 01 Oct 2012 18:47:56 +0000 -Subject: Remove duplicated QVector<int> definition, since it's in PyQt now. -X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 ---- -Remove duplicated QVector<int> definition, since it's in PyQt now. -Simon, if you have time, please review if everything is OK. - -CCMAIL: simon@simonzone.com ---- - - ---- a/sip/kdecore/typedefs.sip -+++ b/sip/kdecore/typedefs.sip -@@ -951,78 +951,4 @@ - %End - }; - --%MappedType QVector<int> --{ --%TypeHeaderCode --#include <qvector.h> --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- for (int i = 0; i < sipCpp->size(); ++i) -- { -- int t = (sipCpp->at(i)); -- --#if PY_MAJOR_VERSION >= 3 -- PyObject *tobj = PyLong_FromLong(t); --#else -- PyObject *tobj = PyInt_FromLong(t); --#endif -- -- PyList_SET_ITEM(l, i, tobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- { -- if (!PyList_Check(sipPy)) -- return 0; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); --#if PY_MAJOR_VERSION >= 3 -- if (!PyNumber_Check(tobj)) --#else -- if (!PyInt_Check(tobj)) --#endif -- return 0; -- } -- return 1; -- } -- -- QVector<int> *qv = new QVector<int>; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); -- #if PY_MAJOR_VERSION >= 3 -- int t = PyLong_AsLong (tobj); --#else -- int t = PyInt_AS_LONG (tobj); --#endif -- -- if (*sipIsErr) -- { -- delete qv; -- return 0; -- } -- -- qv->append(t); -- } -- -- *sipCppPtr = qv; -- -- return sipGetState(sipTransferObj); --%End --}; -- -+ - diff --git a/extra/kdebindings-qyoto/cmake2810.patch b/extra/kdebindings-qyoto/cmake2810.patch deleted file mode 100644 index 9c0343a27..000000000 --- a/extra/kdebindings-qyoto/cmake2810.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10 qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake ---- qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10 2012-08-13 04:00:53.000000000 -0500 -+++ qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake 2012-11-06 15:31:18.719822193 -0600 -@@ -84,6 +84,9 @@ endif (CMAKE_CSharp_COMPILER) - get_filename_component(script_dir ${CMAKE_CURRENT_LIST_FILE} PATH) - - # configure variables set in this file for fast reload later on --configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in -- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY) -+ if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10 -+ set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}) -+ endif() -+ configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in -+ ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY) - set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC") diff --git a/extra/kdeedu-kalzium/fix-linking.patch b/extra/kdeedu-kalzium/fix-linking.patch deleted file mode 100644 index 6b0c1df7c..000000000 --- a/extra/kdeedu-kalzium/fix-linking.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit ffac09556f6f3d5d758bac9ba2b91117e6014ea7 -Author: Christoph Feck <christoph@maxiom.de> -Date: Fri Nov 2 17:31:48 2012 +0100 - - SVN_SILENT link - - If possible, please include this build fix in 4.9.3 tag. - - BUG: 308939 - CCMAIL: kde-release-team@kde.org - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 03eabf3..c8f425a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -138,7 +138,7 @@ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KD - if (OPENBABEL2_FOUND) - target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES}) - if (EIGEN2_FOUND AND Avogadro_FOUND) -- target_link_libraries(kalzium compoundviewer avogadro) -+ target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro) - endif (EIGEN2_FOUND AND Avogadro_FOUND) - endif (OPENBABEL2_FOUND) - diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD deleted file mode 100644 index 6e58f035d..000000000 --- a/extra/kdegames/PKGBUILD +++ /dev/null @@ -1,435 +0,0 @@ -# $Id: PKGBUILD 174692 2013-01-05 13:21:25Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdegames -pkgname=('kdegames-bomber' - 'kdegames-bovo' - 'kdegames-granatier' - 'kdegames-kajongg' - 'kdegames-kapman' - 'kdegames-katomic' - 'kdegames-kblackbox' - 'kdegames-kblocks' - 'kdegames-kbounce' - 'kdegames-kbreakout' - 'kdegames-kdiamond' - 'kdegames-kfourinline' - 'kdegames-kgoldrunner' - 'kdegames-kigo' - 'kdegames-killbots' - 'kdegames-kiriki' - 'kdegames-kjumpingcube' - 'kdegames-klines' - 'kdegames-klickety' - 'kdegames-kmahjongg' - 'kdegames-kmines' - 'kdegames-knavalbattle' - 'kdegames-knetwalk' - 'kdegames-kolf' - 'kdegames-kollision' - 'kdegames-konquest' - 'kdegames-kpatience' - 'kdegames-kreversi' - 'kdegames-kshisen' - 'kdegames-ksirk' - 'kdegames-ksnakeduel' - 'kdegames-kspaceduel' - 'kdegames-ksquares' - 'kdegames-ksudoku' - 'kdegames-ktuberling' - 'kdegames-kubrick' - 'kdegames-libkdegames' - 'kdegames-libkmahjongg' - 'kdegames-lskat' - 'kdegames-palapeli') -pkgver=4.9.5 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegames') -makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2' - 'openal' 'mesa') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('fffc38218cf81247fd19f700e6d42066eb9faa99') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package_kdegames-bomber() { - pkgdesc='Arcade Bombing Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/bomber/" - install='kdegames.install' - cd $srcdir/build/bomber - make DESTDIR=$pkgdir install -} - -package_kdegames-bovo() { - pkgdesc='Five-in-a-row Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/bovo/" - install='kdegames.install' - cd $srcdir/build/bovo - make DESTDIR=$pkgdir install -} - -package_kdegames-granatier() { - pkgdesc='Granatier' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') - url="http://kde.org/applications/games/granatier/" - install='kdegames.install' - cd $srcdir/build/granatier - make DESTDIR=$pkgdir install -} - -package_kdegames-kajongg() { - pkgdesc='The ancient Chinese board game for 4 players' - depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted') - url="http://www.kde.org/applications/games/kajongg/" - install='kdegames.install' - cd $srcdir/build/kajongg - make DESTDIR=$pkgdir install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} - -package_kdegames-kapman() { - pkgdesc='Eat pills escaping ghosts' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kapman/" - install='kdegames.install' - cd $srcdir/build/kapman - make DESTDIR=$pkgdir install -} - -package_kdegames-katomic() { - pkgdesc='Sokoban-like Logic Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/katomic/" - install='kdegames.install' - cd $srcdir/build/katomic - make DESTDIR=$pkgdir install -} - -package_kdegames-knavalbattle() { - pkgdesc='Naval Battle' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/knavalbattle/" - install='kdegames-knavalbattle.install' - replaces=('kdegames-kbattleship') - conflicts=('kdegames-kbattleship') - cd $srcdir/build/knavalbattle - make DESTDIR=$pkgdir install -} - -package_kdegames-kblackbox() { - pkgdesc='Blackbox Logic Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kblackbox/" - install='kdegames.install' - cd $srcdir/build/kblackbox - make DESTDIR=$pkgdir install -} - -package_kdegames-kblocks() { - pkgdesc='Falling Blocks Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kblocks/" - install='kdegames.install' - cd $srcdir/build/kblocks - make DESTDIR=$pkgdir install -} - -package_kdegames-kbounce() { - pkgdesc='Ball Bouncing Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbounce/" - install='kdegames.install' - cd $srcdir/build/kbounce - make DESTDIR=$pkgdir install -} - -package_kdegames-kbreakout() { - pkgdesc='Breakout-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbreakout/" - install='kdegames.install' - cd $srcdir/build/kbreakout - make DESTDIR=$pkgdir install -} - -package_kdegames-kdiamond() { - pkgdesc='Three-in-a-row game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kdiamond/" - install='kdegames.install' - cd $srcdir/build/kdiamond - make DESTDIR=$pkgdir install -} - -package_kdegames-kfourinline() { - pkgdesc='Four-in-a-row Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kfourinline/" - install='kdegames-kfourinline.install' - cd $srcdir/build/kfourinline - make DESTDIR=$pkgdir install -} - -package_kdegames-kgoldrunner() { - pkgdesc='A game of action and puzzle-solving' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') - url="http://kde.org/applications/games/kgoldrunner/" - install='kdegames.install' - cd $srcdir/build/kgoldrunner - make DESTDIR=$pkgdir install -} - -package_kdegames-kigo() { - pkgdesc='Go Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') - url="http://kde.org/applications/games/kigo/" - install='kdegames-kigo.install' - cd $srcdir/build/kigo - make DESTDIR=$pkgdir install -} - -package_kdegames-killbots() { - pkgdesc='Killbots' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/killbots/" - install='kdegames.install' - cd $srcdir/build/killbots - make DESTDIR=$pkgdir install -} - -package_kdegames-kiriki() { - pkgdesc='Yahtzee-like Dice Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kiriki/" - install='kdegames.install' - cd $srcdir/build/kiriki - make DESTDIR=$pkgdir install -} - -package_kdegames-kjumpingcube() { - pkgdesc='Territory Capture Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kjumpingcube/" - install='kdegames.install' - cd $srcdir/build/kjumpingcube - make DESTDIR=$pkgdir install -} - -package_kdegames-klickety() { - pkgdesc='Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - replaces=('kdegames-ksame') - conflicts=('kdegames-ksame') - url="http://kde.org/applications/games/ksame/" - install='kdegames.install' - cd $srcdir/build/klickety - make DESTDIR=$pkgdir install -} - -package_kdegames-klines() { - pkgdesc='Tactical Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/klines/" - install='kdegames.install' - cd $srcdir/build/klines - make DESTDIR=$pkgdir install -} - -package_kdegames-kmahjongg() { - pkgdesc='Mahjongg Solitaire' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') - url="http://kde.org/applications/games/kmahjongg/" - install='kdegames.install' - cd $srcdir/build/kmahjongg - make DESTDIR=$pkgdir install -} - -package_kdegames-kmines() { - pkgdesc='Minesweeper-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kmines/" - install='kdegames.install' - cd $srcdir/build/kmines - make DESTDIR=$pkgdir install -} - -package_kdegames-knetwalk() { - pkgdesc='Network Construction Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/knetwalk/" - install='kdegames.install' - cd $srcdir/build/knetwalk - make DESTDIR=$pkgdir install -} - -package_kdegames-kolf() { - pkgdesc='Miniature Golf' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kolf/" - install='kdegames-kolf.install' - cd $srcdir/build/kolf - make DESTDIR=$pkgdir install -} - -package_kdegames-kollision() { - pkgdesc='A simple ball dodging game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kollision/" - install='kdegames.install' - cd $srcdir/build/kollision - make DESTDIR=$pkgdir install -} - -package_kdegames-konquest() { - pkgdesc='Galactic Strategy Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/konquest/" - install='kdegames.install' - cd $srcdir/build/konquest - make DESTDIR=$pkgdir install -} - -package_kdegames-kpatience() { - pkgdesc='Patience Card Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kpatience/" - install='kdegames-kpatience.install' - replaces=('kdegames-kpat') - cd $srcdir/build/kpat - make DESTDIR=$pkgdir install -} - -package_kdegames-kreversi() { - pkgdesc='Reversi Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kreversi/" - install='kdegames.install' - cd $srcdir/build/kreversi - make DESTDIR=$pkgdir install -} - -package_kdegames-kshisen() { - pkgdesc='Shisen-Sho Mahjongg-like Tile Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') - url="http://kde.org/applications/games/kshisen/" - install='kdegames.install' - cd $srcdir/build/kshisen - make DESTDIR=$pkgdir install -} - -package_kdegames-ksirk() { - pkgdesc='World Domination Strategy Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksirk/" - install='kdegames.install' - cd $srcdir/build/ksirk - make DESTDIR=$pkgdir install -} - -package_kdegames-kspaceduel() { - pkgdesc='Space Arcade Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kspaceduel/" - install='kdegames-kspaceduel.install' - cd $srcdir/build/kspaceduel - make DESTDIR=$pkgdir install -} - -package_kdegames-ksquares() { - pkgdesc='Connect the dots to create squares' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksquares/" - install='kdegames.install' - cd $srcdir/build/ksquares - make DESTDIR=$pkgdir install -} - -package_kdegames-ksudoku() { - pkgdesc='KSudoku, Sudoku game & more for KDE' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksudoku/" - install='kdegames.install' - cd $srcdir/build/ksudoku - make DESTDIR=$pkgdir install -} - -package_kdegames-ksnakeduel() { - pkgdesc='Snake-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksnakeduel/" - install='kdegames.install' - replaces=('kdegames-ktron') - conflicts=('kdegames-ktron') - cd $srcdir/build/ksnakeduel - make DESTDIR=$pkgdir install -} - -package_kdegames-ktuberling() { - pkgdesc='Picture Game for Children' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ktuberling/" - install='kdegames-ktuberling.install' - cd $srcdir/build/ktuberling - make DESTDIR=$pkgdir install -} - -package_kdegames-kubrick() { - pkgdesc='A 3-D game based on Rubik´s Cube' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kubrick/" - install='kdegames.install' - cd $srcdir/build/kubrick - make DESTDIR=$pkgdir install -} - -package_kdegames-libkdegames() { - pkgdesc='KDE game library' - groups=() - depends=('kdelibs' 'openal') - cd $srcdir/build/libkdegames - make DESTDIR=$pkgdir install -} - -package_kdegames-libkmahjongg() { - pkgdesc='Library used for loading and rendering of Mahjongg tilesets' - groups=() - depends=('kdelibs') - cd $srcdir/build/libkmahjongg - make DESTDIR=$pkgdir install -} - -package_kdegames-lskat() { - pkgdesc='Card Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/lskat/" - install='kdegames-lskat.install' - cd $srcdir/build/lskat - make DESTDIR=$pkgdir install -} - -package_kdegames-palapeli() { - pkgdesc='Jigsaw puzzle game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/palapeli/" - install='kdegames-palapeli.install' - cd $srcdir/build/palapeli - make DESTDIR=$pkgdir install -} diff --git a/extra/kdegames/kdegames-kbattleship.install b/extra/kdegames/kdegames-kbattleship.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/extra/kdegames/kdegames-kbattleship.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-kfourinline.install b/extra/kdegames/kdegames-kfourinline.install deleted file mode 100644 index 9b20edb30..000000000 --- a/extra/kdegames/kdegames-kfourinline.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-kigo.install b/extra/kdegames/kdegames-kigo.install deleted file mode 100644 index 9b20edb30..000000000 --- a/extra/kdegames/kdegames-kigo.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-knavalbattle.install b/extra/kdegames/kdegames-knavalbattle.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/extra/kdegames/kdegames-knavalbattle.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-kolf.install b/extra/kdegames/kdegames-kolf.install deleted file mode 100644 index 9b20edb30..000000000 --- a/extra/kdegames/kdegames-kolf.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-kpatience.install b/extra/kdegames/kdegames-kpatience.install deleted file mode 100644 index 3af34a012..000000000 --- a/extra/kdegames/kdegames-kpatience.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-kreversi.install b/extra/kdegames/kdegames-kreversi.install deleted file mode 100644 index 4623e6e49..000000000 --- a/extra/kdegames/kdegames-kreversi.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/kreversi.dsc ]; then - ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/extra/kdegames/kdegames-kspaceduel.install b/extra/kdegames/kdegames-kspaceduel.install deleted file mode 100644 index 9b20edb30..000000000 --- a/extra/kdegames/kdegames-kspaceduel.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-ksquares.install b/extra/kdegames/kdegames-ksquares.install deleted file mode 100644 index 5a619897d..000000000 --- a/extra/kdegames/kdegames-ksquares.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/ksquares.dsc ]; then - ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/extra/kdegames/kdegames-ktuberling.install b/extra/kdegames/kdegames-ktuberling.install deleted file mode 100644 index 9b20edb30..000000000 --- a/extra/kdegames/kdegames-ktuberling.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-lskat.install b/extra/kdegames/kdegames-lskat.install deleted file mode 100644 index 9b20edb30..000000000 --- a/extra/kdegames/kdegames-lskat.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames-palapeli.install b/extra/kdegames/kdegames-palapeli.install deleted file mode 100644 index c77e68041..000000000 --- a/extra/kdegames/kdegames-palapeli.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdegames/kdegames.install b/extra/kdegames/kdegames.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdegames/kdegames.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch deleted file mode 100644 index 5aadeb883..000000000 --- a/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Wed, 5 Dec 2012 22:42:25 +0100 -Subject: [PATCH] Revert "Also check parent mimetypes in - protocolForArchiveMimetype()." - -This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05. -It breaks opening odt and other zip-based files in external apps. -That's what I get for delegating the testing :-) -BUG: 311214 ---- - kio/kio/kprotocolmanager.cpp | 19 +------------------ - 1 files changed, 1 insertions(+), 18 deletions(-) - -diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp -index 3f1cadd..502a3e6 100644 ---- a/kio/kio/kprotocolmanager.cpp -+++ b/kio/kio/kprotocolmanager.cpp -@@ -47,7 +47,6 @@ - #include <ksharedconfig.h> - #include <kstandarddirs.h> - #include <kurl.h> --#include <kmimetype.h> - #include <kmimetypetrader.h> - #include <kprotocolinfofactory.h> - -@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType ) - } - } - } -- const QString prot = d->protocolForArchiveMimetypes.value(mimeType); -- if (!prot.isEmpty()) -- return prot; -- -- // Check parent mimetypes -- KMimeType::Ptr mime = KMimeType::mimeType(mimeType); -- if (mime) { -- const QStringList parentMimeTypes = mime->allParentMimeTypes(); -- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) { -- const QString res = d->protocolForArchiveMimetypes.value(parentMimeType); -- if (!res.isEmpty()) { -- return res; -- } -- } -- } -- -- return QString(); -+ return d->protocolForArchiveMimetypes.value(mimeType); - } - - #undef PRIVATE_DATA --- -1.7.7 diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD deleted file mode 100644 index 4d7f51fa5..000000000 --- a/extra/kdelibs/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 173891 2012-12-27 10:11:14Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdelibs -pkgver=4.9.4 -pkgrel=4 -pkgdesc="KDE Core Libraries" -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/kdelibs' -license=('GPL' 'LGPL' 'FDL') -depends=('strigi' 'attica' 'libxss' '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' - 'media-player-info' 'libxtst' 'libutempter') -makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'archlinux-menu.patch' - '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' - 'fix-crash-on-open-with.patch') -sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' - '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07') - -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 - - # Fixed upstream - patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch - patch -p1 -i "${srcdir}"/fix-crash-on-open-with.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 \ - -DWITH_HUpnp=OFF - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt -} diff --git a/extra/kdelibs/archlinux-menu.patch b/extra/kdelibs/archlinux-menu.patch deleted file mode 100644 index 546784fa2..000000000 --- a/extra/kdelibs/archlinux-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 -+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 -@@ -16,11 +16,19 @@ - </DefaultLayout> - <Layout> - <Merge type="menus"/> -+ <Menuname>Arch Linux</Menuname> - <Menuname>Applications</Menuname> - <Merge type="files"/> - </Layout> - - <Menu> -+ <Name>Arch Linux</Name> -+ <Directory>Archlinux.directory</Directory> -+ <Include> -+ <Category>Archlinux</Category> -+ </Include> -+ </Menu> -+ <Menu> - <Name>Applications</Name> - <Directory>kde-unknown.directory</Directory> - <OnlyUnallocated/> diff --git a/extra/kdelibs/fix-crash-on-open-with.patch b/extra/kdelibs/fix-crash-on-open-with.patch deleted file mode 100644 index 60556386d..000000000 --- a/extra/kdelibs/fix-crash-on-open-with.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 0820b3173aff4f0f3c803a9e75e726024da38ee5 -Author: David Faure <faure@kde.org> -Date: Thu Dec 6 11:55:05 2012 +0100 - - Fix crash when no service was selected (user clicked on "Open With...") - -diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp -index 6d84800..6de0380 100644 ---- a/kparts/browserrun.cpp -+++ b/kparts/browserrun.cpp -@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _ - this, SLOT(slotCopyToTempFileResult(KJob*)) ); - return Delayed; // We'll continue after the job has finished - } -- if (selectedService) { -+ if (selectedService && question.selectedService()) { - *selectedService = question.selectedService(); - // KRun will use this when starting an app - KRun::setPreferredService(question.selectedService()->desktopEntryName()); diff --git a/extra/kdelibs/kde-applications-menu.patch b/extra/kdelibs/kde-applications-menu.patch deleted file mode 100644 index 4b513298a..000000000 --- a/extra/kdelibs/kde-applications-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 -+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 -@@ -69,7 +69,7 @@ - if (WIN32) - install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) - else (WIN32) --install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) -+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) - endif (WIN32) - install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) - install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) ---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 -+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 -@@ -302,7 +302,7 @@ - if (!m_trackId.isEmpty()) - g_vfolder->setTrackId(m_trackId); - -- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); -+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); - - KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); - entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/extra/kdelibs/kdelibs.install b/extra/kdelibs/kdelibs.install deleted file mode 100644 index c77e68041..000000000 --- a/extra/kdelibs/kdelibs.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/gcc47.patch b/extra/kdenetwork/gcc47.patch deleted file mode 100644 index 78af901dc..000000000 --- a/extra/kdenetwork/gcc47.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761 -+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762 -@@ -31,6 +31,7 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> -+#include <unistd.h> - #endif - - #include <cstring> ---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761 -+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 1292762 -@@ -27,6 +27,12 @@ - - #include "talk/base/ssladapter.h" - -+#ifdef POSIX -+extern "C" { -+#include <unistd.h> -+} -+#endif -+ - #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) - #ifdef WIN32 - #define SSL_USE_SCHANNEL 1 ---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761 -+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 1292762 -@@ -198,15 +198,6 @@ - } - - template<class CTYPE> --size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { -- va_list args; -- va_start(args, format); -- size_t len = vsprintfn(buffer, buflen, format, args); -- va_end(args); -- return len; --} -- --template<class CTYPE> - size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, - va_list args) { - int len = vsnprintf(buffer, buflen, format, args); -@@ -217,6 +208,15 @@ - return len; - } - -+template<class CTYPE> -+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { -+ va_list args; -+ va_start(args, format); -+ size_t len = vsprintfn(buffer, buflen, format, args); -+ va_end(args); -+ return len; -+} -+ - /////////////////////////////////////////////////////////////////////////////// - // Allow safe comparing and copying ascii (not UTF-8) with both wide and - // non-wide character strings. diff --git a/extra/kdepim-runtime/fix-carddav-support.patch b/extra/kdepim-runtime/fix-carddav-support.patch deleted file mode 100644 index 25c281307..000000000 --- a/extra/kdepim-runtime/fix-carddav-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit bec63a313160ec6dc1833029d5e99746779ed3f4 -Author: Gregory Oestreicher <greg@kamago.net> -Date: Tue May 15 21:19:17 2012 +0200 - - Add a prop-filter in the CardDAV requests - - BUG: 299482 - FIXED-IN: 4.8.4 - -diff --git a/resources/dav/protocols/carddavprotocol.cpp b/resources/dav/protocols/carddavprotocol.cpp -index 38eca17..9c58653 100644 ---- a/resources/dav/protocols/carddavprotocol.cpp -+++ b/resources/dav/protocols/carddavprotocol.cpp -@@ -35,6 +35,12 @@ CarddavProtocol::CarddavProtocol() - propElement.appendChild( document.createElementNS( "DAV:", "resourcetype" ) ); - propElement.appendChild( document.createElementNS( "DAV:", "getetag" ) ); - -+ QDomElement filterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "filter" ); -+ queryElement.appendChild( filterElement ); -+ QDomElement propfilterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "prop-filter" ); -+ propfilterElement.setAttribute( "name", "FN" ); -+ filterElement.appendChild( propfilterElement ); -+ - mItemsQueries << document; - } - diff --git a/extra/kdepim/fix-build.patch b/extra/kdepim/fix-build.patch deleted file mode 100644 index 7060e814f..000000000 --- a/extra/kdepim/fix-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdepim-4.9.0/kleopatra/CMakeLists.txt~ 2012-07-30 08:06:15.031181647 +0000 -+++ kdepim-4.9.0/kleopatra/CMakeLists.txt 2012-07-30 08:07:13.594082584 +0000 -@@ -365,7 +365,7 @@ - endif(KDEPIM_MOBILE_UI) - - add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 ) -- -+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED ) - - kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png") - kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} ) diff --git a/extra/kdeplasma-addons/fix-spell-crash.patch b/extra/kdeplasma-addons/fix-spell-crash.patch deleted file mode 100644 index 75c26c6ad..000000000 --- a/extra/kdeplasma-addons/fix-spell-crash.patch +++ /dev/null @@ -1,267 +0,0 @@ -commit 124e35885b8cd1b593b7b83a070bd0bdb5758661 -Author: Simeon Bird <bladud@gmail.com> -Date: Fri Oct 19 21:16:34 2012 -0400 - - Fix the plasma spellchecker's 'foreign language' support. - Previously this caused segfaults (even if not used) because - it called setLanguage(), which is not thread-safe, in match(). - - Instead, this patch constructs a new speller safely for each new - language, without deleting the old one. Old spellers are instead - deleted on the teardown() signal. - - While we're at it, amend the language detection so that the user - can type natural language names (eg, 'german') and have the - spell-checker find the right language. - - REVIEW: 106244 - BUG: 303831 - BUG: 264779 - FIXED-IN: 4.9.3 - -diff --git a/runners/spellchecker/spellcheck.cpp b/runners/spellchecker/spellcheck.cpp -index 672732d..cc6aeb2 100644 ---- a/runners/spellchecker/spellcheck.cpp -+++ b/runners/spellchecker/spellcheck.cpp -@@ -24,6 +24,7 @@ - // #include <KDebug> - #include <KGlobal> - #include <KIcon> -+#include <QSet> - - SpellCheckRunner::SpellCheckRunner(QObject* parent, const QVariantList &args) - : Plasma::AbstractRunner(parent, args) -@@ -43,13 +44,64 @@ void SpellCheckRunner::init() - { - Plasma::AbstractRunner::init(); - -- //store all language names, makes it posible to type "spell german TERM" if english locale is set -+ //Connect prepare and teardown signals -+ connect(this, SIGNAL(prepare()), this, SLOT(loaddata())); -+ connect(this, SIGNAL(teardown()), this, SLOT(destroydata())); -+} -+ -+//Load a default dictionary and some locale names -+void SpellCheckRunner::loaddata() -+{ -+ //Load the default speller, with the default language -+ if (!m_spellers.contains("")) { -+ m_spellers[""] = QSharedPointer<Sonnet::Speller> (new Sonnet::Speller("")); -+ } -+ //store all language names, makes it possible to type "spell german TERM" if english locale is set -+ //Need to construct a map between natual language names and names the spell-check recognises. - KLocale *locale = KGlobal::locale(); -- QStringList codes = locale->allLanguagesList(); -- foreach (const QString &code, codes) { -- const QString name = locale->languageCodeToName(code); -- m_languages[name.toLower()] = code; -+ const QStringList avail = m_spellers[""]->availableLanguages(); -+ //We need to filter the available languages so that we associate the natural language -+ //name (eg. 'german') with one sub-code. -+ QSet<QString> families; -+ //First get the families -+ foreach (const QString &code, avail) { -+ families +=code.left(2); -+ } -+ //Now for each family figure out which is the main code. -+ foreach (const QString &fcode,families) { -+ QStringList family = avail.filter(fcode); -+ QString code; -+ //If we only have one code, use it. -+ //If a string is the default language, use it -+ if (family.contains(m_spellers[""]->language())) { -+ code = m_spellers[""]->language(); -+ } else if (fcode == QLatin1String("en")) { -+ //If the family is english, default to en_US. -+ if (family.contains("en_US")) { -+ code = QLatin1String("en_US"); -+ } -+ } else if (family.contains(fcode+QLatin1String("_")+fcode.toUpper())) { -+ //If we have a speller of the form xx_XX, try that. -+ //This gets us most European languages with more than one spelling. -+ code = fcode+QLatin1String("_")+fcode.toUpper(); -+ } else { -+ //Otherwise, pick the first value as it is highest priority. -+ code = family.first(); -+ } -+ //Finally, add code to the map. -+ const QString name = locale->languageCodeToName(fcode); -+ if (!name.isEmpty()) { -+ m_languages[name.toLower()] = code; -+ } -+// kDebug() << "SPELL lang: " << fcode<< "::"<< name << " : " << code; - } -+ -+} -+ -+void SpellCheckRunner::destroydata() -+{ -+ //Clear the data arrays to save memory -+ m_spellers.clear(); - } - - void SpellCheckRunner::reloadConfiguration() -@@ -73,13 +125,52 @@ void SpellCheckRunner::reloadConfiguration() - setSyntaxes(syns); - } - -+/* Take the input query, split into a list, and see if it contains a language to spell in. -+ * Return the empty string if we can't match a language. */ -+QString SpellCheckRunner::findlang(const QStringList& terms) -+{ -+ //If first term is a language code (like en_GB), set it as the spell-check language -+ if (terms.count() >= 1 && m_spellers[""]->availableLanguages().contains(terms[0])) { -+ return terms[0]; -+ } -+ //If we have two terms and the first is a language name (eg 'french'), -+ //set it as the available language -+ else if (terms.count() >=2) { -+ QString code; -+ { -+ //Is this a descriptive language name? -+ QMap<QString, QString>::const_iterator it = m_languages.constFind(terms[0].toLower()); -+ if (it != m_languages.constEnd()) { -+ code = *it; -+ } -+ //Maybe it is a subset of a language code? -+ else { -+ QStringList codes = QStringList(m_languages.values()).filter(terms[0]); -+ if (!codes.isEmpty()) { -+ code = codes.first(); -+ } -+ } -+ } -+ -+ if (!code.isEmpty()) { -+ //We found a valid language! Check still available -+ const QStringList avail = m_spellers[""]->availableLanguages(); -+ //Does the spell-checker like it? -+ if (avail.contains(code)) { -+ return code; -+ } -+ } -+ //FIXME: Support things like 'british english' or 'canadian french' -+ } -+ return QLatin1String(""); -+} -+ - void SpellCheckRunner::match(Plasma::RunnerContext &context) - { - if (!context.isValid()) { - return; - } - -- - const QString term = context.query(); - QString query = term; - -@@ -88,53 +179,46 @@ void SpellCheckRunner::match(Plasma::RunnerContext &context) - if (query.left(len) != m_triggerWord) { - return; - } -- -- QString language = m_speller.defaultLanguage(); - query = query.mid(len).trimmed(); -- QStringList terms = query.split(' '); -- -- //two terms specified, check if first is a language -- QString customLanguage; -- if (terms.count() == 2) { -- customLanguage = terms[0]; -- query = terms[1]; -- } -- //three terms specified, check if first two are a language, e.g. "american english" -- if (terms.count() == 3) { -- customLanguage = terms[0] + ' ' + terms[1]; -- query = terms[2]; -- } -- -- if (!customLanguage.isEmpty()) { -- language = customLanguage; -- m_speller.setLanguage(language); -+ } - -- //not valid, maybe it is a language name, not a code -- if (!m_speller.isValid()) { -- QHash<QString, QString>::const_iterator it = m_languages.constFind(language.toLower()); -- //is a valid language name -- if (it != m_languages.constEnd()) { -- language = *it; -+ //Pointer to speller object with our chosen language -+ QSharedPointer<Sonnet::Speller> speller = m_spellers[""]; -+ -+ if (speller->isValid()) { -+ QStringList terms = query.split(' ', QString::SkipEmptyParts); -+ QString lang = findlang(terms); -+ //If we found a language, create a new speller object using it. -+ if (!lang.isEmpty()) { -+ //First term is the language -+ terms.removeFirst(); -+ //New speller object if we don't already have one -+ if (!m_spellers.contains(lang)) { -+ QMutexLocker lock (&m_spellLock); -+ //Check nothing happened while we were acquiring the lock -+ if (!m_spellers.contains(lang)) { -+ m_spellers[lang] = QSharedPointer<Sonnet::Speller>(new Sonnet::Speller(lang)); - } - } -+ speller = m_spellers[lang]; -+ //Rejoin the strings -+ query = terms.join(QLatin1String(" ")); - } -- -- m_speller.setLanguage(language); - } - -- if (query.size() < 3) { -+ if (query.size() < 2) { - return; - } - - Plasma::QueryMatch match(this); - match.setType(Plasma::QueryMatch::InformationalMatch); - -- if (m_speller.isValid()) { -+ if (speller->isValid()) { - QStringList suggestions; -- const bool correct = m_speller.checkAndSuggest(query,suggestions); -+ const bool correct = speller->checkAndSuggest(query,suggestions); - if (correct) { - match.setIcon(KIcon(QLatin1String( "checkbox" ))); -- match.setText(i18n("Correct")); -+ match.setText(i18n("Correct")+QLatin1String(": ")+query); - } else { - match.setIcon(KIcon(QLatin1String( "edit-delete" ))); - const QString recommended = i18n("Suggested words: %1", suggestions.join(i18nc("seperator for a list of words", ", "))); -diff --git a/runners/spellchecker/spellcheck.h b/runners/spellchecker/spellcheck.h -index 492c370..ca65452 100644 ---- a/runners/spellchecker/spellcheck.h -+++ b/runners/spellchecker/spellcheck.h -@@ -22,6 +22,7 @@ - #include <sonnet/speller.h> - - #include <plasma/abstractrunner.h> -+#include <QSharedPointer> - - /** - * This checks the spelling of query -@@ -41,12 +42,17 @@ public: - - protected slots: - void init(); -+ void loaddata(); -+ void destroydata(); - - private: -+ QString findlang(const QStringList &terms); -+ - QString m_triggerWord; -- QHash<QString, QString> m_languages;//key=language name, value=language code -+ QMap<QString, QString> m_languages;//key=language name, value=language code - bool m_requireTriggerWord; -- Sonnet::Speller m_speller; -+ QMap<QString, QSharedPointer<Sonnet::Speller> > m_spellers; //spellers -+ QMutex m_spellLock; //Lock held when constructing a new speller - }; - - K_EXPORT_PLASMA_RUNNER(spellcheckrunner, SpellCheckRunner) diff --git a/extra/kdeplasma-addons/kdeplasma-addons-applets.install b/extra/kdeplasma-addons/kdeplasma-addons-applets.install deleted file mode 100644 index c4ef46ba8..000000000 --- a/extra/kdeplasma-addons/kdeplasma-addons-applets.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 -}
\ No newline at end of file diff --git a/extra/kdeutils-ark/PKGBUILD b/extra/kdeutils-ark/PKGBUILD deleted file mode 100644 index 752755377..000000000 --- a/extra/kdeutils-ark/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 172878 2012-12-06 08:23:12Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeutils-ark -pkgver=4.9.4 -pkgrel=1 -pkgdesc='Archiving Tool' -url='http://kde.org/applications/utilities/ark/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeutils') -depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') -makedepends=('cmake' 'automoc4') -optdepends=('p7zip' 'zip' 'unzip' 'unrar') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ark-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - cd $srcdir/build/doc - make DESTDIR=$pkgdir install -} diff --git a/extra/kdeutils-ark/kdeutils-ark.install b/extra/kdeutils-ark/kdeutils-ark.install deleted file mode 100644 index 78681144b..000000000 --- a/extra/kdeutils-ark/kdeutils-ark.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_update() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch deleted file mode 100644 index 0c029c8f4..000000000 --- a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up kexec-tools-2.0.0/purgatory/Makefile.orig kexec-tools-2.0.0/purgatory/Makefile ---- kexec-tools-2.0.0/purgatory/Makefile.orig 2011-03-10 11:39:22.100799291 -0500 -+++ kexec-tools-2.0.0/purgatory/Makefile 2011-03-10 11:39:36.422736886 -0500 -@@ -55,14 +55,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO - -I$(srcdir)/util_lib/include \ - -I$(shell $(CC) -print-file-name=include) - $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ -- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ -+ -nostartfiles -nostdlib -nodefaultlibs \ - -e purgatory_start -r - - $(PURGATORY): $(PURGATORY_OBJS) - $(MKDIR) -p $(@D) - $(CC) $(LDFLAGS) -o $@ $^ - --# $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) -+# $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) - - echo:: - @echo "PURGATORY_SRCS $(PURGATORY_SRCS)" diff --git a/extra/kile/PKGBUILD b/extra/kile/PKGBUILD deleted file mode 100644 index d9d97012c..000000000 --- a/extra/kile/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 171257 2012-11-16 22:52:10Z allan $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=kile -pkgver=2.1.3 -pkgrel=2 -pkgdesc="A user friendly TeX/LaTeX frontend for KDE" -arch=("i686" "x86_64") -license=('GPL2') -url="http://kile.sourceforge.net/" -depends=('kdebase-runtime' 'texlive-core' 'kdebase-katepart') -makedepends=('cmake' 'automoc4') -optdepends=('kdebase-konsole: embedded terminal') -install=${pkgname}.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/extra/kile/kile.install b/extra/kile/kile.install deleted file mode 100644 index 9fe93eeac..000000000 --- a/extra/kile/kile.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD deleted file mode 100644 index fb902ba5e..000000000 --- a/extra/kradio/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 165496 2012-08-21 08:58:19Z eric $ -# Maintainer: -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kradio -pkgver=4.0.6 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -pkgdesc="A comfortable KDE internet and AM/FM radio application" -url="http://kradio.sourceforge.net/" -depends=('kdebase-runtime' 'libmms' 'ffmpeg') -[ "$CARCH" != "mips64el" ] && depends+=('lirc-utils') -makedepends=('automoc4' 'cmake' 'boost') -install=$pkgname.install -source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) -md5sums=('ee9214156465e0416bb369f78b4a5eae' - 'f43706e63d24788f2278bada7b10cc6f') - -build() { - cd "$srcdir" - mkdir build - cd build - cmake ../${pkgname}4-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install -} diff --git a/extra/kradio/kradio.install b/extra/kradio/kradio.install deleted file mode 100644 index 460e85d7f..000000000 --- a/extra/kradio/kradio.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD deleted file mode 100644 index cf8efe0e2..000000000 --- a/extra/kshutdown/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 172105 2012-11-28 13:15:50Z stephane $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kshutdown -pkgver=3.0beta5 -pkgrel=1 -pkgdesc="Shutdown Utility for KDE" -arch=('i686' 'x86_64' 'mips64el') -url="http://kshutdown.sourceforge.net/" -license=('GPL') -depends=('kdebase-workspace') -makedepends=('cmake' 'automoc4') -install='kshutdown.install' -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip") -sha1sums=('108e27a7d1cef505c296656f92ab071d8c53bce3') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/kshutdown/kshutdown.install b/extra/kshutdown/kshutdown.install deleted file mode 100644 index 1c0de2e4f..000000000 --- a/extra/kshutdown/kshutdown.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/ktorrent/groupmiewmodel.diff b/extra/ktorrent/groupmiewmodel.diff deleted file mode 100644 index f16bdc57b..000000000 --- a/extra/ktorrent/groupmiewmodel.diff +++ /dev/null @@ -1,87 +0,0 @@ -commit 1009ba89b5d603ae7f1a95ef65a818c760c367cf -Author: Joris Guisson <joris.guisson@gmail.com> -Date: Mon Oct 22 20:07:21 2012 +0200 - - Backport to 4.3: Fix crash in GroupViewModel when dragging torrents over groups - - BUG: 308733 - -diff --git a/ktorrent/groups/groupviewmodel.cpp b/ktorrent/groups/groupviewmodel.cpp -index f2e99d2..b4dca7e 100644 ---- ktorrent/groups/groupviewmodel.cpp -+++ ktorrent/groups/groupviewmodel.cpp -@@ -55,6 +55,9 @@ namespace kt - QVariant GroupViewModel::data(const QModelIndex& index, int role) const - { - Item* item = (Item*)index.internalPointer(); -+ if(!item) -+ return QVariant(); -+ - switch(role) - { - case Qt::DisplayRole: -@@ -72,6 +75,9 @@ namespace kt - return false; - - Item* item = (Item*)index.internalPointer(); -+ if(!item) -+ return false; -+ - Group* group = item->group; - QString new_name = value.toString(); - if(new_name.isEmpty() || gman->find(new_name)) -@@ -96,13 +102,16 @@ namespace kt - return 1; - - Item* item = (Item*)parent.internalPointer(); -- return item->children.size(); -+ if(!item) -+ return 0; -+ else -+ return item->children.size(); - } - - QModelIndex GroupViewModel::parent(const QModelIndex& child) const - { - Item* item = (Item*)child.internalPointer(); -- if(!item->parent) -+ if(!item || !item->parent) - return QModelIndex(); - else - return createIndex(item->parent->row, 0, (void*)item->parent); -@@ -114,7 +123,7 @@ namespace kt - return createIndex(row, column, (void*)&root); - - Item* item = (Item*)parent.internalPointer(); -- if(row < 0 || row >= item->children.count()) -+ if(!item || row < 0 || row >= item->children.count()) - return QModelIndex(); - - return createIndex(row, column, (void*)&item->children.at(row)); -@@ -157,7 +166,7 @@ namespace kt - Qt::ItemFlags GroupViewModel::flags(const QModelIndex& index) const - { - Item* item = (Item*)index.internalPointer(); -- if(item->group && !item->group->isStandardGroup()) -+ if(item && item->group && !item->group->isStandardGroup()) - return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled; - else - return Qt::ItemIsEnabled; -@@ -218,8 +227,11 @@ namespace kt - - bool GroupViewModel::removeRows(int row, int count, const QModelIndex& parent) - { -+ Item* item = (Item*)parent.internalPointer(); -+ if(!item) -+ return false; -+ - beginRemoveRows(parent, row, row + count); -- Item* item = (Item*)parent.internalPointer(); - for(int i = 0; i < count; i++) - item->children.removeAt(row); - int row_index = 0; -@@ -436,3 +448,4 @@ namespace kt - - - } -+ diff --git a/extra/ktorrent/httpserver.patch b/extra/ktorrent/httpserver.patch deleted file mode 100644 index 71c616db0..000000000 --- a/extra/ktorrent/httpserver.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/webinterface/httpserver.cpp.old -+++ plugins/webinterface/httpserver.cpp -@@ -29,6 +29,7 @@ - #include <ktemporaryfile.h> - #include <k3streamsocket.h> - #include <k3resolver.h> -+#include <time.h> - - #include <qfileinfo.h> - #include <qstringlist.h> diff --git a/extra/ladspa/hardcode-path.patch b/extra/ladspa/hardcode-path.patch deleted file mode 100644 index 821c2001c..000000000 --- a/extra/ladspa/hardcode-path.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- src/search.c.orig 2008-11-07 00:38:18.000000000 +0100 -+++ src/search.c 2008-11-07 00:50:51.000000000 +0100 -@@ -83,6 +83,8 @@ - dlclose(pcFilename); - free(pcFilename); - } -+ } else { -+ free(pcFilename); - } - } - } -@@ -99,13 +101,10 @@ - - pcLADSPAPath = getenv("LADSPA_PATH"); - if (!pcLADSPAPath) { -- fprintf(stderr, -- "Warning: You do not have a LADSPA_PATH " -- "environment variable set.\n"); -- return; -+ pcStart = "/usr/lib/ladspa/"; -+ } else { -+ pcStart = pcLADSPAPath; - } -- -- pcStart = pcLADSPAPath; - while (*pcStart != '\0') { - pcEnd = pcStart; - while (*pcEnd != ':' && *pcEnd != '\0') diff --git a/extra/lapack/Makefile.blas b/extra/lapack/Makefile.blas deleted file mode 100644 index 46b3eeb79..000000000 --- a/extra/lapack/Makefile.blas +++ /dev/null @@ -1,148 +0,0 @@ -include ../../make.inc - -####################################################################### -# This is the makefile to create a library for the BLAS. -# The files are grouped as follows: -# -# SBLAS1 -- Single precision real BLAS routines -# CBLAS1 -- Single precision complex BLAS routines -# DBLAS1 -- Double precision real BLAS routines -# ZBLAS1 -- Double precision complex BLAS routines -# -# CB1AUX -- Real BLAS routines called by complex routines -# ZB1AUX -- D.P. real BLAS routines called by d.p. complex -# routines -# -# ALLBLAS -- Auxiliary routines for Level 2 and 3 BLAS -# -# SBLAS2 -- Single precision real BLAS2 routines -# CBLAS2 -- Single precision complex BLAS2 routines -# DBLAS2 -- Double precision real BLAS2 routines -# ZBLAS2 -- Double precision complex BLAS2 routines -# -# SBLAS3 -- Single precision real BLAS3 routines -# CBLAS3 -- Single precision complex BLAS3 routines -# DBLAS3 -- Double precision real BLAS3 routines -# ZBLAS3 -- Double precision complex BLAS3 routines -# -# The library can be set up to include routines for any combination -# of the four precisions. To create or add to the library, enter make -# followed by one or more of the precisions desired. Some examples: -# make single -# make single complex -# make single double complex complex16 -# Note that these commands are not safe for parallel builds. -# -# Alternatively, the commands -# make all -# or -# make -# without any arguments creates a library of all four precisions. -# The name of the library is held in BLASLIB, which is set in the -# top-level make.inc -# -# To remove the object files after the library is created, enter -# make clean -# To force the source files to be recompiled, enter, for example, -# make single FRC=FRC -# -#--------------------------------------------------------------------- -# -# Edward Anderson, University of Tennessee -# March 26, 1990 -# Susan Ostrouchov, Last updated September 30, 1994 -# ejr, May 2006. -# -####################################################################### - -all: $(BLASLIB) - -#--------------------------------------------------------- -# Comment out the next 6 definitions if you already have -# the Level 1 BLAS. -#--------------------------------------------------------- -SBLAS1 = isamax.o sasum.o saxpy.o scopy.o sdot.o snrm2.o \ - srot.o srotg.o sscal.o sswap.o sdsdot.o srotmg.o srotm.o -$(SBLAS1): $(FRC) - -CBLAS1 = scabs1.o scasum.o scnrm2.o icamax.o caxpy.o ccopy.o \ - cdotc.o cdotu.o csscal.o crotg.o cscal.o cswap.o csrot.o -$(CBLAS1): $(FRC) - -DBLAS1 = idamax.o dasum.o daxpy.o dcopy.o ddot.o dnrm2.o \ - drot.o drotg.o dscal.o dsdot.o dswap.o drotmg.o drotm.o -$(DBLAS1): $(FRC) - -ZBLAS1 = dcabs1.o dzasum.o dznrm2.o izamax.o zaxpy.o zcopy.o \ - zdotc.o zdotu.o zdscal.o zrotg.o zscal.o zswap.o zdrot.o -$(ZBLAS1): $(FRC) - -CB1AUX = isamax.o sasum.o saxpy.o scopy.o snrm2.o sscal.o -$(CB1AUX): $(FRC) - -ZB1AUX = idamax.o dasum.o daxpy.o dcopy.o dnrm2.o dscal.o -$(ZB1AUX): $(FRC) - -#--------------------------------------------------------------------- -# The following line defines auxiliary routines needed by both the -# Level 2 and Level 3 BLAS. Comment it out only if you already have -# both the Level 2 and 3 BLAS. -#--------------------------------------------------------------------- -ALLBLAS = lsame.o xerbla.o xerbla_array.o -$(ALLBLAS) : $(FRC) - -#--------------------------------------------------------- -# Comment out the next 4 definitions if you already have -# the Level 2 BLAS. -#--------------------------------------------------------- -SBLAS2 = sgemv.o sgbmv.o ssymv.o ssbmv.o sspmv.o \ - strmv.o stbmv.o stpmv.o strsv.o stbsv.o stpsv.o \ - sger.o ssyr.o sspr.o ssyr2.o sspr2.o -$(SBLAS2): $(FRC) - -CBLAS2 = cgemv.o cgbmv.o chemv.o chbmv.o chpmv.o \ - ctrmv.o ctbmv.o ctpmv.o ctrsv.o ctbsv.o ctpsv.o \ - cgerc.o cgeru.o cher.o chpr.o cher2.o chpr2.o -$(CBLAS2): $(FRC) - -DBLAS2 = dgemv.o dgbmv.o dsymv.o dsbmv.o dspmv.o \ - dtrmv.o dtbmv.o dtpmv.o dtrsv.o dtbsv.o dtpsv.o \ - dger.o dsyr.o dspr.o dsyr2.o dspr2.o -$(DBLAS2): $(FRC) - -ZBLAS2 = zgemv.o zgbmv.o zhemv.o zhbmv.o zhpmv.o \ - ztrmv.o ztbmv.o ztpmv.o ztrsv.o ztbsv.o ztpsv.o \ - zgerc.o zgeru.o zher.o zhpr.o zher2.o zhpr2.o -$(ZBLAS2): $(FRC) - -#--------------------------------------------------------- -# Comment out the next 4 definitions if you already have -# the Level 3 BLAS. -#--------------------------------------------------------- -SBLAS3 = sgemm.o ssymm.o ssyrk.o ssyr2k.o strmm.o strsm.o -$(SBLAS3): $(FRC) - -CBLAS3 = cgemm.o csymm.o csyrk.o csyr2k.o ctrmm.o ctrsm.o \ - chemm.o cherk.o cher2k.o -$(CBLAS3): $(FRC) - -DBLAS3 = dgemm.o dsymm.o dsyrk.o dsyr2k.o dtrmm.o dtrsm.o -$(DBLAS3): $(FRC) - -ZBLAS3 = zgemm.o zsymm.o zsyrk.o zsyr2k.o ztrmm.o ztrsm.o \ - zhemm.o zherk.o zher2k.o -$(ZBLAS3): $(FRC) - -ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \ - $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \ - $(ZBLAS2) $(ZBLAS3) $(ALLBLAS) - -clean: - rm -f *.o libblas.a libblas.so* - -static: $(ALLOBJ) - ar ruv libblas.a $(ALLOBJ) - ranlib libblas.a - -shared: $(ALLOBJ) - cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.3.0 $(ALLOBJ) -lm -lgfortran -lc diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack deleted file mode 100644 index a56436723..000000000 --- a/extra/lapack/Makefile.lapack +++ /dev/null @@ -1,461 +0,0 @@ - include ../make.inc - -####################################################################### -# This is the makefile to create a library for LAPACK. -# The files are organized as follows: -# ALLAUX -- Auxiliary routines called from all precisions -# -# SCLAUX -- Auxiliary routines called from both REAL and COMPLEX. -# DZLAUX -- Auxiliary routines called from both DOUBLE and COMPLEX*16. -# -# DSLASRC -- Double-single mixed precision real routines called from -# single, single-extra and double precision real LAPACK -# routines (i.e. from SLASRC, SXLASRC, DLASRC). -# ZCLASRC -- Double-single mixed precision complex routines called from -# single, single-extra and double precision complex LAPACK -# routines (i.e. from CLASRC, CXLASRC, ZLASRC). -# -# SLASRC -- Single precision real LAPACK routines -# SXLASRC -- Single precision real LAPACK routines using extra -# precision. -# CLASRC -- Single precision complex LAPACK routines -# CXLASRC -- Single precision complex LAPACK routines using extra -# precision. -# DLASRC -- Double precision real LAPACK routines -# DXLASRC -- Double precision real LAPACK routines using extra -# precision. -# ZLASRC -- Double precision complex LAPACK routines -# ZXLASRC -- Double precision complex LAPACK routines using extra -# precision. -# -# The library can be set up to include routines for any combination -# of the four precisions. To create or add to the library, enter make -# followed by one or more of the precisions desired. Some examples: -# make single -# make single complex -# make single double complex complex16 -# Alternatively, the command -# make -# without any arguments creates a library of all four precisions. -# The library is called -# lapack.a -# and is created at the next higher directory level. -# -# To remove the object files after the library is created, enter -# make clean -# On some systems, you can force the source files to be recompiled by -# entering (for example) -# make single FRC=FRC -# -# ***Note*** -# The functions lsame, second, dsecnd, slamch, and dlamch may have -# to be installed before compiling the library. Refer to the -# installation guide, LAPACK Working Note 41, for instructions. -# -####################################################################### - -ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o \ - ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \ - ../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o - -SCLAUX = \ - sbdsdc.o \ - sbdsqr.o sdisna.o slabad.o slacpy.o sladiv.o slae2.o slaebz.o \ - slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o slaed5.o slaed6.o \ - slaed7.o slaed8.o slaed9.o slaeda.o slaev2.o slagtf.o \ - slagts.o slamrg.o slanst.o \ - slapy2.o slapy3.o slarnv.o \ - slarra.o slarrb.o slarrc.o slarrd.o slarre.o slarrf.o slarrj.o \ - slarrk.o slarrr.o slaneg.o \ - slartg.o slaruv.o slas2.o slascl.o \ - slasd0.o slasd1.o slasd2.o slasd3.o slasd4.o slasd5.o slasd6.o \ - slasd7.o slasd8.o slasda.o slasdq.o slasdt.o \ - slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o slasq6.o \ - slasr.o slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \ - ssteqr.o ssterf.o slaisnan.o sisnan.o \ - slartgp.o slartgs.o \ - ../INSTALL/second_$(TIMER).o - -DZLAUX = \ - dbdsdc.o \ - dbdsqr.o ddisna.o dlabad.o dlacpy.o dladiv.o dlae2.o dlaebz.o \ - dlaed0.o dlaed1.o dlaed2.o dlaed3.o dlaed4.o dlaed5.o dlaed6.o \ - dlaed7.o dlaed8.o dlaed9.o dlaeda.o dlaev2.o dlagtf.o \ - dlagts.o dlamrg.o dlanst.o \ - dlapy2.o dlapy3.o dlarnv.o \ - dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o dlarrf.o dlarrj.o \ - dlarrk.o dlarrr.o dlaneg.o \ - dlartg.o dlaruv.o dlas2.o dlascl.o \ - dlasd0.o dlasd1.o dlasd2.o dlasd3.o dlasd4.o dlasd5.o dlasd6.o \ - dlasd7.o dlasd8.o dlasda.o dlasdq.o dlasdt.o \ - dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o dlasq6.o \ - dlasr.o dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \ - dsteqr.o dsterf.o dlaisnan.o disnan.o \ - dlartgp.o dlartgs.o \ - ../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o - -SLASRC = \ - sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o \ - sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o \ - sgebrd.o sgecon.o sgeequ.o sgees.o sgeesx.o sgeev.o sgeevx.o \ - sgegs.o sgegv.o sgehd2.o sgehrd.o sgelq2.o sgelqf.o \ - sgels.o sgelsd.o sgelss.o sgelsx.o sgelsy.o sgeql2.o sgeqlf.o \ - sgeqp3.o sgeqpf.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o \ - sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesv.o sgesvd.o sgesvx.o \ - sgetc2.o sgetf2.o sgetri.o \ - sggbak.o sggbal.o sgges.o sggesx.o sggev.o sggevx.o \ - sggglm.o sgghrd.o sgglse.o sggqrf.o \ - sggrqf.o sggsvd.o sggsvp.o sgtcon.o sgtrfs.o sgtsv.o \ - sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o \ - shsein.o shseqr.o slabrd.o slacon.o slacn2.o \ - slaein.o slaexc.o slag2.o slags2.o slagtm.o slagv2.o slahqr.o \ - slahrd.o slahr2.o slaic1.o slaln2.o slals0.o slalsa.o slalsd.o \ - slangb.o slange.o slangt.o slanhs.o slansb.o slansp.o \ - slansy.o slantb.o slantp.o slantr.o slanv2.o \ - slapll.o slapmt.o \ - slaqgb.o slaqge.o slaqp2.o slaqps.o slaqsb.o slaqsp.o slaqsy.o \ - slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \ - slaqtr.o slar1v.o slar2v.o ilaslr.o ilaslc.o \ - slarf.o slarfb.o slarfg.o slarfgp.o slarft.o slarfx.o slargv.o \ - slarrv.o slartv.o \ - slarz.o slarzb.o slarzt.o slaswp.o slasy2.o slasyf.o \ - slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrz.o slatzm.o \ - slauu2.o slauum.o sopgtr.o sopmtr.o sorg2l.o sorg2r.o \ - sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o sorgqr.o sorgr2.o \ - sorgrq.o sorgtr.o sorm2l.o sorm2r.o \ - sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \ - sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \ - spbstf.o spbsv.o spbsvx.o \ - spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o \ - sposvx.o spotf2.o spotri.o spstrf.o spstf2.o \ - sppcon.o sppequ.o \ - spprfs.o sppsv.o sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \ - spteqr.o sptrfs.o sptsv.o sptsvx.o spttrs.o sptts2.o srscl.o \ - ssbev.o ssbevd.o ssbevx.o ssbgst.o ssbgv.o ssbgvd.o ssbgvx.o \ - ssbtrd.o sspcon.o sspev.o sspevd.o sspevx.o sspgst.o \ - sspgv.o sspgvd.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \ - ssptrf.o ssptri.o ssptrs.o sstegr.o sstein.o sstev.o sstevd.o sstevr.o \ - sstevx.o \ - ssycon.o ssyev.o ssyevd.o ssyevr.o ssyevx.o ssygs2.o \ - ssygst.o ssygv.o ssygvd.o ssygvx.o ssyrfs.o ssysv.o ssysvx.o \ - ssytd2.o ssytf2.o ssytrd.o ssytrf.o ssytri.o ssytri2.o ssytri2x.o \ - ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o \ - stbcon.o \ - stbrfs.o stbtrs.o stgevc.o stgex2.o stgexc.o stgsen.o \ - stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o \ - stptrs.o \ - strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o strsyl.o \ - strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o sstemr.o \ - slansf.o spftrf.o spftri.o spftrs.o ssfrk.o stfsm.o stftri.o stfttp.o \ - stfttr.o stpttf.o stpttr.o strttf.o strttp.o \ - sgejsv.o sgesvj.o sgsvj0.o sgsvj1.o \ - sgeequb.o ssyequb.o spoequb.o sgbequb.o \ - sbbcsd.o slapmr.o sorbdb.o sorcsd.o \ - sgeqrt.o sgeqrt2.o sgeqrt3.o sgemqrt.o \ - stpqrt.o stpqrt2.o stpmqrt.o stprfb.o - -DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o - -ifdef USEXBLAS -SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o \ - sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o \ - sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o \ - sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o \ - sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o \ - sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o \ - slascl2.o sla_wwaddw.o -endif - -CLASRC = \ - cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o cgbsvx.o \ - cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o \ - cgecon.o cgeequ.o cgees.o cgeesx.o cgeev.o cgeevx.o \ - cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o cgelqf.o \ - cgels.o cgelsd.o cgelss.o cgelsx.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o \ - cgeqpf.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o \ - cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesv.o cgesvd.o \ - cgesvx.o cgetc2.o cgetf2.o cgetri.o \ - cggbak.o cggbal.o cgges.o cggesx.o cggev.o cggevx.o cggglm.o \ - cgghrd.o cgglse.o cggqrf.o cggrqf.o \ - cggsvd.o cggsvp.o \ - cgtcon.o cgtrfs.o cgtsv.o cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbev.o \ - chbevd.o chbevx.o chbgst.o chbgv.o chbgvd.o chbgvx.o chbtrd.o \ - checon.o cheev.o cheevd.o cheevr.o cheevx.o chegs2.o chegst.o \ - chegv.o chegvd.o chegvx.o cherfs.o chesv.o chesvx.o chetd2.o \ - chetf2.o chetrd.o \ - chetrf.o chetri.o chetri2.o chetri2x.o cheswapr.o \ - chetrs.o chetrs2.o chgeqz.o chpcon.o chpev.o chpevd.o \ - chpevx.o chpgst.o chpgv.o chpgvd.o chpgvx.o chprfs.o chpsv.o \ - chpsvx.o \ - chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o clabrd.o \ - clacgv.o clacon.o clacn2.o clacp2.o clacpy.o clacrm.o clacrt.o cladiv.o \ - claed0.o claed7.o claed8.o \ - claein.o claesy.o claev2.o clags2.o clagtm.o \ - clahef.o clahqr.o \ - clahrd.o clahr2.o claic1.o clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o \ - clanhb.o clanhe.o \ - clanhp.o clanhs.o clanht.o clansb.o clansp.o clansy.o clantb.o \ - clantp.o clantr.o clapll.o clapmt.o clarcm.o claqgb.o claqge.o \ - claqhb.o claqhe.o claqhp.o claqp2.o claqps.o claqsb.o \ - claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o claqr5.o \ - claqsp.o claqsy.o clar1v.o clar2v.o ilaclr.o ilaclc.o \ - clarf.o clarfb.o clarfg.o clarft.o clarfgp.o \ - clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \ - clarz.o clarzb.o clarzt.o clascl.o claset.o clasr.o classq.o \ - claswp.o clasyf.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \ - clatzm.o clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \ - cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \ - cposv.o cposvx.o cpotf2.o cpotri.o cpstrf.o cpstf2.o \ - cppcon.o cppequ.o cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o \ - cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o cpttrs.o cptts2.o \ - crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \ - cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \ - cstegr.o cstein.o csteqr.o \ - csycon.o csymv.o \ - csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \ - csyswapr.o csytrs.o csytrs2.o csyconv.o \ - ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \ - ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o \ - ctprfs.o ctptri.o \ - ctptrs.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o \ - ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \ - cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o cungr2.o \ - cungrq.o cungtr.o cunm2l.o cunm2r.o cunmbr.o cunmhr.o cunml2.o \ - cunmlq.o cunmql.o cunmqr.o cunmr2.o cunmr3.o cunmrq.o cunmrz.o \ - cunmtr.o cupgtr.o cupmtr.o icmax1.o scsum1.o cstemr.o \ - chfrk.o ctfttp.o clanhf.o cpftrf.o cpftri.o cpftrs.o ctfsm.o ctftri.o \ - ctfttr.o ctpttf.o ctpttr.o ctrttf.o ctrttp.o \ - cgeequb.o cgbequb.o csyequb.o cpoequb.o cheequb.o \ - cbbcsd.o clapmr.o cunbdb.o cuncsd.o \ - cgeqrt.o cgeqrt2.o cgeqrt3.o cgemqrt.o \ - ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o - -ifdef USEXBLAS -CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \ - cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o \ - csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \ - cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o \ - cposvxx.o cporfsx.o cla_porfsx_extended.o \ - cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o \ - cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o \ - cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o \ - chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \ - cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \ - cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o -endif - -ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o - -DLASRC = \ - dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o \ - dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \ - dgebrd.o dgecon.o dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o \ - dgegs.o dgegv.o dgehd2.o dgehrd.o dgelq2.o dgelqf.o \ - dgels.o dgelsd.o dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o \ - dgeqp3.o dgeqpf.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o \ - dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesv.o dgesvd.o dgesvx.o \ - dgetc2.o dgetf2.o dgetrf.o dgetri.o \ - dgetrs.o dggbak.o dggbal.o dgges.o dggesx.o dggev.o dggevx.o \ - dggglm.o dgghrd.o dgglse.o dggqrf.o \ - dggrqf.o dggsvd.o dggsvp.o dgtcon.o dgtrfs.o dgtsv.o \ - dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o \ - dhsein.o dhseqr.o dlabrd.o dlacon.o dlacn2.o \ - dlaein.o dlaexc.o dlag2.o dlags2.o dlagtm.o dlagv2.o dlahqr.o \ - dlahrd.o dlahr2.o dlaic1.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \ - dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o dlansp.o \ - dlansy.o dlantb.o dlantp.o dlantr.o dlanv2.o \ - dlapll.o dlapmt.o \ - dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqsb.o dlaqsp.o dlaqsy.o \ - dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \ - dlaqtr.o dlar1v.o dlar2v.o iladlr.o iladlc.o \ - dlarf.o dlarfb.o dlarfg.o dlarfgp.o dlarft.o dlarfx.o \ - dlargv.o dlarrv.o dlartv.o \ - dlarz.o dlarzb.o dlarzt.o dlaswp.o dlasy2.o dlasyf.o \ - dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlatzm.o dlauu2.o \ - dlauum.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o \ - dorgbr.o dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \ - dorgrq.o dorgtr.o dorm2l.o dorm2r.o \ - dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o dormr2.o \ - dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \ - dpbstf.o dpbsv.o dpbsvx.o \ - dpbtf2.o dpbtrf.o dpbtrs.o dpocon.o dpoequ.o dporfs.o dposv.o \ - dposvx.o dpotf2.o dpotrf.o dpotri.o dpotrs.o dpstrf.o dpstf2.o \ - dppcon.o dppequ.o \ - dpprfs.o dppsv.o dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \ - dpteqr.o dptrfs.o dptsv.o dptsvx.o dpttrs.o dptts2.o drscl.o \ - dsbev.o dsbevd.o dsbevx.o dsbgst.o dsbgv.o dsbgvd.o dsbgvx.o \ - dsbtrd.o dspcon.o dspev.o dspevd.o dspevx.o dspgst.o \ - dspgv.o dspgvd.o dspgvx.o dsprfs.o dspsv.o dspsvx.o dsptrd.o \ - dsptrf.o dsptri.o dsptrs.o dstegr.o dstein.o dstev.o dstevd.o dstevr.o \ - dstevx.o \ - dsycon.o dsyev.o dsyevd.o dsyevr.o \ - dsyevx.o dsygs2.o dsygst.o dsygv.o dsygvd.o dsygvx.o dsyrfs.o \ - dsysv.o dsysvx.o \ - dsytd2.o dsytf2.o dsytrd.o dsytrf.o dsytri.o dsytri2.o dsytri2x.o \ - dsyswapr.o dsytrs.o dsytrs2.o dsyconv.o \ - dtbcon.o dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \ - dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \ - dtptrs.o \ - dtrcon.o dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \ - dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dstemr.o \ - dsgesv.o dsposv.o dlag2s.o slag2d.o dlat2s.o \ - dlansf.o dpftrf.o dpftri.o dpftrs.o dsfrk.o dtfsm.o dtftri.o dtfttp.o \ - dtfttr.o dtpttf.o dtpttr.o dtrttf.o dtrttp.o \ - dgejsv.o dgesvj.o dgsvj0.o dgsvj1.o \ - dgeequb.o dsyequb.o dpoequb.o dgbequb.o \ - dbbcsd.o dlapmr.o dorbdb.o dorcsd.o \ - dgeqrt.o dgeqrt2.o dgeqrt3.o dgemqrt.o \ - dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o - -ifdef USEXBLAS -DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \ - dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o \ - dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o \ - dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o \ - dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o \ - dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o \ - dlascl2.o dla_wwaddw.o -endif - -ZLASRC = \ - zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o zgbsvx.o \ - zgbtf2.o zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \ - zgecon.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o \ - zgegs.o zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o \ - zgels.o zgelsd.o zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \ - zgeqpf.o zgeqr2.o zgeqr2p.o zgeqrf.o zgeqrfp.o zgerfs.o zgerq2.o zgerqf.o \ - zgesc2.o zgesdd.o zgesv.o zgesvd.o zgesvx.o zgetc2.o zgetf2.o zgetrf.o \ - zgetri.o zgetrs.o \ - zggbak.o zggbal.o zgges.o zggesx.o zggev.o zggevx.o zggglm.o \ - zgghrd.o zgglse.o zggqrf.o zggrqf.o \ - zggsvd.o zggsvp.o \ - zgtcon.o zgtrfs.o zgtsv.o zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbev.o \ - zhbevd.o zhbevx.o zhbgst.o zhbgv.o zhbgvd.o zhbgvx.o zhbtrd.o \ - zhecon.o zheev.o zheevd.o zheevr.o zheevx.o zhegs2.o zhegst.o \ - zhegv.o zhegvd.o zhegvx.o zherfs.o zhesv.o zhesvx.o zhetd2.o \ - zhetf2.o zhetrd.o \ - zhetrf.o zhetri.o zhetri2.o zhetri2x.o zheswapr.o \ - zhetrs.o zhetrs2.o zhgeqz.o zhpcon.o zhpev.o zhpevd.o \ - zhpevx.o zhpgst.o zhpgv.o zhpgvd.o zhpgvx.o zhprfs.o zhpsv.o \ - zhpsvx.o \ - zhptrd.o zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \ - zlacgv.o zlacon.o zlacn2.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o \ - zlaed0.o zlaed7.o zlaed8.o \ - zlaein.o zlaesy.o zlaev2.o zlags2.o zlagtm.o \ - zlahef.o zlahqr.o \ - zlahrd.o zlahr2.o zlaic1.o zlals0.o zlalsa.o zlalsd.o zlangb.o zlange.o \ - zlangt.o zlanhb.o \ - zlanhe.o \ - zlanhp.o zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o \ - zlantp.o zlantr.o zlapll.o zlapmt.o zlaqgb.o zlaqge.o \ - zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqsb.o \ - zlaqr0.o zlaqr1.o zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o \ - zlaqsp.o zlaqsy.o zlar1v.o zlar2v.o ilazlr.o ilazlc.o \ - zlarcm.o zlarf.o zlarfb.o \ - zlarfg.o zlarft.o zlarfgp.o \ - zlarfx.o zlargv.o zlarnv.o zlarrv.o zlartg.o zlartv.o \ - zlarz.o zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o \ - zlassq.o zlaswp.o zlasyf.o \ - zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \ - zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o \ - zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpocon.o zpoequ.o zporfs.o \ - zposv.o zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o zpstrf.o zpstf2.o \ - zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o zpptrs.o \ - zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o zpttrs.o zptts2.o \ - zrot.o zspcon.o zspmv.o zspr.o zsprfs.o zspsv.o \ - zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \ - zstegr.o zstein.o zsteqr.o \ - zsycon.o zsymv.o \ - zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \ - zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o \ - ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \ - ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o \ - ztprfs.o ztptri.o \ - ztptrs.o ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \ - ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o zung2l.o \ - zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o zungr2.o \ - zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o zunml2.o \ - zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o \ - zunmtr.o zupgtr.o \ - zupmtr.o izmax1.o dzsum1.o zstemr.o \ - zcgesv.o zcposv.o zlag2c.o clag2z.o zlat2c.o \ - zhfrk.o ztfttp.o zlanhf.o zpftrf.o zpftri.o zpftrs.o ztfsm.o ztftri.o \ - ztfttr.o ztpttf.o ztpttr.o ztrttf.o ztrttp.o \ - zgeequb.o zgbequb.o zsyequb.o zpoequb.o zheequb.o \ - zbbcsd.o zlapmr.o zunbdb.o zuncsd.o \ - zgeqrt.o zgeqrt2.o zgeqrt3.o zgemqrt.o \ - ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o - -ifdef USEXBLAS -ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \ - zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o \ - zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o \ - zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o \ - zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o \ - zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o \ - zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o \ - zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o \ - zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o -endif - -ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \ - $(SCLAUX) $(DZLAUX) $(ALLAUX) - -ifdef USEXBLAS -ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) -endif - -all: ../$(LAPACKLIB) - -../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) - $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) - $(RANLIB) $@ - -single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX) - $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \ - $(SXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX) - $(RANLIB) ../$(LAPACKLIB) - -complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX) - $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \ - $(CXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX) - $(RANLIB) ../$(LAPACKLIB) - -double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX) - $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \ - $(DXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX) - $(RANLIB) ../$(LAPACKLIB) - -complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX) - $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \ - $(ZXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX) - $(RANLIB) ../$(LAPACKLIB) - -$(ALLAUX): $(FRC) -$(SCLAUX): $(FRC) -$(DZLAUX): $(FRC) -$(SLASRC): $(FRC) -$(CLASRC): $(FRC) -$(DLASRC): $(FRC) -$(ZLASRC): $(FRC) -$(ZCLASRC): $(FRC) -$(DSLASRC): $(FRC) -ifdef USEXBLAS -$(SXLASRC): $(FRC) -$(CXLASRC): $(FRC) -$(DXLASRC): $(FRC) -$(ZXLASRC): $(FRC) -endif - -FRC: - @FRC=$(FRC) - -clean: - rm -f *.o liblapack* - -static: $(ALLOBJ) $(ALLXOBJ) - ar ruv liblapack.a $(ALLOBJ) - ranlib liblapack.a - -shared: $(ALLOBJ) $(ALLXOBJ) - cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc diff --git a/extra/lftp/lftp-4.3.8-gets.patch b/extra/lftp/lftp-4.3.8-gets.patch deleted file mode 100644 index d4a11804e..000000000 --- a/extra/lftp/lftp-4.3.8-gets.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up lftp-4.3.8/lib/stdio.in.h.gets lftp-4.3.8/lib/stdio.in.h ---- lftp-4.3.8/lib/stdio.in.h.gets 2012-07-22 15:07:15.101115146 -0400 -+++ lftp-4.3.8/lib/stdio.in.h 2012-07-22 15:08:09.777098512 -0400 -@@ -702,10 +702,12 @@ _GL_WARN_ON_USE (getline, "getline is un - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning; besides, C11 - removed it. */ -+#if defined gets - #undef gets - #if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif // if defined gets - - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ diff --git a/extra/libcl/PKGBUILD b/extra/libcl/PKGBUILD deleted file mode 100644 index 913418b46..000000000 --- a/extra/libcl/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 165264 2012-08-14 17:01:07Z ibiru $ -#Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=libcl -pkgver=1.1 -_pkgver=304.37 -pkgrel=3 -pkgdesc="OpenCL library and ICD loader from NVIDIA" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('gcc-libs') -license=('custom') -options=('!strip') - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${_pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run") - md5sums=('ee3e97109201ab954c96860e28ada611') -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${_pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run") - md5sums=('65fce562c0df3def06012db9ff6bafa1') -fi -build() { - cd $srcdir - sh ${_pkg}.run --extract-only -} - -package() { - cd $srcdir/${_pkg} - install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0 - ln -s /usr/lib/libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1 - ln -s /usr/lib/libOpenCL.so.1 $pkgdir/usr/lib/libOpenCL.so - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 2aefac902..3c78bc2cf 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175502 2013-01-17 14:41:27Z andyrtr $ +# $Id: PKGBUILD 177825 2013-02-09 17:43:46Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.41 +pkgver=2.4.42 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -15,20 +15,15 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch - COPYING - buildfix.diff) -sha256sums=('52b3ca670df43fc9f5164f0f55fa40b008de297c0ceedab7c77c30bf9022f212' + COPYING) +sha256sums=('e0671082a77871c8474d3c0f09dbf5ff82d2429cd248088a691f7b484cbc76e1' '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded' - '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93' - '9b293bbe682381b6822b5abfb1b1ce713185bcefde255d300367b26f47102ddc') + '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { cd $pkgname-$pkgver patch -Np1 -i ../no-pthread-stubs.patch - # man/Makefile,in is missing - patch -Np1 -i ${srcdir}/buildfix.diff - #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff deleted file mode 100644 index dc80155f2..000000000 --- a/extra/libdrm/git_fixes.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c -index 19441f3..eb9dd32 100644 ---- a/intel/intel_bufmgr_gem.c -+++ b/intel/intel_bufmgr_gem.c -@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) - bufmgr_gem->vma_cache.next, - vma_list); - assert(bo_gem->map_count == 0); -- DRMLISTDEL(&bo_gem->vma_list); -+ DRMLISTDELINIT(&bo_gem->vma_list); - - if (bo_gem->mem_virtual) { - munmap(bo_gem->mem_virtual, bo_gem->bo.size); diff --git a/extra/libffado/60-ffado.rules b/extra/libffado/60-ffado.rules deleted file mode 100644 index 6ab8ef851..000000000 --- a/extra/libffado/60-ffado.rules +++ /dev/null @@ -1,27 +0,0 @@ -SUBSYSTEM!="firewire", GOTO="ffado_end" - -ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S -ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. -ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp. -ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation -ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG -ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation -ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH -ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio -ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc. -ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc. -ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc. -ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited -ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation -ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH -ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems -ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd. -ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION - -# The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those. - -ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW -ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire -ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME - -LABEL="ffado_end" diff --git a/extra/libffado/fix-segfault-on-close.patch b/extra/libffado/fix-segfault-on-close.patch deleted file mode 100644 index c81b97e40..000000000 --- a/extra/libffado/fix-segfault-on-close.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: /trunk/libffado/src/debugmodule/debugmodule.h
-===================================================================
---- /trunk/libffado/src/debugmodule/debugmodule.h (revision 1763)
-+++ /trunk/libffado/src/debugmodule/debugmodule.h (revision 1999)
-@@ -283,6 +283,10 @@
- void hexDumpQuadlets( quadlet_t *data_start, unsigned int length );
-
-+class DebugModuleManager;
-+
- class DebugModule {
- public:
-+ friend class DebugModuleManager;
-+
- enum {
- eDL_Message = DEBUG_LEVEL_MESSAGE,
-@@ -333,4 +337,5 @@
- std::string m_name;
- debug_level_t m_level;
-+ DebugModuleManager* m_manager;
- };
-
-Index: /trunk/libffado/src/debugmodule/debugmodule.cpp
-===================================================================
---- /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1763)
-+++ /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1999)
-@@ -84,5 +84,6 @@
- // << endl;
- // }
-- if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
-+
-+ if (m_manager && !m_manager->unregisterModule( *this ) ) {
- cerr << "Could not unregister DebugModule at DebugModuleManager"
- << endl;
-@@ -263,12 +264,9 @@
- DebugModuleManager::~DebugModuleManager()
- {
-- // cleanin up leftover modules
-- for ( DebugModuleVectorIterator it = m_debugModules.begin();
-- it != m_debugModules.end();
-- ++it )
-+ // cleaning up leftover modules
-+ while (!m_debugModules.empty())
- {
-- fprintf(stderr,"Cleaning up leftover debug module: %s\n",(*it)->getName().c_str());
-- m_debugModules.erase( it );
-- delete *it;
-+ DebugModule *mod = m_debugModules.back();
-+ unregisterModule(*mod);
- }
-
-@@ -455,4 +453,6 @@
- } else {
- m_debugModules.push_back( &debugModule );
-+ if (debugModule.m_manager == NULL)
-+ debugModule.m_manager = this;
- }
- return true;
-@@ -469,4 +469,6 @@
- if ( *it == &debugModule ) {
- m_debugModules.erase( it );
-+ if (debugModule.m_manager == this)
-+ debugModule.m_manager = NULL;
- return true;
- }
diff --git a/extra/libffado/libffado-gcc47.patch b/extra/libffado/libffado-gcc47.patch deleted file mode 100644 index f296956a5..000000000 --- a/extra/libffado/libffado-gcc47.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp ---- libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp 2009-05-17 23:42:38.000000000 +1000 -+++ libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp 2012-04-29 15:26:29.011454798 +1000 -@@ -35,6 +35,7 @@ - - #include <cstdio> - #include <cstring> -+#include <unistd.h> - - namespace BeBoB { - enum { -diff -Naur libffado-2.0.1-old/src/ffadodevice.cpp libffado-2.0.1/src/ffadodevice.cpp ---- libffado-2.0.1-old/src/ffadodevice.cpp 2008-11-23 21:25:32.000000000 +1000 -+++ libffado-2.0.1/src/ffadodevice.cpp 2012-04-29 15:26:54.883998052 +1000 -@@ -34,6 +34,7 @@ - - #include <iostream> - #include <sstream> -+#include <unistd.h> - - #include <assert.h> - -diff -Naur libffado-2.0.1-old/src/fireworks/fireworks_device.cpp libffado-2.0.1/src/fireworks/fireworks_device.cpp ---- libffado-2.0.1-old/src/fireworks/fireworks_device.cpp 2009-11-23 00:40:08.000000000 +1000 -+++ libffado-2.0.1/src/fireworks/fireworks_device.cpp 2012-04-29 15:27:24.123105334 +1000 -@@ -44,6 +44,7 @@ - #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000 - - #include <sstream> -+#include <unistd.h> - using namespace std; - - // FireWorks is the platform used and developed by ECHO AUDIO -diff -Naur libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp ---- libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp 2010-04-18 05:15:54.000000000 +1000 -+++ libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp 2012-04-29 15:27:44.515816147 +1000 -@@ -34,6 +34,7 @@ - #include "libutil/Configuration.h" - - #include <cstring> -+#include <unistd.h> - #include <assert.h> - - IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); -diff -Naur libffado-2.0.1-old/support/dbus/test-dbus.cpp libffado-2.0.1/support/dbus/test-dbus.cpp ---- libffado-2.0.1-old/support/dbus/test-dbus.cpp 2008-04-27 03:30:41.000000000 +1000 -+++ libffado-2.0.1/support/dbus/test-dbus.cpp 2012-04-29 15:28:31.531047923 +1000 -@@ -24,6 +24,7 @@ - #include <argp.h> - #include <stdlib.h> - #include <iostream> -+#include <unistd.h> - #include <signal.h> - - #include "controlclient.h" diff --git a/extra/libgdiplus/gdiplus-png14.patch b/extra/libgdiplus/gdiplus-png14.patch deleted file mode 100644 index d13260812..000000000 --- a/extra/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/extra/libktorrent/magnet.patch b/extra/libktorrent/magnet.patch deleted file mode 100644 index 5db76c101..000000000 --- a/extra/libktorrent/magnet.patch +++ /dev/null @@ -1,226 +0,0 @@ -commit 5107e4b7a050d7533f44801f5f5f5694203fd3b5 -Author: Joris Guisson <joris.guisson@gmail.com> -Date: Wed Jul 11 20:16:43 2012 +0200 - - Make sure all trackers are used of a magnet link - - BUG: 302997 - BUG: 303269 - -diff --git a/src/magnet/magnetlink.cpp b/src/magnet/magnetlink.cpp -index 525bfa5..43168dc 100644 ---- a/src/magnet/magnetlink.cpp -+++ b/src/magnet/magnetlink.cpp -@@ -19,13 +19,14 @@ - ***************************************************************************/ - - #include "magnetlink.h" -+#include <QUrl> - #include <QStringList> - #include <util/log.h> - #include <util/error.h> - - namespace bt - { -- -+ - MagnetLink::MagnetLink() - { - } -@@ -44,7 +45,7 @@ namespace bt - { - parse(mlink); - } -- -+ - MagnetLink::~MagnetLink() - { - } -@@ -64,83 +65,114 @@ namespace bt - { - return info_hash == mlink.infoHash(); - } -- -+ -+ static KUrl::List GetTrackers(const KUrl & url) -+ { -+ KUrl::List result; -+ const QString encoded_query = QString::fromLatin1(url.encodedQuery()); -+ const QString item = QLatin1String("tr="); -+ if(encoded_query.length() <= 1) -+ return result; -+ -+ const QStringList items = encoded_query.split(QString(QLatin1Char('&')), QString::SkipEmptyParts); -+ const int len = item.length(); -+ for(QStringList::ConstIterator it = items.begin(); it != items.end(); ++it) -+ { -+ if((*it).startsWith(item)) -+ { -+ if((*it).length() > len) -+ { -+ QString str = (*it).mid(len); -+ str.replace(QLatin1Char('+'), QLatin1Char(' ')); // + in queries means space. -+ result.push_back(QUrl::fromPercentEncoding(str.toLatin1())); -+ } -+ } -+ } -+ -+ return result; -+ } -+ - void MagnetLink::parse(const QString& mlink) - { - KUrl url(mlink); -- if (url.protocol() != "magnet") -+ if(url.protocol() != "magnet") - { -- Out(SYS_GEN|LOG_NOTICE) << "Invalid protocol of magnet link " -- << mlink << endl; -+ Out(SYS_GEN | LOG_NOTICE) << "Invalid protocol of magnet link " -+ << mlink << endl; - return; - } -- -+ - torrent_url = url.queryItem("to"); - //magnet://description-of-content.btih.HASH(-HASH)*.dht/path/file?x.pt=&x.to= - - // TODO automatically select these files and prefetches from here - path = url.queryItem("pt"); -- if ( path.isEmpty() && url.hasPath() && url.path() != "/" ) { -+ if(path.isEmpty() && url.hasPath() && url.path() != "/") -+ { - // TODO find out why RemoveTrailingSlash does not work - path = url.path(KUrl::RemoveTrailingSlash).remove(QRegExp("^/")); - } - - QString xt = url.queryItem("xt"); -- if ( xt.isEmpty() -- || !xt.startsWith("urn:btih:") ) { -+ if(xt.isEmpty() -+ || !xt.startsWith("urn:btih:")) -+ { - QRegExp btihHash("([^\\.]+).btih"); -- if ( btihHash.indexIn(url.host()) != -1 ) { -+ if(btihHash.indexIn(url.host()) != -1) -+ { - QString primaryHash = btihHash.cap(1).split("-")[0]; -- xt = "urn:btih:"+primaryHash; -- } else { -- Out(SYS_GEN|LOG_NOTICE) << "No hash found in magnet link " -- << mlink << endl; -+ xt = "urn:btih:" + primaryHash; -+ } -+ else -+ { -+ Out(SYS_GEN | LOG_NOTICE) << "No hash found in magnet link " -+ << mlink << endl; - return; - } - } -- -+ - QString ih = xt.mid(9); -- if (ih.length() != 40 && ih.length() != 32) -+ if(ih.length() != 40 && ih.length() != 32) - { -- Out(SYS_GEN|LOG_NOTICE) << "Hash has not valid length in magnet link " -- << mlink << endl; -+ Out(SYS_GEN | LOG_NOTICE) << "Hash has not valid length in magnet link " -+ << mlink << endl; - return; - } -- -+ - try - { -- if (ih.length() == 32) -+ if(ih.length() == 32) - ih = base32ToHexString(ih); - - Uint8 hash[20]; -- memset(hash,0,20); -- for (int i = 0;i < 20;i++) -+ memset(hash, 0, 20); -+ for(int i = 0; i < 20; i++) - { -- Uint8 low = charToHex(ih[2*i + 1]); -- Uint8 high = charToHex(ih[2*i]); -+ Uint8 low = charToHex(ih[2 * i + 1]); -+ Uint8 high = charToHex(ih[2 * i]); - hash[i] = (high << 4) | low; - } -- -+ - info_hash = SHA1Hash(hash); -- tracker_urls = url.queryItem("tr").split(","); -+ tracker_urls = GetTrackers(url); - name = url.queryItem("dn"); - magnet_string = mlink; - } -- catch (...) -+ catch(...) - { -- Out(SYS_GEN|LOG_NOTICE) << "Invalid magnet link " << mlink << endl; -+ Out(SYS_GEN | LOG_NOTICE) << "Invalid magnet link " << mlink << endl; - } - } -- -+ - Uint8 MagnetLink::charToHex(const QChar& ch) - { -- if (ch.isDigit()) -+ if(ch.isDigit()) - return ch.digitValue(); -- -- if (!ch.isLetter()) -+ -+ if(!ch.isLetter()) - throw bt::Error("Invalid char"); -- -- if (ch.isLower()) -+ -+ if(ch.isLower()) - return 10 + ch.toAscii() - 'a'; - else - return 10 + ch.toAscii() - 'A'; -@@ -155,28 +187,28 @@ namespace bt - QString str = s.toUpper(); - // 32 base32 chars -> 40 hex chars - // 4 base32 chars -> 5 hex chars -- for (int i = 0; i < 8; i++) -+ for(int i = 0; i < 8; i++) - { - part = 0; -- for (int j = 0; j < 4; j++) -+ for(int j = 0; j < 4; j++) - { -- ch = str[i*4 + j]; -- if (ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7)) -+ ch = str[i * 4 + j]; -+ if(ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7)) - throw bt::Error("Invalid char"); - -- if (ch.isDigit()) -- tmp = ch.digitValue() + 24; -+ if(ch.isDigit()) -+ tmp = ch.digitValue() + 24; - else - tmp = ch.toAscii() - 'A'; -- part = part + (tmp << 5*(3-j)); -+ part = part + (tmp << 5 * (3 - j)); - } - - // part is a Uint32 with 20 bits (5 hex) -- for (int j = 0; j < 5; j++) -+ for(int j = 0; j < 5; j++) - { -- tmp = (part >> 4*(4-j)) & 0xf; -- if (tmp >= 10) -- ret.append(QChar((tmp-10) + 'a')); -+ tmp = (part >> 4 * (4 - j)) & 0xf; -+ if(tmp >= 10) -+ ret.append(QChar((tmp - 10) + 'a')); - else - ret.append(QChar(tmp + '0')); - } diff --git a/extra/liblastfm/no-ftools.patch b/extra/liblastfm/no-ftools.patch deleted file mode 100644 index e8480c36d..000000000 --- a/extra/liblastfm/no-ftools.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- mxcl-liblastfm-3539836/admin/findsrc.rb~ 2010-09-19 10:35:34.783333338 +0200 -+++ mxcl-liblastfm-3539836/admin/findsrc.rb 2010-09-19 10:35:57.730000003 +0200 -@@ -1,6 +1,6 @@ - #!/usr/bin/ruby - require 'find' --require "#{File.dirname __FILE__}/platform" -+require "#{Dir.getwd}/admin/platform.rb" - - def findsrc dir='.' - excludes = ['.svn','.git','_include','tests','_build'] ---- mxcl-liblastfm-3539836/admin/qpp~ 2010-09-19 10:36:09.276666670 +0200 -+++ mxcl-liblastfm-3539836/admin/qpp 2010-09-19 10:36:16.926666670 +0200 -@@ -2,9 +2,8 @@ - # Creates a qmake .pro file for all valid SOURCES, HEADERS, FORMS and - # RESOURCES under each argument to ARGV as directories - --cwd=File.dirname __FILE__ - require 'find' --require "#{cwd}/findsrc" -+require "#{Dir.getwd}/admin/findsrc.rb" - - sources = Array.new - headers = Array.new ---- mxcl-liblastfm-3539836/admin/Makefile.rb~ 2010-09-19 10:35:38.086666671 +0200 -+++ mxcl-liblastfm-3539836/admin/Makefile.rb 2010-09-19 10:36:05.816666671 +0200 -@@ -4,9 +4,8 @@ - # and then creates the directory _include and creates files named after the - # class names in there which #include the file that contains the class - --cwd = File.dirname( __FILE__ ) - require 'find' --require "#{cwd}/platform.rb" -+require "#{Dir.getwd}/admin/platform.rb" - - - ######################################################################### defs diff --git a/extra/liblrdf/md5.patch b/extra/liblrdf/md5.patch deleted file mode 100644 index 1c43b12e9..000000000 --- a/extra/liblrdf/md5.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- liblrdf-0.4.0.orig/src/lrdf_md5.h -+++ liblrdf-0.4.0/src/lrdf_md5.h -@@ -32,6 +32,15 @@ - #ifndef __MD5_H__ - #define __MD5_H__ - -+/* Change function names to prevent symbol conflicts */ -+#define md5_init _lrdf_md5_init -+#define md5_buffer _lrdf_md5_buffer -+#define md5_sig_from_string _lrdf_md5_sig_from_string -+#define md5_finish _lrdf_md5_finish -+#define md5_process _lrdf_md5_process -+#define md5_sig_to_string _lrdf_md5_sig_to_string -+#define md5_get_result _lrdf_md5_get_result -+ - /* - * Size of a standard MD5 signature in bytes. This definition is for - * external programs only. The MD5 routines themselves reference the diff --git a/extra/liblrdf/pkgconfig-raptor.patch b/extra/liblrdf/pkgconfig-raptor.patch deleted file mode 100644 index c68f1f1b5..000000000 --- a/extra/liblrdf/pkgconfig-raptor.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- liblrdf-0.4.0/lrdf.pc.in.orig 2011-10-03 19:28:16.702773254 +0000 -+++ liblrdf-0.4.0/lrdf.pc.in 2011-10-03 19:28:43.003017477 +0000 -@@ -7,4 +7,5 @@ - Version: @VERSION@ - Description: liblrdf, a lightweight RDF library with extensions for LADSPA - Libs: -L${libdir} -llrdf --Cflags: -I${includedir} -+Libs.private: @RAPTOR_LIBS@ -+Cflags: @RAPTOR_CFLAGS@ -I${includedir} diff --git a/extra/liblrdf/raptor2.diff b/extra/liblrdf/raptor2.diff deleted file mode 100644 index 77f1ad0e3..000000000 --- a/extra/liblrdf/raptor2.diff +++ /dev/null @@ -1,193 +0,0 @@ ---- src/Makefile.am -+++ src/Makefile.am -@@ -4,5 +4,5 @@ lib_LTLIBRARIES = liblrdf.la - noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h - - liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c --liblrdf_la_LIBADD = -lraptor -+liblrdf_la_LIBADD = -lraptor2 - liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@ ---- src/lrdf.c -+++ src/lrdf.c -@@ -18,6 +18,7 @@ - static unsigned int lrdf_uid = 0; /* A unique(ish) id to append to genid's to - * avoid clashses */ - -+static raptor_world *world = NULL; - static lrdf_statement *triples = NULL; - static lrdf_statement *free_triples; - static lrdf_string_hash *resources_hash[LRDF_HASH_SIZE]; -@@ -43,8 +44,7 @@ static void lrdf_remove_triple_hash(lrdf_triple_hash ** tbl, - lrdf_hash hash, lrdf_statement * s); - static void lrdf_add_closure_hash(lrdf_closure_hash ** tbl, - lrdf_hash subject, lrdf_hash object); --static void lrdf_store(void *user_data, -- const raptor_statement * statement); -+static void lrdf_store(void *user_data, raptor_statement * statement); - void lrdf_free_statements(lrdf_statement * s); - void lrdf_copy_statement(lrdf_statement * from, lrdf_statement * to); - void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl, -@@ -71,7 +71,7 @@ void lrdf_init() - unsigned int i; - struct timeval tv; - -- raptor_init(); -+ world = raptor_new_world(); - lrdf_more_triples(256); - - /* A UID to add to genids to make them safer */ -@@ -112,7 +112,8 @@ void lrdf_more_triples(int count) - - void lrdf_cleanup() - { -- raptor_finish(); -+ raptor_free_world(world); -+ world = NULL; - - lrdf_free_string_hash(resources_hash); - lrdf_free_string_hash(literals_hash); -@@ -232,26 +233,29 @@ void lrdf_remove_matches(lrdf_statement *pattern) - } - } - --static void lrdf_store(void *user_data, const raptor_statement * statement) -+static const char *lrdf_term_as_string(char *tmp, int tmp_len, -+ const raptor_term *term) -+{ -+ switch (term->type) { -+ case RAPTOR_TERM_TYPE_URI: -+ return (const char *) raptor_uri_as_string(term->value.uri); -+ case RAPTOR_TERM_TYPE_LITERAL: -+ return (const char *) term->value.literal.string; -+ case RAPTOR_TERM_TYPE_BLANK: -+ snprintf(tmp, tmp_len, "_:%s.%x", term->value.blank.string, lrdf_uid); -+ return tmp; -+ default: -+ return "(?)"; -+ } -+} -+ -+static void lrdf_store(void *user_data, raptor_statement * statement) - { - lrdf_statement *s = lrdf_alloc_statement(); - char tmps[128], tmpp[128], tmpo[128]; -- char *subj = (char *) statement->subject, -- *pred = (char *) statement->predicate, -- *obj = (char *) statement->object; -- -- if (statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) { -- snprintf(tmps, 127, "_:%s.%x", subj, lrdf_uid); -- subj = tmps; -- } -- if (statement->predicate_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) { -- snprintf(tmpp, 127, "_:%s.%x", pred, lrdf_uid); -- pred = tmpp; -- } -- if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) { -- snprintf(tmpo, 127, "_:%s.%x", obj, lrdf_uid); -- obj = tmpo; -- } -+ const char *subj = lrdf_term_as_string(tmps, 128, statement->subject), -+ *pred = lrdf_term_as_string(tmpp, 128, statement->predicate), -+ *obj = lrdf_term_as_string(tmpo, 128, statement->object); - - s->shash = lrdf_gen_hash(subj); - s->phash = lrdf_gen_hash(pred); -@@ -261,7 +265,7 @@ static void lrdf_store(void *user_data, const raptor_statement * statement) - - s->subject = lrdf_check_hash(resources_hash, s->shash, subj); - s->predicate = lrdf_check_hash(resources_hash, s->phash, pred); -- if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL) { -+ if (statement->object->type == RAPTOR_TERM_TYPE_LITERAL) { - s->object = lrdf_check_hash(literals_hash, s->ohash, obj); - s->object_type = lrdf_literal; - } else { -@@ -537,28 +541,22 @@ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl, - free(pathto); - } - --static void lrdf_error_handler(void *data, raptor_locator * locator, -- const char *message); -+static void lrdf_log_handler(void *data, raptor_log_message *message); - --static void lrdf_error_handler(void *data, raptor_locator * locator, -- const char *message) -+static void lrdf_log_handler(void *data, raptor_log_message *message) - { -- fprintf(stderr, "liblrdf: error - "); -- raptor_print_locator(stderr, locator); -- fprintf(stderr, " - %s\n", message); -- -- raptor_parse_abort((raptor_parser*)data); --} -+ const char *severity = "error"; -+ if (message->level == RAPTOR_LOG_LEVEL_WARN) { -+ severity = "warning"; -+ } - --static void lrdf_warning_handler(void *data, raptor_locator * locator, -- const char *message); -+ fprintf(stderr, "liblrdf: %s - ", severity); -+ raptor_locator_print(message->locator, stderr); -+ fprintf(stderr, " - %s\n", message->text); - --static void lrdf_warning_handler(void *data, raptor_locator * locator, -- const char *message) --{ -- fprintf(stderr, "liblrdf: warning - "); -- raptor_print_locator(stderr, locator); -- fprintf(stderr, " - %s\n", message); -+ if (message->level != RAPTOR_LOG_LEVEL_WARN) { -+ raptor_parser_parse_abort((raptor_parser*)data); -+ } - } - - -@@ -593,15 +591,15 @@ int lrdf_read_file_intl(const char *uri) - lrdf_hash source; - - //printf("lrdf: reading %s\n", uri); -- ruri = raptor_new_uri(uri); -- furi = raptor_new_uri(uri); -+ ruri = raptor_new_uri(world, (const unsigned char *) uri); -+ furi = raptor_new_uri(world, (const unsigned char *) uri); - source = lrdf_gen_hash(uri); - lrdf_check_hash(resources_hash, source, uri); - - if (strstr(uri, ".rdf")) { -- parser = raptor_new_parser("rdfxml"); -+ parser = raptor_new_parser(world, "rdfxml"); - } else { -- parser = raptor_new_parser("ntriples"); -+ parser = raptor_new_parser(world, "ntriples"); - } - if (!parser) { - fprintf(stderr, "liblrdf: failed to create parser\n"); -@@ -609,12 +607,11 @@ int lrdf_read_file_intl(const char *uri) - return 1; - } - -- raptor_set_error_handler(parser, parser, lrdf_error_handler); -- raptor_set_warning_handler(parser, NULL, lrdf_warning_handler); -- raptor_set_statement_handler(parser, &source, lrdf_store); -- raptor_set_default_generate_id_parameters(parser, NULL, ++lrdf_uid); -+ raptor_world_set_log_handler(world, parser, lrdf_log_handler); -+ raptor_parser_set_statement_handler(parser, &source, lrdf_store); -+ raptor_world_set_generate_bnodeid_parameters(world, NULL, ++lrdf_uid); - -- if (raptor_parse_file(parser, furi, ruri)) { -+ if (raptor_parser_parse_file(parser, furi, ruri)) { - raptor_free_uri(furi); - raptor_free_uri(ruri); - raptor_free_parser(parser); ---- configure.ac -+++ configure.ac -@@ -18,7 +18,7 @@ - AC_HEADER_STDC - AC_CHECK_HEADERS([errno.h limits.h stdlib.h string.h unistd.h]) - --PKG_CHECK_MODULES(RAPTOR, raptor >= 0.9.11) -+PKG_CHECK_MODULES(RAPTOR, raptor2 >= 0.9.11) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST diff --git a/extra/libmikmod/libmikmod-3.1.12-64bit-fix.diff b/extra/libmikmod/libmikmod-3.1.12-64bit-fix.diff deleted file mode 100644 index cd7800881..000000000 --- a/extra/libmikmod/libmikmod-3.1.12-64bit-fix.diff +++ /dev/null @@ -1,47 +0,0 @@ -Date: Sun, 04 Jul 2004 11:53:23 +0200 -From: Josselin Mouette -Subject: Re: sdl 64bit problem [PATCH] - -Le sam, 03/07/2004 ďż˝ 18:20 +0200, Hans-Frieder Vogt a ďż˝crit : -> Hi list, -> -> I found the problem that lead to the distorted sound in tuxracer on AMD64. It -> may have also been the cause for the other reported sound problems with SDL. -> The problem is not in SDL, but in SDL-mixer. -> There, music files (*.it, and probably others as well) are incorrectly read on -> all 64 bit architectures but Alpha, due to an incorrect data type definition. -> The attached patch should solve the problem for all 64 bit architectures on -> Linux, since at least cpp defines _LP64 and __LP64__ for them. -> _LP64 indicates that long ints and pointers are 64 bits, but integers are 32 -> bits. -> I am not sure whether the usage of _LP64 is also standard for the commercial -> compilers, and for other Unixes, but at least Solaris 9 defines _LP64 in the -> 64 bit environment as well. -> -> Josselin, -> could you include this patch into your next debian packages? - -diff -ru libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in ---- libmikmod-3.1.12.orig/include/mikmod.h.in 2007-12-15 01:24:19.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod.h.in 2009-10-05 00:18:56.000000000 -0700 -@@ -85,7 +85,7 @@ - - @DOES_NOT_HAVE_SIGNED@ - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ -diff -ru libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h ---- libmikmod-3.1.12.orig/include/mikmod_internals.h 2007-12-15 04:24:51.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod_internals.h 2009-10-05 00:19:15.000000000 -0700 -@@ -50,7 +50,7 @@ - /*========== More type definitions */ - - /* SLONGLONG: 64bit, signed */ --#if defined (__arch64__) || defined(__alpha) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - typedef long SLONGLONG; - #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) diff --git a/extra/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff b/extra/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff deleted file mode 100644 index fe62892b5..000000000 --- a/extra/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff +++ /dev/null @@ -1,21 +0,0 @@ -Date: 15 Apr 2002 11:01:19 +0200 -From: Guillaume Cottenceau <gc@mandrakesoft.com> - -Unfortunately, I should have double checked that the following -fix (authored by Dave Goehrig <dave@cthulhu-burger.org>, not me), -was really in the CVS... it's not, as of stable 1.2.3 at least. -Please include it, it fixes a segfault on exiting a program which -disabled MOD music during its execution. - -diff -ru libmikmod-3.1.12.orig/playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c ---- libmikmod-3.1.12.orig/playercode/virtch_common.c 2007-12-15 01:26:53.000000000 -0800 -+++ libmikmod-3.1.12/playercode/virtch_common.c 2009-10-05 00:37:12.000000000 -0700 -@@ -347,7 +347,7 @@ - - void VC1_SampleUnload(SWORD handle) - { -- if (handle<MAXSAMPLEHANDLES) { -+ if (Samples && handle<MAXSAMPLEHANDLES) { - if (Samples[handle]) - free(Samples[handle]); - Samples[handle]=NULL; diff --git a/extra/libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff b/extra/libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff deleted file mode 100644 index 45cc355ae..000000000 --- a/extra/libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff +++ /dev/null @@ -1,112 +0,0 @@ -This patch fixes "buffer overflow due to md_numchn - ID: 1630158" - -diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- libmikmod-3.1.12.orig/playercode/mplayer.c 2007-12-15 01:26:28.000000000 -0800 -+++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-04 23:48:36.000000000 -0700 -@@ -52,6 +52,8 @@ - will wait */ - /*static*/ MODULE *pf = NULL; - -+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices) -+ - #define HIGH_OCTAVE 2 /* number of above-range octaves */ - - static UWORD oldperiods[OCTAVE*2]={ -@@ -248,14 +250,14 @@ - MP_VOICE *a; - ULONG t,k,tvol,pp; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (((mod->voice[t].main.kick==KICK_ABSENT)|| - (mod->voice[t].main.kick==KICK_ENV))&& - Voice_Stopped_internal(t)) - return t; - - tvol=0xffffffUL;t=-1;a=mod->voice; -- for (k=0;k<md_sngchn;k++,a++) { -+ for (k=0;k<NUMVOICES(mod);k++,a++) { - /* allow us to take over a nonexisting sample */ - if (!a->main.s) - return k; -@@ -2249,12 +2251,12 @@ - - switch (dat) { - case 0x0: /* past note cut */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.fadevol=0; - break; - case 0x1: /* past note off */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) { - mod->voice[t].main.keyoff|=KEY_OFF; - if ((!(mod->voice[t].venv.flg & EF_ON))|| -@@ -2263,7 +2265,7 @@ - } - break; - case 0x2: /* past note fade */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.keyoff|=KEY_FADE; - break; -@@ -2318,7 +2320,7 @@ - SAMPLE *s; - - mod->totalchn=mod->realchn=0; -- for (channel=0;channel<md_sngchn;channel++) { -+ for (channel=0;channel<NUMVOICES(mod);channel++) { - aout=&mod->voice[channel]; - i=aout->main.i; - s=aout->main.s; -@@ -2736,7 +2738,7 @@ - if (a->dct!=DCT_OFF) { - int t; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if ((!Voice_Stopped_internal(t))&& - (mod->voice[t].masterchn==channel)&& - (a->main.sample==mod->voice[t].main.sample)) { -@@ -2978,6 +2980,11 @@ - if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE)))) - return 1; - -+ /* mod->numvoices was used during loading to clamp md_sngchn. -+ After loading it's used to remember how big mod->voice is. -+ */ -+ mod->numvoices = md_sngchn; -+ - Player_Init_internal(mod); - return 0; - } -@@ -3086,7 +3093,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3111,7 +3118,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3138,7 +3145,7 @@ - pf->sngpos=pos; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; diff --git a/extra/libmikmod/libmikmod-CVE-2009-0179.patch b/extra/libmikmod/libmikmod-CVE-2009-0179.patch deleted file mode 100644 index 0c47e6545..000000000 --- a/extra/libmikmod/libmikmod-CVE-2009-0179.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c ---- libmikmod-3.1.11.orig/loaders/load_xm.c 2004-01-21 18:43:53.000000000 +0100 -+++ libmikmod-3.1.11/loaders/load_xm.c 2008-04-16 04:30:45.000000000 +0200 -@@ -622,7 +622,8 @@ - /* read the remainder of the header */ - for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader); - -- if(_mm_eof(modreader)) { -+ /* last instrument is at the end of file in version 0x0104 */ -+ if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) { - free(nextwav);free(wh); - nextwav=NULL;wh=NULL; - _mm_errno = MMERR_LOADING_SAMPLEINFO; -diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c ---- libmikmod-3.1.11.orig/playercode/mloader.c 2004-01-21 18:43:53.000000000 +0100 -+++ libmikmod-3.1.11/playercode/mloader.c 2008-04-16 04:30:45.000000000 +0200 -@@ -450,10 +450,12 @@ - if (!l->Init || l->Init()) { - _mm_rewind(modreader); - ok = l->Load(curious); -- /* propagate inflags=flags for in-module samples */ -- for (t = 0; t < of.numsmp; t++) -- if (of.samples[t].inflags == 0) -- of.samples[t].inflags = of.samples[t].flags; -+ if (ok) { -+ /* propagate inflags=flags for in-module samples */ -+ for (t = 0; t < of.numsmp; t++) -+ if (of.samples[t].inflags == 0) -+ of.samples[t].inflags = of.samples[t].flags; -+ } - } else - ok = 0; - diff --git a/extra/libmusicbrainz4/PKGBUILD b/extra/libmusicbrainz4/PKGBUILD deleted file mode 100644 index c9a71ab86..000000000 --- a/extra/libmusicbrainz4/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 159207 2012-05-18 00:45:43Z eric $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Max Fehrm max.fehrm@gmail.com - -pkgname=libmusicbrainz4 -pkgver=4.0.3 -pkgrel=1 -pkgdesc="Library That Provides Access to the MusicBrainz Server" -arch=('i686' 'x86_64' 'mips64el') -url="http://musicbrainz.org/" -license=('LGPL2.1') -depends=('neon') -makedepends=('cmake') -source=(https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-$pkgver.tar.gz) -md5sums=('19b43a543d338751e9dc524f6236892b') - -build() { - cd libmusicbrainz-$pkgver - cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr - make -} - -package() { - cd libmusicbrainz-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/extra/libreoffice/PKGBUILD.36 b/extra/libreoffice/PKGBUILD.36 deleted file mode 100644 index 71ee72c1c..000000000 --- a/extra/libreoffice/PKGBUILD.36 +++ /dev/null @@ -1,715 +0,0 @@ -# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z 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-postgresql-connector' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-scripting-beanshell' - 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python' - 'libreoffice-extension-wiki-publisher' - 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.6.0.4 -pkgver=3.6.0 -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' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' - #'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' 'libxslt' 'librsvg' "icu>=49.1" - '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" -_additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.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}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz - ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 - ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - buildfix.diff - libreoffice-common.sh libreoffice-common.csh) -noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 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 - 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.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 - ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('67cf97e86c75363238a371f64ef5f606' - '8422b0c4c797abeefed3ee4490586dd2' - '6cc8fa86be8c657ba23434c6c8d99416' - '18f577b374d60b3c760a3a3350407632' - 'f02578f5218f217a9f20e9c30e119c6a' - 'a9a1db27688bad49418667b434d29c1f' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '0ff7d225d087793c8c2c680d77aac3e7' - '6097739c841f671cb21332b9cc593ae7' - '0d2dcdfbf28d6208751b33057f5361f0' - 'ce5a1def34578b75959ac31210f031f6' - '185d60944ea767075d27247c3162b3bc' - '234e91ac65945ce1ab1e3839780e90f7' - 'f0e72d0e1bc93a50a3aa9d31350b156c' - '867c682b45f477f916786e00c45d7ab7') - -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 - patch -Np1 -i ${srcdir}/buildfix.diff - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - 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" \ - - ./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\ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --enable-ext-wiki-publisher \ - --enable-ext-nlpsolver \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-librsvg=system \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-libcdr \ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-libexttextcat \ - --without-system-jfreereport \ - --without-system-apache-commons \ - --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/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-clucene\ - --without-system-servlet-api \ - --with-java-target-version=1.5 \ - $EXTRAOPTS - -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - - 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=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" - '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' - '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' - 'clucene: full-text search engine library 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 . - - # set python-uno PYTHON path - install -dm755 ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ - - # move bash-completion files to its new place - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh - rm -rf ${pkgdir}/etc/bash_completion.d - - # some files would conflict - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb -} - -package_libreoffice-base() { - pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." - install=libreoffice-base.install - depends=('libreoffice-common' 'hsqldb-java') - optdepends=('libreoffice-postgresql-connector') - 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-postgresql-connector() { - pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" - depends=('libreoffice-base' 'postgresql-libs') - groups=('libreoffice') - replaces=('libreoffice') - - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry - - # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_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/postgresql_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." - install=libreoffice-calc.install - 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." - install=libreoffice-draw.install - 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." - install=libreoffice-impress.install - 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 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/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 environment path to keep compatibility with openjdk6 and openjdk7 - #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} -} - -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 Application for LibreOffice." - install=libreoffice-writer.install - 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.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 -} - -package_libreoffice-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/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-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/program/{classes,services} - mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python2') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - -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}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -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}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} diff --git a/extra/libreoffice/buildfix.diff b/extra/libreoffice/buildfix.diff deleted file mode 100644 index 327b10bb1..000000000 --- a/extra/libreoffice/buildfix.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk 2012-06-07 13:57:10.000000000 +0200 -+++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new 2012-06-09 18:21:03.376024873 +0200 -@@ -49,9 +49,6 @@ - StaticLibrary_pdfimport_s \ - )) - --$(eval $(call gb_Module_add_check_targets,sdext,\ -- CppunitTest_pdfimport \ --)) - endif - - ifeq ($(ENABLE_PRESENTER_SCREEN),YES) diff --git a/extra/libreoffice/buildfix_icu49.diff b/extra/libreoffice/buildfix_icu49.diff deleted file mode 100644 index 7a774dee0..000000000 --- a/extra/libreoffice/buildfix_icu49.diff +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=410307 - ---- i18npool/source/breakiterator/data/char_in.txt -+++ i18npool/source/breakiterator/data/char_in.txt -@@ -15,7 +15,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; -@@ -72,7 +72,7 @@ - [^$Control $CR $LF] $Extend; - - [^$Control $CR $LF] $SpacingMark; --$Prepend [^$Control $CR $LF]; -+# $Prepend [^$Control $CR $LF]; - - - ## ------------------------------------------------- -@@ -94,7 +94,7 @@ - - $Extend [^$Control $CR $LF]; - $SpacingMark [^$Control $CR $LF]; --[^$Control $CR $LF] $Prepend; -+# [^$Control $CR $LF] $Prepend; - - - ## ------------------------------------------------- ---- i18npool/source/breakiterator/data/char.txt -+++ i18npool/source/breakiterator/data/char.txt -@@ -16,7 +16,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/extra/libreoffice/fix_broken_hebrew_wordwrapping.diff b/extra/libreoffice/fix_broken_hebrew_wordwrapping.diff deleted file mode 100644 index ba4850c77..000000000 --- a/extra/libreoffice/fix_broken_hebrew_wordwrapping.diff +++ /dev/null @@ -1,360 +0,0 @@ -From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Sun, 13 May 2012 21:41:30 +0000 -Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules - -i.e. sync with svn diff -c 31071 -http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt - -Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6 ---- -diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx -index 14051d4..ffd590c 100644 ---- a/i18npool/qa/cppunit/test_breakiterator.cxx -+++ b/i18npool/qa/cppunit/test_breakiterator.cxx -@@ -42,6 +42,7 @@ - #include <unotest/bootstrapfixturebase.hxx> - - #include <rtl/strbuf.hxx> -+#include <rtl/ustrbuf.hxx> - - #include <string.h> - -@@ -58,6 +59,9 @@ public: - void testWeak(); - void testAsian(); - void testThai(); -+#if TODO -+ void testNorthernThai(); -+#endif - - CPPUNIT_TEST_SUITE(TestBreakIterator); - CPPUNIT_TEST(testLineBreaking); -@@ -71,6 +71,9 @@ - CPPUNIT_TEST(testWeak); - CPPUNIT_TEST(testAsian); - CPPUNIT_TEST(testThai); -+#if TODO -+ CPPUNIT_TEST(testNorthernThai); -+#endif - CPPUNIT_TEST_SUITE_END(); - - private: -@@ -80,28 +83,46 @@ - uno::Reference<i18n::XBreakIterator> m_xBreak; - }; - --//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation - void TestBreakIterator::testLineBreaking() - { -- ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -- - i18n::LineBreakHyphenationOptions aHyphOptions; - i18n::LineBreakUserOptions aUserOptions; - lang::Locale aLocale; - -- aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -- aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -- -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=31271 - { -- //Here we want the line break to leave text here) on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -+ -+ { -+ //Here we want the line break to leave text here) on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ } -+ -+ { -+ //Here we want the line break to leave "here)" on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ } - } - -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=49849 - { -- //Here we want the line break to leave "here)" on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD }; -+ ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); -+ ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL")); -+ -+ { -+ //Here we want the line break to happen at the whitespace -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1); -+ } - } - } - -@@ -295,27 +320,29 @@ void TestBreakIterator::testThai() - aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")); - aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); - -- i18n::Boundary aBounds; -- { -- const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } -+ const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -+} - --#ifdef TODO -- { -- const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } --#endif -+#if TODO -+void TestBreakIterator::testNorthernThai() -+{ -+ lang::Locale aLocale; -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); -+ -+ const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); - } -+#endif - - void TestBreakIterator::setUp() - { -diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README -new file mode 100644 -index 0000000..8d7598d ---- a/dev/null -+++ b/i18npool/source/breakiterator/data/README -@@ -0,0 +1,12 @@ -+The originals of these come from svn checkout -+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no -+longer appear in the icu tarballs, but are in icu's svn -+ -+At various stages these copies have been customized and are not horribly out of -+sync. It unclear which diffs from the base versions are deliberate and which -+are now accidental :-( -+ -+We need to review the various issues referenced in the commits that caused -+custimizations and see if they're still relevant or not, write regression tests -+for them, if any are still relavant then apply the changes back on top of the -+latest versions. -diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt -index cbabee6..91c8f3d 100644 ---- a/i18npool/source/breakiterator/data/line.txt -+++ b/i18npool/source/breakiterator/data/line.txt -@@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:]; - $BK = [:LineBreak = Mandatory_Break:]; - $B2 = [:LineBreak = Break_Both:]; - $CB = [:LineBreak = Contingent_Break:]; -+$CJ = [:LineBreak = Conditional_Japanese_Starter:]; - $CL = [:LineBreak = Close_Punctuation:] ; - $CM = [:LineBreak = Combining_Mark:]; - $CR = [:LineBreak = Carriage_Return:]; - $EX = [:LineBreak = Exclamation:]; - $GL = [:LineBreak = Glue:]; -+$HL = [:LineBreak = Hebrew_Letter:]; - $HY = [:LineBreak = Hyphen:]; - $H2 = [:LineBreak = H2:]; - $H3 = [:LineBreak = H3:]; -@@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:]; - $JT = [:LineBreak = JT:]; - $LF = [:LineBreak = Line_Feed:]; - $NL = [:LineBreak = Next_Line:]; --$NS = [:LineBreak = Nonstarter:]; -+$NS = [[:LineBreak = Nonstarter:] $CJ]; - $NU = [:LineBreak = Numeric:]; - $OP = [[:LineBreak = Open_Punctuation:] - $DG]; - $PO = [:LineBreak = Postfix_Numeric:]; -@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*; - $CLcm = $CL $CM*; - $EXcm = $EX $CM*; - $GLcm = $GL $CM*; -+$HLcm = $HL $CM*; - $HYcm = $HY $CM*; - $H2cm = $H2 $CM*; - $H3cm = $H3 $CM*; -@@ -150,6 +153,7 @@ $B2 $CM+; - $CL $CM+; - $EX $CM+; - $GL $CM+; -+$HL $CM+; - $HY $CM+; - $H2 $CM+; - $H3 $CM+; -@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs - # so for this one case we need to manually list out longer sequences. - # - $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; --$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; -+$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; - $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; - - -@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); - $BBcm [^$CB]; # $BB x - $BBcm $LB20NonBreaks $CM*; - -+# LB 21a Don't break after Hebrew + Hyphen -+# HL (HY | BA) x -+# -+$HLcm ($HYcm | $BAcm) [^$CB]?; -+ - # LB 22 --$ALcm $INcm; -+($ALcm | $HLcm) $INcm; - $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL - $IDcm $INcm; - $INcm $INcm; -@@ -331,16 +340,18 @@ $NUcm $INcm; - # $LB 23 - $IDcm $POcm; - $ALcm $NUcm; # includes $LB19 -+$HLcm $NUcm; - $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL - $NUcm $ALcm; -+$NUcm $HLcm; - - # - # LB 24 - # - $PRcm $IDcm; - $ALcm $PRcm; --$PRcm $ALcm; --$POcm $ALcm; -+$PRcm ($ALcm | $HLcm); -+$POcm ($ALcm | $HLcm); - - # - # LB 25 Numbers. -@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); - - # LB 28 Do not break between alphabetics - # --$ALcm $ALcm; --$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL -+($ALcm | $HLcm) ($ALcm | $HLcm); -+$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL - - # LB 29 - $IScm ($ALcm | $NUcm); -@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm); - # Rule 30 Do not break between letters, numbers or ordinary symbols - # and opening or closing punctuation - # --($ALcm | $NUcm) $OPcm; -+($ALcm | $HLcm | $NUcm) $OPcm; - $CM+ $OPcm; --$CLcm ($ALcm | $NUcm); -- -- -+$CLcm ($ALcm | $HLcm | $NUcm); - - # - # Reverse Rules. -@@ -391,6 +400,7 @@ $CM+ $B2; - $CM+ $CL; - $CM+ $EX; - $CM+ $GL; -+$CM+ $HL; - $CM+ $HY; - $CM+ $H2; - $CM+ $H3; -@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) - $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . - [^$CB] $CM* $BB; # - -- -+# LB21a -+[^$CB] $CM* ($HY | $BA) $CM* $HL; - - # LB 22 --$CM* $IN $CM* $ALPlus; -+$CM* $IN $CM* ($ALPlus | $HL); - $CM* $IN $CM* $ID; - $CM* $IN $CM* $IN; - $CM* $IN $CM* $NU; - - # LB 23 - $CM* $PO $CM* $ID; --$CM* $NU $CM* $ALPlus; --$CM* $ALPlus $CM* $NU; -+$CM* $NU $CM* ($ALPlus | $HL); -+$CM* ($ALPlus | $HL) $CM* $NU; - - # LB 24 - $CM* $ID $CM* $PR; - $CM* $PR $CM* $ALPlus; --$CM* $ALPlus $CM* $PR; --$CM* $ALPlus $CM* $PO; -+$CM* ($ALPlus | $HL) $CM* $PR; -+$CM* ($ALPlus | $HL) $CM* $PO; - - $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP; - $CM* $NU+ $CM* $HY+ / $SP; -@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL); - $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR; - - # LB 28 --$CM* $ALPlus $CM* $ALPlus; -- -+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL); - - # LB 29 - $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP]; - - # LB 30 --$CM* $OP $CM* ($NU | $ALPlus); --$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP]; -+$CM* $OP $CM* ($ALPlus | $HL | $NU); -+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; - - - ## ------------------------------------------------- -@@ -609,6 +619,9 @@ $SP+ $CM* $QU; - $SP+ $CM* $CL; - $SP+ $CM* $B2; - -+# LB 21 -+$CM* ($HY | $BA) $CM* $HL; -+ - # LB 18 - ($CM* ($IS | $SY))+ $CM* $NU; - $CL $CM* ($NU | $IS | $SY); -@@ -629,6 +642,6 @@ $dictionary $dictionary; - # turn off rule chaining. We don't want to move more - # than necessary. - # --[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary]; -+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary]; - $dictionary $dictionary; - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/git_fixes.diff b/extra/libreoffice/git_fixes.diff deleted file mode 100644 index a4cd891cb..000000000 --- a/extra/libreoffice/git_fixes.diff +++ /dev/null @@ -1,743 +0,0 @@ -From 427529801dee122250e44d2311b34651db92bbdb Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Tue, 21 Aug 2012 16:55:11 +0000 -Subject: Typo - -Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106 -(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b) - -Signed-off-by: Eike Rathke <erack@redhat.com> ---- -diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx -index d929787..55ebaca 100644 ---- a/desktop/source/app/app.cxx -+++ b/desktop/source/app/app.cxx -@@ -194,7 +194,7 @@ void removeTree(OUString const & url) { - osl::FileBase::RC rc = osl::Directory::remove(url); - SAL_WARN_IF( - rc != osl::FileBase::E_None, "desktop", -- "cannot remove directory " << url << ": " +rc); -+ "cannot remove directory " << url << ": " << +rc); - // at least on Windows XP removing some existing directories fails with - // osl::FileBase::E_ACCESS because they are read-only; but keeping those - // directories around should be harmless once they are empty --- -cgit v0.9.0.2-2-gbebe -From b4f8acb41165a28b2db47acd3c6b624a4c507c54 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 24 Aug 2012 14:06:15 +0000 -Subject: Fix removeRdbFiles (caused extension update to fail) - -removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the -corresponding component (.so, .jar, etc.), but not the .rdb file. So removing -an .rdb file silently failed to remove the corresponding implementations, so re- -installing a similar enough .rdb (as typically happens during extension update) -would fail due to duplicate implementation names. - -Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe -Reviewed-on: https://gerrit.libreoffice.org/476 -Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> -Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> ---- -diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx -index c3bdba3..7fd1e4a 100644 ---- a/cppuhelper/source/defaultbootstrap.cxx -+++ b/cppuhelper/source/defaultbootstrap.cxx -@@ -130,9 +130,10 @@ struct ImplementationInfo: private boost::noncopyable { - rtl::OUString const & theName, rtl::OUString const & theLoader, - rtl::OUString const & theUri, rtl::OUString const & thePrefix, - css::uno::Reference< css::uno::XComponentContext > const & -- theAlienContext): -+ theAlienContext, -+ rtl::OUString const & theRdbFile): - name(theName), loader(theLoader), uri(theUri), prefix(thePrefix), -- alienContext(theAlienContext) -+ alienContext(theAlienContext), rdbFile(theRdbFile) - {} - - explicit ImplementationInfo(rtl::OUString const & theName): name(theName) {} -@@ -142,6 +143,7 @@ struct ImplementationInfo: private boost::noncopyable { - rtl::OUString const uri; - rtl::OUString const prefix; - css::uno::Reference< css::uno::XComponentContext > const alienContext; -+ rtl::OUString const rdbFile; - std::vector< rtl::OUString > services; - std::vector< rtl::OUString > singletons; - }; -@@ -149,12 +151,12 @@ struct ImplementationInfo: private boost::noncopyable { - struct Implementation: private boost::noncopyable { - Implementation( - rtl::OUString const & name, rtl::OUString const & loader, -- rtl::OUString const & uri, -- rtl::OUString const & prefix = rtl::OUString(), -- css::uno::Reference< css::uno::XComponentContext > const & -- alienContext -- = css::uno::Reference< css::uno::XComponentContext >()): -- info(new ImplementationInfo(name, loader, uri, prefix, alienContext)), -+ rtl::OUString const & uri, rtl::OUString const & prefix, -+ css::uno::Reference< css::uno::XComponentContext > const & alienContext, -+ rtl::OUString const & rdbFile): -+ info( -+ new ImplementationInfo( -+ name, loader, uri, prefix, alienContext, rdbFile)), - loaded(false) - {} - -@@ -466,7 +468,7 @@ void Parser::handleImplementation() { - implementation_.reset( - new Implementation( - attrImplementation_, attrLoader_, attrUri_, attrPrefix_, -- alienContext_)); -+ alienContext_, reader_.getUrl())); - if (!data_->namedImplementations.insert( - NamedImplementations::value_type( - attrImplementation_, implementation_)). -@@ -1502,7 +1504,9 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { - boost::shared_ptr< Implementation > impl( - new Implementation( - name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"), -- readLegacyRdbString(uri, implKey, "UNO/LOCATION"))); -+ readLegacyRdbString(uri, implKey, "UNO/LOCATION"), -+ rtl::OUString(), -+ css::uno::Reference< css::uno::XComponentContext >(), uri)); - if (!data_.namedImplementations.insert( - NamedImplementations::value_type(name, impl)). - second) -@@ -1744,7 +1748,7 @@ void ServiceManager::removeRdbFiles(std::vector< rtl::OUString > const & uris) { - j != data_.namedImplementations.end();) - { - assert(j->second.get() != 0); -- if (j->second->info->uri == *i) { -+ if (j->second->info->rdbFile == *i) { - clear.push_back(j->second); - //TODO: The below leaves data_ in an inconsistent state upon - // exceptions: --- -cgit v0.9.0.2-2-gbebe -From 6d261e7aac12a876acb6496085e5329632595d39 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 24 Aug 2012 14:45:20 +0000 -Subject: fdo#53968 etc.: Fix more "doesn't start after upgrade" problems - -* fdo#53968 revealed that multiple soffice.bin instances can run removeTree in - parallel. Therefore, demoted failures from exceptions to SAL_WARNs. (And - keeping fingers crossed.) - -* a8cdce148c76c93c5d41820610d6e6ac175e03a7 "fdo#53655: Ignore failure to remove - directories (as happens on Windows XP)" was due to a forgotten - osl::Directory::close before calling osl::Directory::remove after all. - -* UserInstallations have been seen in the wild where no extensions were - installed per-user (any longer), but user/uno_packages/cache/registry/ - com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files - contained data nevertheless. To reliably clean out any old junk, - refreshBundledExtensionsDir has been extended to cleanExtensionsCache which in - tandem with an extended Desktop::SynchronizeExtensionRepositories now cleanly - re-installs all bundled, shared, and per-user extensions after a LO upgrade. - -Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0 -Reviewed-on: https://gerrit.libreoffice.org/477 -Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> -Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> ---- -diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx -index 25b6352..c830b02 100644 ---- a/desktop/inc/app.hxx -+++ b/desktop/inc/app.hxx -@@ -203,6 +203,7 @@ class Desktop : public Application - - sal_Bool m_bMinimized; - sal_Bool m_bInvisible; -+ bool m_bCleanedExtensionCache; - bool m_bServicesRegistered; - sal_uInt16 m_nAppEvents; - BootstrapError m_aBootstrapError; -diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx -index 55ebaca..5fb653b 100644 ---- a/desktop/source/app/app.cxx -+++ b/desktop/source/app/app.cxx -@@ -147,77 +147,81 @@ namespace { - - void removeTree(OUString const & url) { - osl::Directory dir(url); -- switch (dir.open()) { -+ osl::FileBase::RC rc = dir.open(); -+ switch (rc) { - case osl::FileBase::E_None: - break; - case osl::FileBase::E_NOENT: - return; //TODO: SAL_WARN if recursive - default: -- throw css::uno::RuntimeException( -- "cannot open directory " + url, -- css::uno::Reference< css::uno::XInterface >()); -+ SAL_WARN("desktop", "cannot open directory " << url << ": " << +rc); -+ return; - } - for (;;) { - osl::DirectoryItem i; -- osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32); -+ rc = dir.getNextItem(i, SAL_MAX_UINT32); - if (rc == osl::FileBase::E_NOENT) { - break; - } - if (rc != osl::FileBase::E_None) { -- throw css::uno::RuntimeException( -- ("cannot iterate directory " + url + ": " -- + OUString::valueOf(static_cast< sal_Int32 >(rc))), -- css::uno::Reference< css::uno::XInterface >()); -+ SAL_WARN( -+ "desktop","cannot iterate directory " << url << ": " << +rc); -+ break; - } - osl::FileStatus stat( - osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName | - osl_FileStatus_Mask_FileURL); - rc = i.getFileStatus(stat); - if (rc != osl::FileBase::E_None) { -- throw css::uno::RuntimeException( -- ("cannot stat in directory " + url + ": " -- + OUString::valueOf(static_cast< sal_Int32 >(rc))), -- css::uno::Reference< css::uno::XInterface >()); -+ SAL_WARN( -+ "desktop", "cannot stat in directory " << url << ": " << +rc); -+ continue; - } - if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks - removeTree(stat.getFileURL()); - } else { - rc = osl::File::remove(stat.getFileURL()); -- if (rc != osl::FileBase::E_None) { -- throw css::uno::RuntimeException( -- ("cannot remove file " + stat.getFileURL() + ": " -- + OUString::valueOf(static_cast< sal_Int32 >(rc))), -- css::uno::Reference< css::uno::XInterface >()); -- } -+ SAL_WARN_IF( -+ rc != osl::FileBase::E_None, "desktop", -+ "cannot remove file " << stat.getFileURL() << ": " << +rc); - } - } -- osl::FileBase::RC rc = osl::Directory::remove(url); -+ if (dir.isOpen()) { -+ rc = dir.close(); -+ SAL_WARN_IF( -+ rc != osl::FileBase::E_None, "desktop", -+ "cannot close directory " << url << ": " << +rc); -+ } -+ rc = osl::Directory::remove(url); - SAL_WARN_IF( - rc != osl::FileBase::E_None, "desktop", - "cannot remove directory " << url << ": " << +rc); -- // at least on Windows XP removing some existing directories fails with -- // osl::FileBase::E_ACCESS because they are read-only; but keeping those -- // directories around should be harmless once they are empty - } - --// Remove any existing UserInstallation's user/extensions/bundled cache --// remaining from old installations. Apparently due to the old --// share/prereg/bundled mechanism (disabled since --// 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying --// share/prereg/bundled to avoid startup crashes"), that cache could contain --// corrupted information (like a UNO component registered twice, which got --// changed from active to passive registration in one LO version, but the --// version of the corresponding bundled extension only incremented in a later LO --// version). At least in theory, this function could be removed again once no --// UserInstallation can be poisoned by that old share/prereg/bundled mechanism --// any more. (But then Desktop::SynchronizeExtensionRepositories might need to --// be revisited, see 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force --// ExtensionManager resync when the implementation changes" which effectively --// got reverted again now. Now, a mismatch between a UserInstallation's --// user/extensions/bundled and an installation's share/extensions will always be --// detected here and lead to a removal of user/extensions/bundled, so that --// Desktop::SynchronizeExtensionRepositories will then definitely resync --// share/extensions.) -+// Remove any existing UserInstallation's extensions cache data remaining from -+// old installations. This addresses at least two problems: -+// -+// For one, apparently due to the old share/prereg/bundled mechanism (disabled -+// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying -+// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled -+// cache could contain corrupted information (like a UNO component registered -+// twice, which got changed from active to passive registration in one LO -+// version, but the version of the corresponding bundled extension only -+// incremented in a later LO version). -+// -+// For another, UserInstallations have been seen in the wild where no extensions -+// were installed per-user (any longer), but user/uno_packages/cache/registry/ -+// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files -+// contained data nevertheless. -+// -+// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or -+// one containing an old build ID), then user/extensions/bundled, -+// user/extensions/shared, and user/uno_packages/cache/registry/ -+// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are -+// removed. That should prevent any problems starting the service manager due -+// to old junk. Later on in Desktop::SynchronizeExtensionRepositories, the -+// removed cache data is recreated. -+// - // As a special case, if you create a UserInstallation with LO >= 3.6.1, then - // run an old LO <= 3.5.x using share/prereg/bundled on the same - // UserInstallation (so that it partially overwrites user/extensions/bundled, -@@ -230,33 +234,50 @@ void removeTree(OUString const & url) { - // <= 3.5.x messed with user/extensions/bundled in the meantime, then it would - // have rewritten the unorc (dropping the token), and LO >= 3.6.1 can detect - // that. --void refreshBundledExtensionsDir() { -+// -+// Multiple instances of soffice.bin can execute this code in parallel for a -+// single UserInstallation, as it is called before OfficeIPCThread is set up. -+// Therefore, any errors here only lead to SAL_WARNs. -+// -+// At least in theory, this function could be removed again once no -+// UserInstallation can be poisoned by old junk any more. -+bool cleanExtensionCache() { - OUString buildId( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"); - rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure -- OUString dir("$BUNDLED_EXTENSIONS_USER"); -- rtl::Bootstrap::expandMacros(dir); //TODO: detect failure -- OUString url(dir + "/buildid"); -- OUString nonPrereg( -- "${$BUNDLED_EXTENSIONS_USER/registry/" -- "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc:" -- "LIBO_NON_PREREG_BUNDLED_EXTENSIONS}"); -- rtl::Bootstrap::expandMacros(nonPrereg); -- if (nonPrereg == "TRUE") { -- osl::File f(url); -- switch (f.open(osl_File_OpenFlag_Read)) { -+ OUString extDir( -+ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") -+ ":UserInstallation}/user/extensions"); -+ rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure -+ OUString bundledDir = extDir + "/bundled"; -+ OUString buildIdFile(bundledDir + "/buildid"); -+ OUString bundledRcFile( -+ "$BUNDLED_EXTENSIONS_USER/registry/" -+ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"); -+ rtl::Bootstrap::expandMacros(bundledRcFile); //TODO: detect failure -+ rtl::Bootstrap bundledRc(bundledRcFile); -+ OUString nonPrereg; -+ if (bundledRc.getHandle() == 0 -+ || (bundledRc.getFrom("LIBO_NON_PREREG_BUNDLED_EXTENSIONS", nonPrereg) -+ && nonPrereg == "TRUE")) -+ { -+ osl::File f(buildIdFile); -+ osl::FileBase::RC rc = f.open(osl_File_OpenFlag_Read); -+ switch (rc) { - case osl::FileBase::E_None: - { - rtl::ByteSequence s1; -- osl::FileBase::RC rc = f.readLine(s1); -- if (f.close() != osl::FileBase::E_None) { -- SAL_WARN( -- "desktop", "cannot close " + url + " after reading"); -- } -+ rc = f.readLine(s1); -+ osl::FileBase::RC rc2 = f.close(); -+ SAL_WARN_IF( -+ rc2 != osl::FileBase::E_None, "desktop", -+ "cannot close " << buildIdFile << " after reading: " -+ << +rc2); - if (rc != osl::FileBase::E_None) { -- throw css::uno::RuntimeException( -- "cannot read from " + url, -- css::uno::Reference< css::uno::XInterface >()); -+ SAL_WARN( -+ "desktop", -+ "cannot read from " << buildIdFile << ": " << +rc); -+ break; - } - OUString s2( - reinterpret_cast< char const * >(s1.getConstArray()), -@@ -264,53 +285,56 @@ void refreshBundledExtensionsDir() { - // using ISO 8859-1 avoids any and all conversion errors; - // the content should only be a subset of ASCII, anyway - if (s2 == buildId) { -- return; -+ return false; - } - break; - } - case osl::FileBase::E_NOENT: - break; - default: -- throw css::uno::RuntimeException( -- "cannot open " + url + " for reading", -- css::uno::Reference< css::uno::XInterface >()); -+ SAL_WARN( -+ "desktop", -+ "cannot open " << buildIdFile << " for reading: " << +rc); -+ break; - } - } -- removeTree(dir); -- switch (osl::Directory::createPath(dir)) { -- case osl::FileBase::E_None: -- case osl::FileBase::E_EXIST: -- break; -- default: -- throw css::uno::RuntimeException( -- "cannot create path " + dir, -- css::uno::Reference< css::uno::XInterface >()); -- } -- osl::File f(url); -- if (f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) != -- osl::FileBase::E_None) -- { -- throw css::uno::RuntimeException( -- "cannot open " + url + " for writing", -- css::uno::Reference< css::uno::XInterface >()); -+ removeTree(extDir); -+ OUString userRcFile( -+ "$UNO_USER_PACKAGES_CACHE/registry/" -+ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"); -+ rtl::Bootstrap::expandMacros(userRcFile); //TODO: detect failure -+ osl::FileBase::RC rc = osl::File::remove(userRcFile); -+ SAL_WARN_IF( -+ rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop", -+ "cannot remove file " << userRcFile << ": " << +rc); -+ rc = osl::Directory::createPath(bundledDir); -+ SAL_WARN_IF( -+ rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop", -+ "cannot create path " << bundledDir << ": " << +rc); -+ osl::File f(buildIdFile); -+ rc = f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); -+ if (rc != osl::FileBase::E_None) { -+ SAL_WARN( -+ "desktop", -+ "cannot open " << buildIdFile << " for writing: " << +rc); -+ return true; - } - rtl::OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8)); - // using UTF-8 avoids almost all conversion errors (and buildid - // containing single surrogate halves should never happen, anyway); the - // content should only be a subset of ASCII, anyway -- sal_uInt64 n; -- if (f.write(buf.getStr(), buf.getLength(), n) != osl::FileBase::E_None -- || n != static_cast< sal_uInt32 >(buf.getLength())) -- { -- throw css::uno::RuntimeException( -- "cannot write to " + url, -- css::uno::Reference< css::uno::XInterface >()); -- } -- if (f.close() != osl::FileBase::E_None) { -- throw css::uno::RuntimeException( -- "cannot close " + url + " after writing", -- css::uno::Reference< css::uno::XInterface >()); -- } -+ sal_uInt64 n = 0; -+ rc = f.write(buf.getStr(), buf.getLength(), n); -+ SAL_WARN_IF( -+ (rc != osl::FileBase::E_None -+ || n != static_cast< sal_uInt32 >(buf.getLength())), -+ "desktop", -+ "cannot write to " << buildIdFile << ": " << +rc << ", " << n); -+ rc = f.close(); -+ SAL_WARN_IF( -+ rc != osl::FileBase::E_None, "desktop", -+ "cannot close " << buildIdFile << " after writing: " << +rc); -+ return true; - } - - } -@@ -538,7 +562,8 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) - } - - Desktop::Desktop() --: m_bServicesRegistered( false ) -+: m_bCleanedExtensionCache( false ) -+, m_bServicesRegistered( false ) - , m_aBootstrapError( BE_OK ) - { - RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" ); -@@ -553,7 +578,7 @@ void Desktop::Init() - RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" ); - SetBootstrapStatus(BS_OK); - -- refreshBundledExtensionsDir(); -+ m_bCleanedExtensionCache = cleanExtensionCache(); - - // We need to have service factory before going further, but see fdo#37195. - // Doing this will mmap common.rdb, making it not overwritable on windows, -diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx -index dd01d9b..a6221a9 100644 ---- a/desktop/source/app/check_ext_deps.cxx -+++ b/desktop/source/app/check_ext_deps.cxx -@@ -51,6 +51,7 @@ - #include "com/sun/star/deployment/ExtensionManager.hpp" - #include "com/sun/star/deployment/LicenseException.hpp" - #include "com/sun/star/deployment/ui/LicenseDialog.hpp" -+#include <com/sun/star/task/OfficeRestartManager.hpp> - #include <com/sun/star/task/XJob.hpp> - #include <com/sun/star/task/XJobExecutor.hpp> - #include <com/sun/star/task/XInteractionApprove.hpp> -@@ -77,12 +78,15 @@ class SilentCommandEnv - task::XInteractionHandler, - ucb::XProgressHandler > - { -+ uno::Reference<uno::XComponentContext> mxContext; - Desktop *mpDesktop; - sal_Int32 mnLevel; - sal_Int32 mnProgress; - - public: -- SilentCommandEnv( Desktop* pDesktop ); -+ SilentCommandEnv( -+ uno::Reference<uno::XComponentContext> const & xContext, -+ Desktop* pDesktop ); - virtual ~SilentCommandEnv(); - - // XCommandEnvironment -@@ -105,12 +109,14 @@ public: - }; - - //----------------------------------------------------------------------------- --SilentCommandEnv::SilentCommandEnv( Desktop* pDesktop ) --{ -- mpDesktop = pDesktop; -- mnLevel = 0; -- mnProgress = 25; --} -+SilentCommandEnv::SilentCommandEnv( -+ uno::Reference<uno::XComponentContext> const & xContext, -+ Desktop* pDesktop ): -+ mxContext( xContext ), -+ mpDesktop( pDesktop ), -+ mnLevel( 0 ), -+ mnProgress( 25 ) -+{} - - //----------------------------------------------------------------------------- - SilentCommandEnv::~SilentCommandEnv() -@@ -144,10 +150,9 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe - - if ( request >>= licExc ) - { -- uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext(); - uno::Reference< ui::dialogs::XExecutableDialog > xDialog( - deployment::ui::LicenseDialog::create( -- xContext, VCLUnoHelper::GetInterface( NULL ), -+ mxContext, VCLUnoHelper::GetInterface( NULL ), - licExc.ExtensionName, licExc.Text ) ); - sal_Int16 res = xDialog->execute(); - if ( res == ui::dialogs::ExecutableDialogResults::CANCEL ) -@@ -416,7 +421,20 @@ sal_Bool Desktop::CheckExtensionDependencies() - void Desktop::SynchronizeExtensionRepositories() - { - RTL_LOGFILE_CONTEXT(aLog,"desktop (jl) ::Desktop::SynchronizeExtensionRepositories"); -- dp_misc::syncRepositories( new SilentCommandEnv( this ) ); -+ uno::Reference< uno::XComponentContext > context( -+ comphelper_getProcessComponentContext()); -+ uno::Reference< ucb::XCommandEnvironment > silent( -+ new SilentCommandEnv(context, this)); -+ if (m_bCleanedExtensionCache) { -+ deployment::ExtensionManager::get(context)->reinstallDeployedExtensions( -+ true, "user", Reference<task::XAbortChannel>(), silent); -+ task::OfficeRestartManager::get(context)->requestRestart( -+ silent->getInteractionHandler()); -+ } else { -+ // reinstallDeployedExtensions above already calls syncRepositories -+ // internally: -+ dp_misc::syncRepositories(m_bCleanedExtensionCache, silent); -+ } - } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx -index 29ded17..7795e309 100644 ---- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx -+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx -@@ -1124,7 +1124,7 @@ void ExtensionCmdQueue::acceptLicense( const uno::Reference< deployment::XPackag - - void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentContext > &xContext ) - { -- dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) ); -+ dp_misc::syncRepositories( false, new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) ); - } - - void ExtensionCmdQueue::stop() -diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h -index 29fd140..06e67aa 100644 ---- a/desktop/source/deployment/inc/dp_misc.h -+++ b/desktop/source/deployment/inc/dp_misc.h -@@ -154,8 +154,10 @@ void TRACE(::rtl::OUString const & sText); - recently added or removed. - */ - DESKTOP_DEPLOYMENTMISC_DLLPUBLIC --void syncRepositories(::com::sun::star::uno::Reference< -- ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); -+void syncRepositories( -+ bool force, -+ ::com::sun::star::uno::Reference< -+ ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); - - } - -diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx -index 68403f1..b3c21b4 100644 ---- a/desktop/source/deployment/manager/dp_extensionmanager.cxx -+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx -@@ -1205,9 +1205,10 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > > - } - } - --//only to be called from unopkg!!! -+// Only to be called from unopkg or soffice bootstrap (with force=true in the -+// latter case): - void ExtensionManager::reinstallDeployedExtensions( -- OUString const & repository, -+ sal_Bool force, OUString const & repository, - Reference<task::XAbortChannel> const & xAbortChannel, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) - throw (deploy::DeploymentException, -@@ -1220,10 +1221,11 @@ void ExtensionManager::reinstallDeployedExtensions( - xPackageManager = getPackageManager(repository); - - ::osl::MutexGuard guard(getMutex()); -- xPackageManager->reinstallDeployedPackages(xAbortChannel, xCmdEnv); -+ xPackageManager->reinstallDeployedPackages( -+ force, xAbortChannel, xCmdEnv); - //We must sync here, otherwise we will get exceptions when extensions - //are removed. -- dp_misc::syncRepositories(xCmdEnv); -+ dp_misc::syncRepositories(force, xCmdEnv); - const uno::Sequence< Reference<deploy::XPackage> > extensions( - xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv)); - -diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx -index 22e2d41..ec1edbc 100644 ---- a/desktop/source/deployment/manager/dp_extensionmanager.hxx -+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx -@@ -182,7 +182,7 @@ public: - css::uno::RuntimeException); - - virtual void SAL_CALL reinstallDeployedExtensions( -- ::rtl::OUString const & repository, -+ sal_Bool force, ::rtl::OUString const & repository, - css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel, - css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw ( -diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx -index 8a08320c..8e3d109 100644 ---- a/desktop/source/deployment/manager/dp_manager.cxx -+++ b/desktop/source/deployment/manager/dp_manager.cxx -@@ -1164,14 +1164,14 @@ PackageManagerImpl::getDeployedPackages( - //ToDo: the function must not call registerPackage, do this in - //XExtensionManager.reinstallDeployedExtensions - void PackageManagerImpl::reinstallDeployedPackages( -- Reference<task::XAbortChannel> const & /*xAbortChannel*/, -+ sal_Bool force, Reference<task::XAbortChannel> const & /*xAbortChannel*/, - Reference<XCommandEnvironment> const & xCmdEnv_ ) - throw (deployment::DeploymentException, - CommandFailedException, CommandAbortedException, - lang::IllegalArgumentException, RuntimeException) - { - check(); -- if (office_is_running()) -+ if (!force && office_is_running()) - throw RuntimeException( - OUSTR("You must close any running Office process before " - "reinstalling packages!"), static_cast<OWeakObject *>(this) ); -diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h -index 3b335d7..3c7f8d9 100644 ---- a/desktop/source/deployment/manager/dp_manager.h -+++ b/desktop/source/deployment/manager/dp_manager.h -@@ -236,6 +236,7 @@ public: - css::uno::RuntimeException); - - virtual void SAL_CALL reinstallDeployedPackages( -+ sal_Bool force, - css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::DeploymentException, -diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx -index b225db6..9ed579f 100644 ---- a/desktop/source/deployment/misc/dp_misc.cxx -+++ b/desktop/source/deployment/misc/dp_misc.cxx -@@ -591,7 +591,7 @@ void TRACE(::rtl::OString const & sText) - } - - void syncRepositories( -- Reference<ucb::XCommandEnvironment> const & xCmdEnv) -+ bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv) - { - OUString sDisable; - ::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() ); -@@ -602,7 +602,8 @@ void syncRepositories( - //synchronize shared before bundled otherewise there are - //more revoke and registration calls. - sal_Bool bModified = false; -- if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared"))) -+ if (force -+ || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared"))) - || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")))) - { - xExtensionManager = -diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx -index 43faed5..ef16ea1 100644 ---- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx -+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx -@@ -392,7 +392,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() - //synching is done in XExtensionManager.reinstall - if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall")) - && ! dp_misc::office_is_running()) -- dp_misc::syncRepositories(xCmdEnv); -+ dp_misc::syncRepositories(false, xCmdEnv); - - if ( subcmd_add || subCommand == "remove" ) - { -@@ -436,7 +436,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() - RTL_CONSTASCII_STRINGPARAM("reinstall") )) - { - xExtensionManager->reinstallDeployedExtensions( -- repository, Reference<task::XAbortChannel>(), xCmdEnv); -+ false, repository, Reference<task::XAbortChannel>(), xCmdEnv); - } - else if ( subCommand == "list" ) - { -diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl -index b68ab20..2912e45 100644 ---- a/offapi/com/sun/star/deployment/XExtensionManager.idl -+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl -@@ -260,6 +260,9 @@ interface XExtensionManager - <p> - Please use this in case of suspected cache inconsistencies only. - </p> -+ @param force -+ set to true when called during soffice bootstrap after cleaning -+ old extension cache - @param repositroy - the name of the repository - @param xAbortChannel -@@ -268,6 +271,7 @@ interface XExtensionManager - command environment for error and progress handling - */ - void reinstallDeployedExtensions( -+ [in] boolean force, - [in] string repository, - [in] com::sun::star::task::XAbortChannel xAbortChannel, - [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) -diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl -index 12e7e0e..39ff04a 100644 ---- a/offapi/com/sun/star/deployment/XPackageManager.idl -+++ b/offapi/com/sun/star/deployment/XPackageManager.idl -@@ -225,12 +225,16 @@ interface XPackageManager - Please use this in case of suspected cache inconsistencies only. - </p> - -+ @param force -+ set to true when called during soffice bootstrap after cleaning -+ old extension cache - @param xAbortChannel - abort channel to asynchronously abort the adding process - @param xCmdEnv - command environment for error and progress handling - */ - void reinstallDeployedPackages( -+ [in] boolean force, - [in] com::sun::star::task::XAbortChannel xAbortChannel, - [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) - raises (DeploymentException, --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libtasn1/buffer_overflow_fix.diff b/extra/libtasn1/buffer_overflow_fix.diff deleted file mode 100644 index c1e71015c..000000000 --- a/extra/libtasn1/buffer_overflow_fix.diff +++ /dev/null @@ -1,75 +0,0 @@ -From aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@gnutls.org> -Date: Sun, 25 Nov 2012 14:16:24 +0100 -Subject: [PATCH] corrected possible buffer overflow in parser errors. - ---- - lib/ASN1.c | 6 +++--- - lib/ASN1.y | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/ASN1.c b/lib/ASN1.c -index 2a60527..df6fb64 100644 ---- a/lib/ASN1.c -+++ b/lib/ASN1.c -@@ -119,7 +119,7 @@ static unsigned int line_number; /* line number describing the - parser position inside the - file */ - static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = ""; --static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */ -+static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */ - static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file - to parse before the 'parse - error' */ -@@ -3283,7 +3283,7 @@ _asn1_yyerror (const char *s) - strcmp (last_token, "TeletexString") == 0 || - strcmp (last_token, "BMPString") == 0) - { -- snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE, -+ snprintf (last_error_token, sizeof(last_error_token), - "%s", last_token); - fprintf(stderr, - "%s:%u: Warning: %s is a built-in ASN.1 type.\n", -@@ -3294,7 +3294,7 @@ _asn1_yyerror (const char *s) - - if (result_parse != ASN1_NAME_TOO_LONG) - { -- snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE, -+ snprintf (last_error, sizeof(last_error), - "%s:%u: Error: %s near '%s'", file_name, - line_number, s, last_token); - result_parse = ASN1_SYNTAX_ERROR; -diff --git a/lib/ASN1.y b/lib/ASN1.y -index 874eb13..e0add54 100644 ---- a/lib/ASN1.y -+++ b/lib/ASN1.y -@@ -42,7 +42,7 @@ static unsigned int line_number; /* line number describing the - parser position inside the - file */ - static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = ""; --static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */ -+static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */ - static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file - to parse before the 'parse - error' */ -@@ -869,7 +869,7 @@ _asn1_yyerror (const char *s) - strcmp (last_token, "TeletexString") == 0 || - strcmp (last_token, "BMPString") == 0) - { -- snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE, -+ snprintf (last_error_token, sizeof(last_error_token), - "%s", last_token); - fprintf(stderr, - "%s:%u: Warning: %s is a built-in ASN.1 type.\n", -@@ -880,7 +880,7 @@ _asn1_yyerror (const char *s) - - if (result_parse != ASN1_NAME_TOO_LONG) - { -- snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE, -+ snprintf (last_error, sizeof(last_error), - "%s:%u: Error: %s near '%s'", file_name, - line_number, s, last_token); - result_parse = ASN1_SYNTAX_ERROR; --- -1.7.2.5 - diff --git a/extra/libva-intel-driver/build-fix.patch b/extra/libva-intel-driver/build-fix.patch deleted file mode 100644 index 0127b06cf..000000000 --- a/extra/libva-intel-driver/build-fix.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001 -From: Gwenole Beauchesne <gwenole.beauchesne@intel.com> -Date: Fri, 06 Apr 2012 15:24:36 +0000 -Subject: dri: cope with drm_state changes. - -Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> ---- -diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c -index 3bea253..20fed99 100644 ---- a/src/i965_drv_video.c -+++ b/src/i965_drv_video.c -@@ -2380,7 +2380,7 @@ i965_PutSurface(VADriverContextP ctx, - unsigned int flags) /* de-interlacing flags */ - { - struct i965_driver_data *i965 = i965_driver_data(ctx); -- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; -+ struct dri_state *dri_state = (struct dri_state *)ctx->drm_state; - struct i965_render_state *render_state = &i965->render_state; - struct dri_drawable *dri_drawable; - union dri_buffer *buffer; -@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx, - int pp_flag = 0; - - /* Currently don't support DRI1 */ -- if (dri_state->driConnectedFlag != VA_DRI2) -+ if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2) - return VA_STATUS_ERROR_UNKNOWN; - - /* Some broken sources such as H.264 conformance case FM2_SVA_C -diff --git a/src/intel_driver.c b/src/intel_driver.c -index 4e6df81..b34d9a1 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -29,7 +29,7 @@ - - #include <assert.h> - --#include <va/va_dricommon.h> -+#include <va/va_drmcommon.h> - - #include "intel_batchbuffer.h" - #include "intel_memman.h" -@@ -50,15 +50,17 @@ Bool - intel_driver_init(VADriverContextP ctx) - { - struct intel_driver_data *intel = intel_driver_data(ctx); -- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; -+ struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state; - int has_exec2, has_bsd, has_blt; - -- assert(dri_state); -- assert(dri_state->driConnectedFlag == VA_DRI2 || -- dri_state->driConnectedFlag == VA_DRI1); -+ assert(drm_state); -+ assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 || -+ drm_state->auth_type == VA_DRM_AUTH_DRI2 || -+ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); - -- intel->fd = dri_state->fd; -- intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2); -+ intel->fd = drm_state->fd; -+ intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 || -+ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); - - if (!intel->dri2Enabled) { - return False; --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libva/libva.install b/extra/libva/libva.install deleted file mode 100644 index 4d8b8e24a..000000000 --- a/extra/libva/libva.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.0.15-1)" -lt 0 ]; then - echo 'Starting with libva version 1.0.15, the intel back-end is now in libva-driver-intel.' - fi -} diff --git a/extra/libxml2/CVE-2011-0216.patch b/extra/libxml2/CVE-2011-0216.patch deleted file mode 100644 index dfc99d4de..000000000 --- a/extra/libxml2/CVE-2011-0216.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 69f04562f75212bfcabecd190ea8b06ace28ece2 -Author: Daniel Veillard <veillard@redhat.com> -Date: Fri Aug 19 11:05:04 2011 +0800 - - Fix an off by one error in encoding - - this off by one error doesn't seems to reproduce on linux - but the error is real. - -diff --git a/encoding.c b/encoding.c -index d1140bf..fb0c38a 100644 ---- a/encoding.c -+++ b/encoding.c -@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler *handler, xmlBufferPtr out, - if (in == NULL) return(-1); - - /* calculate space available */ -- written = out->size - out->use; -+ written = out->size - out->use - 1; /* count '\0' */ - toconv = in->use; - /* - * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38 -@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler, xmlBufferPtr out, - toconv = in->use; - if (toconv == 0) - return (0); -- written = out->size - out->use; -+ written = out->size - out->use -1; /* count '\0' */ - if (toconv * 2 >= written) { - xmlBufferGrow(out, out->size + toconv * 2); - written = out->size - out->use - 1; diff --git a/extra/libxml2/CVE-2011-1944.patch b/extra/libxml2/CVE-2011-1944.patch deleted file mode 100644 index 62dd5d229..000000000 --- a/extra/libxml2/CVE-2011-1944.patch +++ /dev/null @@ -1,100 +0,0 @@ -commit d7958b21e7f8c447a26bb2436f08402b2c308be4 -Author: Chris Evans <scarybeasts@gmail.com> -Date: Wed Mar 23 08:13:06 2011 +0800 - - Fix some potential problems on reallocation failures - - The count was incremented before the allocation - and not fixed in case of failure - * xpath.c: corrects a few instances where the available count of some - structure is updated before we know the allocation actually - succeeds - -diff --git a/xpath.c b/xpath.c -index 8b56189..608fe00 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) { - } else if (cur->nodeNr == cur->nodeMax) { - xmlNodePtr *temp; - -- cur->nodeMax *= 2; -- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * -+ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * - sizeof(xmlNodePtr)); - if (temp == NULL) { - xmlXPathErrMemory(NULL, "growing nodeset\n"); - return; - } -+ cur->nodeMax *= 2; - cur->nodeTab = temp; - } - cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns); -@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { - } else if (cur->nodeNr == cur->nodeMax) { - xmlNodePtr *temp; - -- cur->nodeMax *= 2; -- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * -+ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * - sizeof(xmlNodePtr)); - if (temp == NULL) { - xmlXPathErrMemory(NULL, "growing nodeset\n"); - return; - } - cur->nodeTab = temp; -+ cur->nodeMax *= 2; - } - if (val->type == XML_NAMESPACE_DECL) { - xmlNsPtr ns = (xmlNsPtr) val; -@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) { - } else if (val1->nodeNr == val1->nodeMax) { - xmlNodePtr *temp; - -- val1->nodeMax *= 2; -- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * -+ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 * - sizeof(xmlNodePtr)); - if (temp == NULL) { - xmlXPathErrMemory(NULL, "merging nodeset\n"); - return(NULL); - } - val1->nodeTab = temp; -+ val1->nodeMax *= 2; - } - if (n2->type == XML_NAMESPACE_DECL) { - xmlNsPtr ns = (xmlNsPtr) n2; -@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2, - } else if (set1->nodeNr >= set1->nodeMax) { - xmlNodePtr *temp; - -- set1->nodeMax *= 2; - temp = (xmlNodePtr *) xmlRealloc( -- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); -+ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); - if (temp == NULL) { - xmlXPathErrMemory(NULL, "merging nodeset\n"); - return(NULL); - } - set1->nodeTab = temp; -+ set1->nodeMax *= 2; - } - if (n2->type == XML_NAMESPACE_DECL) { - xmlNsPtr ns = (xmlNsPtr) n2; -@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2, - } else if (set1->nodeNr >= set1->nodeMax) { - xmlNodePtr *temp; - -- set1->nodeMax *= 2; - temp = (xmlNodePtr *) xmlRealloc( -- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); -+ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); - if (temp == NULL) { - xmlXPathErrMemory(NULL, "merging nodeset\n"); - return(NULL); - } - set1->nodeTab = temp; -+ set1->nodeMax *= 2; - } - set1->nodeTab[set1->nodeNr++] = n2; - } diff --git a/extra/libxml2/CVE-2011-2834.patch b/extra/libxml2/CVE-2011-2834.patch deleted file mode 100644 index cfc61e0c9..000000000 --- a/extra/libxml2/CVE-2011-2834.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd -Author: Daniel Veillard <veillard@redhat.com> -Date: Tue Oct 11 16:34:34 2011 +0800 - - Fix missing error status in XPath evaluation - - Started by Chris Evans, I added a few more place where the - error should have been set in the evaluation context. - -diff --git a/xpath.c b/xpath.c -index bcee2ea..d9d902c 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value) - sizeof(ctxt->valueTab[0])); - if (tmp == NULL) { - xmlGenericError(xmlGenericErrorContext, "realloc failed !\n"); -+ ctxt->error = XPATH_MEMORY_ERROR; - return (0); - } - ctxt->valueMax *= 2; -@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { - if ( (ch & 0xc0) != 0xc0 ) { - xmlGenericError(xmlGenericErrorContext, - "xmlXPathTranslateFunction: Invalid UTF8 string\n"); -+ /* not asserting an XPath error is probably better */ - break; - } - /* then skip over remaining bytes for this char */ -@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { - if ( (*cptr++ & 0xc0) != 0x80 ) { - xmlGenericError(xmlGenericErrorContext, - "xmlXPathTranslateFunction: Invalid UTF8 string\n"); -+ /* not asserting an XPath error is probably better */ - break; - } - if (ch & 0x80) /* must have had error encountered */ -@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - xmlGenericError(xmlGenericErrorContext, - "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", - (char *) op->value4, (char *)op->value5); -+ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; - return (total); - } - val = xmlXPathVariableLookupNS(ctxt->context, -@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", - (char *)op->value4, (char *)op->value5); - xmlXPathPopFrame(ctxt, frame); -+ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; - return (total); - } - func = xmlXPathFunctionLookupNS(ctxt->context, -@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - } - xmlGenericError(xmlGenericErrorContext, - "XPath: unknown precompiled operation %d\n", op->op); -+ ctxt->error = XPATH_INVALID_OPERAND; - return (total); - } - diff --git a/extra/libxml2/CVE-2011-3905.patch b/extra/libxml2/CVE-2011-3905.patch deleted file mode 100644 index 53373b7da..000000000 --- a/extra/libxml2/CVE-2011-3905.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit 77404b8b69bc122d12231807abf1a837d121b551 -Author: Chris Evans <scarybeasts@gmail.com> -Date: Wed Dec 14 16:18:25 2011 +0800 - - Make sure the parser returns when getting a Stop order - - patch backported from chromiun bug fixes, assuming author is Chris - -diff --git a/parser.c b/parser.c -index 21d7aa3..4e5dcb9 100644 ---- a/parser.c -+++ b/parser.c -@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { - (ctxt->sax->processingInstruction != NULL)) - ctxt->sax->processingInstruction(ctxt->userData, - target, NULL); -- ctxt->instate = state; -+ if (ctxt->instate != XML_PARSER_EOF) -+ ctxt->instate = state; - return; - } - buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); -@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { - } else { - xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL); - } -- ctxt->instate = state; -+ if (ctxt->instate != XML_PARSER_EOF) -+ ctxt->instate = state; - } - } - -@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { - else - name = xmlParseStartTag(ctxt); - #endif /* LIBXML_SAX1_ENABLED */ -+ if (ctxt->instate == XML_PARSER_EOF) -+ return; - if (name == NULL) { - spacePop(ctxt); - return; -@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { - else - name = xmlParseStartTag(ctxt); - #endif /* LIBXML_SAX1_ENABLED */ -+ if (ctxt->instate == XML_PARSER_EOF) -+ goto done; - if (name == NULL) { - spacePop(ctxt); - ctxt->instate = XML_PARSER_EOF; -@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { - else - xmlParseEndTag1(ctxt, 0); - #endif /* LIBXML_SAX1_ENABLED */ -- if (ctxt->nameNr == 0) { -+ if (ctxt->instate == XML_PARSER_EOF) { -+ /* Nothing */ -+ } else if (ctxt->nameNr == 0) { - ctxt->instate = XML_PARSER_EPILOG; - } else { - ctxt->instate = XML_PARSER_CONTENT; diff --git a/extra/libxml2/CVE-2011-3919.patch b/extra/libxml2/CVE-2011-3919.patch deleted file mode 100644 index b307e57d2..000000000 --- a/extra/libxml2/CVE-2011-3919.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 5bd3c061823a8499b27422aee04ea20aae24f03e -Author: Daniel Veillard <veillard@redhat.com> -Date: Fri Dec 16 18:53:35 2011 +0800 - - Fix an allocation error when copying entities - -diff --git a/parser.c b/parser.c -index 4e5dcb9..c55e41d 100644 ---- a/parser.c -+++ b/parser.c -@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - - buffer[nbchars++] = '&'; - if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { -- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); -+ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); - } - for (;i > 0;i--) - buffer[nbchars++] = *cur++; diff --git a/extra/libxml2/largefile64.patch b/extra/libxml2/largefile64.patch deleted file mode 100644 index 29be82760..000000000 --- a/extra/libxml2/largefile64.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libxml2-2.6.32.dfsg.orig/libxml.h -+++ libxml2-2.6.32.dfsg/libxml.h -@@ -13,6 +13,9 @@ - #ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE - #endif -+#ifndef _LARGEFILE64_SOURCE -+#define _LARGEFILE64_SOURCE -+#endif - #ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 - #endif diff --git a/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch b/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch deleted file mode 100644 index 2844f4a74..000000000 --- a/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit df83c17e5a2646bd923f75e5e507bc80d73c9722 -Author: Daniel Veillard <veillard@redhat.com> -Date: Wed Nov 17 14:12:14 2010 +0100 - - Fix a potential freeing error in XPath - -diff --git a/xpath.c b/xpath.c -index 81e33f6..1447be5 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, - - if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { - xmlXPathObjectPtr tmp; -- /* pop the result */ -+ /* pop the result if any */ - tmp = valuePop(ctxt); -- xmlXPathReleaseObject(xpctxt, tmp); -- /* then pop off contextObj, which will be freed later */ -- valuePop(ctxt); -+ if (tmp != contextObj) -+ /* -+ * Free up the result -+ * then pop off contextObj, which will be freed later -+ */ -+ xmlXPathReleaseObject(xpctxt, tmp); -+ valuePop(ctxt); - goto evaluation_error; - } - diff --git a/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch b/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch deleted file mode 100644 index 714954dba..000000000 --- a/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit fec31bcd452e77c10579467ca87a785b41115de6 -Author: Daniel Veillard <veillard@redhat.com> -Date: Thu Nov 18 11:07:24 2010 +0100 - - Small fix for previous commit - -diff --git a/xpath.c b/xpath.c -index 1447be5..8b56189 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr tmp; - /* pop the result if any */ - tmp = valuePop(ctxt); -- if (tmp != contextObj) -+ if (tmp != contextObj) { - /* - * Free up the result - * then pop off contextObj, which will be freed later - */ - xmlXPathReleaseObject(xpctxt, tmp); - valuePop(ctxt); -+ } - goto evaluation_error; - } - diff --git a/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch b/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch deleted file mode 100644 index 7a4ad8659..000000000 --- a/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch +++ /dev/null @@ -1,223 +0,0 @@ -commit 0f136dcd18c287073a4d67b03fdb9696d7010940 -Author: Daniel Veillard <veillard@redhat.com> -Date: Thu Aug 18 17:10:13 2011 +0800 - - Hardening of XPath evaluation - - Add a mechanism of frame for XPath evaluation when entering a function - or a scoped evaluation, also fix a potential problem in predicate - evaluation. - -diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h -index 1a9e30e..ddd9dd8 100644 ---- a/include/libxml/xpath.h -+++ b/include/libxml/xpath.h -@@ -68,7 +68,8 @@ typedef enum { - XPATH_UNDEF_PREFIX_ERROR, - XPATH_ENCODING_ERROR, - XPATH_INVALID_CHAR_ERROR, -- XPATH_INVALID_CTXT -+ XPATH_INVALID_CTXT, -+ XPATH_STACK_ERROR - } xmlXPathError; - - /* -@@ -380,6 +381,8 @@ struct _xmlXPathParserContext { - xmlXPathCompExprPtr comp; /* the precompiled expression */ - int xptr; /* it this an XPointer expression */ - xmlNodePtr ancestor; /* used for walking preceding axis */ -+ -+ int valueFrame; /* used to limit Pop on the stack */ - }; - - /************************************************************************ -diff --git a/xpath.c b/xpath.c -index b59ac5a..bcee2ea 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = { - "Encoding error\n", - "Char out of XML range\n", - "Invalid or incomplete context\n", -+ "Stack usage errror\n", - "?? Unknown error ??\n" /* Must be last in the list! */ - }; - #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ -@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { - ************************************************************************/ - - /** -+ * xmlXPathSetFrame: -+ * @ctxt: an XPath parser context -+ * -+ * Set the callee evaluation frame -+ * -+ * Returns the previous frame value to be restored once done -+ */ -+static int -+xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { -+ int ret; -+ -+ if (ctxt == NULL) -+ return(0); -+ ret = ctxt->valueFrame; -+ ctxt->valueFrame = ctxt->valueNr; -+ return(ret); -+} -+ -+/** -+ * xmlXPathPopFrame: -+ * @ctxt: an XPath parser context -+ * @frame: the previous frame value -+ * -+ * Remove the callee evaluation frame -+ */ -+static void -+xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { -+ if (ctxt == NULL) -+ return; -+ if (ctxt->valueNr < ctxt->valueFrame) { -+ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); -+ } -+ ctxt->valueFrame = frame; -+} -+ -+/** - * valuePop: - * @ctxt: an XPath evaluation context - * -@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt) - - if ((ctxt == NULL) || (ctxt->valueNr <= 0)) - return (NULL); -+ -+ if (ctxt->valueNr <= ctxt->valueFrame) { -+ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); -+ return (NULL); -+ } -+ - ctxt->valueNr--; - if (ctxt->valueNr > 0) - ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; -@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) { - ret->valueNr = 0; - ret->valueMax = 10; - ret->value = NULL; -+ ret->valueFrame = 0; - - ret->context = ctxt; - ret->comp = comp; -@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; - xmlNodePtr oldContextNode, contextNode = NULL; - xmlXPathContextPtr xpctxt = ctxt->context; -+ int frame; - - #ifdef LIBXML_XPTR_ENABLED - /* -@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, - */ - exprOp = &ctxt->comp->steps[op->ch2]; - for (i = 0; i < set->nodeNr; i++) { -+ xmlXPathObjectPtr tmp; -+ - if (set->nodeTab[i] == NULL) - continue; - -@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, - xmlXPathNodeSetAddUnique(contextObj->nodesetval, - contextNode); - -+ frame = xmlXPathSetFrame(ctxt); - valuePush(ctxt, contextObj); - res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); -+ tmp = valuePop(ctxt); -+ xmlXPathPopFrame(ctxt, frame); - - if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { -- xmlXPathObjectPtr tmp; -- /* pop the result if any */ -- tmp = valuePop(ctxt); -- if (tmp != contextObj) { -+ while (tmp != contextObj) { - /* - * Free up the result - * then pop off contextObj, which will be freed later - */ - xmlXPathReleaseObject(xpctxt, tmp); -- valuePop(ctxt); -+ tmp = valuePop(ctxt); - } - goto evaluation_error; - } -+ /* push the result back onto the stack */ -+ valuePush(ctxt, tmp); - - if (res) - pos++; -@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - xmlXPathFunction func; - const xmlChar *oldFunc, *oldFuncURI; - int i; -+ int frame; - -+ frame = xmlXPathSetFrame(ctxt); - if (op->ch1 != -1) - total += - xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); -@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - xmlGenericError(xmlGenericErrorContext, - "xmlXPathCompOpEval: parameter error\n"); - ctxt->error = XPATH_INVALID_OPERAND; -+ xmlXPathPopFrame(ctxt, frame); - return (total); - } -- for (i = 0; i < op->value; i++) -+ for (i = 0; i < op->value; i++) { - if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { - xmlGenericError(xmlGenericErrorContext, - "xmlXPathCompOpEval: parameter error\n"); - ctxt->error = XPATH_INVALID_OPERAND; -+ xmlXPathPopFrame(ctxt, frame); - return (total); - } -+ } - if (op->cache != NULL) - XML_CAST_FPTR(func) = op->cache; - else { -@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - xmlGenericError(xmlGenericErrorContext, - "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", - (char *)op->value4, (char *)op->value5); -+ xmlXPathPopFrame(ctxt, frame); - return (total); - } - func = xmlXPathFunctionLookupNS(ctxt->context, -@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - func(ctxt, op->value); - ctxt->context->function = oldFunc; - ctxt->context->functionURI = oldFuncURI; -+ xmlXPathPopFrame(ctxt, frame); - return (total); - } - case XPATH_OP_ARG: -@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool) - ctxt->valueNr = 0; - ctxt->valueMax = 10; - ctxt->value = NULL; -+ ctxt->valueFrame = 0; - } - #ifdef XPATH_STREAMING - if (ctxt->comp->stream) { -diff --git a/xpointer.c b/xpointer.c -index 7a42d02..37afa3a 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) { - ctxt->valueNr = 0; - ctxt->valueMax = 10; - ctxt->value = NULL; -+ ctxt->valueFrame = 0; - } - SKIP_BLANKS; - if (CUR == '/') { diff --git a/extra/libxml2/shared_library_versionning.patch b/extra/libxml2/shared_library_versionning.patch deleted file mode 100644 index a0b62bca9..000000000 --- a/extra/libxml2/shared_library_versionning.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 04 Nov 2010 20:53:14 +0000 -Subject: Reactivate the shared library versionning script - ---- -diff --git a/configure.in b/configure.in -index 59d0629..a1d2c89 100644 ---- a/configure.in -+++ b/configure.in -@@ -84,7 +84,7 @@ else - esac - fi - AC_SUBST(VERSION_SCRIPT_FLAGS) --AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) -+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) - - dnl - dnl We process the AC_ARG_WITH first so that later we can modify --- -cgit v0.8.3.1 diff --git a/extra/liferea/PKGBUILD b/extra/liferea/PKGBUILD deleted file mode 100644 index cf58f55a4..000000000 --- a/extra/liferea/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 170014 2012-10-31 00:54:53Z eric $ -# Maintainer: Eric BĂ©langer <eric@archlinux.org> - -pkgname=liferea -pkgver=1.8.10 -pkgrel=1 -pkgdesc="A desktop news aggregator for online news feeds and weblogs" -arch=('i686' 'x86_64') -url="http://liferea.sourceforge.net/" -license=('GPL') -depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme') -makedepends=('intltool') -options=('!libtool' '!emptydirs') -install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2) -sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d') - -build() { - cd "${srcdir}/liferea-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install - make -} - -package() { - cd "${srcdir}/liferea-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/extra/liferea/liferea.install b/extra/liferea/liferea.install deleted file mode 100644 index 7d812ccdb..000000000 --- a/extra/liferea/liferea.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=liferea - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - 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() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD deleted file mode 100644 index 3152b3c30..000000000 --- a/extra/linux_logo/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 171454 2012-11-17 15:59:08Z eric $ -# Maintainer: Eric BĂ©langer <eric@archlinux.org> - -pkgname=linux_logo -pkgver=5.11 -pkgrel=2 -pkgdesc="Text-based logo and system information program" -arch=('i686' 'x86_64') -url="http://www.deater.net/weave/vmwprod/linux_logo" -license=('GPL') -depends=('glibc') -source=(http://www.deater.net/weave/vmwprod/linux_logo/${pkgname}-${pkgver}.tar.gz) -sha1sums=('bd22808f165574cb3bc98c579aa48c0acab65f39') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - find ./logos -type f | sort > logo_config - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX="${pkgdir}/usr" install -} diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 6f203458d..d0946d3b3 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176080 2013-01-27 10:59:18Z giovanni $ +# $Id: PKGBUILD 177827 2013-02-09 19:07:04Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.01.25 +pkgver=2013.02.05 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('da78b67d200dcffc47c1e869daf0395c') +md5sums=('ca18bcf954c6531b8de8e1a10be6df54') build() { cd ${srcdir}/live diff --git a/extra/llvm/clang-3.1-fix-lwg-2141.patch b/extra/llvm/clang-3.1-fix-lwg-2141.patch deleted file mode 100644 index af10a5c33..000000000 --- a/extra/llvm/clang-3.1-fix-lwg-2141.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: test/SemaCXX/libstdcxx_common_type_hack.cpp -=================================================================== ---- test/SemaCXX/libstdcxx_common_type_hack.cpp (revision 0) -+++ test/SemaCXX/libstdcxx_common_type_hack.cpp (revision 166455) -@@ -0,0 +1,33 @@ -+// RUN: %clang_cc1 -fsyntax-only %s -std=c++11 -verify -+ -+// This is a test for an egregious hack in Clang that works around -+// an issue with GCC's <type_traits> implementation. std::common_type -+// relies on pre-standard rules for decltype(), in which it doesn't -+// produce reference types so frequently. -+ -+#ifdef BE_THE_HEADER -+ -+#pragma GCC system_header -+namespace std { -+ template<typename T> T &&declval(); -+ -+ template<typename...Ts> struct common_type {}; -+ template<typename A, typename B> struct common_type<A, B> { -+ // Under the rules in the standard, this always produces a -+ // reference type. -+ typedef decltype(true ? declval<A>() : declval<B>()) type; -+ }; -+} -+ -+#else -+ -+#define BE_THE_HEADER -+#include "libstdcxx_common_type_hack.cpp" -+ -+using T = int; -+using T = std::common_type<int, int>::type; -+ -+using U = int; // expected-note {{here}} -+using U = decltype(true ? std::declval<int>() : std::declval<int>()); // expected-error {{different types}} -+ -+#endif -Index: lib/Sema/SemaTemplateInstantiateDecl.cpp -=================================================================== ---- lib/Sema/SemaTemplateInstantiateDecl.cpp (revision 166454) -+++ lib/Sema/SemaTemplateInstantiateDecl.cpp (revision 166455) -@@ -158,6 +158,22 @@ - SemaRef.MarkDeclarationsReferencedInType(D->getLocation(), DI->getType()); - } - -+ // HACK: g++ has a bug where it gets the value kind of ?: wrong. -+ // libstdc++ relies upon this bug in its implementation of common_type. -+ // If we happen to be processing that implementation, fake up the g++ ?: -+ // semantics. See LWG issue 2141 for more information on the bug. -+ const DecltypeType *DT = DI->getType()->getAs<DecltypeType>(); -+ CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D->getDeclContext()); -+ if (DT && RD && isa<ConditionalOperator>(DT->getUnderlyingExpr()) && -+ DT->isReferenceType() && -+ RD->getEnclosingNamespaceContext() == SemaRef.getStdNamespace() && -+ RD->getIdentifier() && RD->getIdentifier()->isStr("common_type") && -+ D->getIdentifier() && D->getIdentifier()->isStr("type") && -+ SemaRef.getSourceManager().isInSystemHeader(D->getLocStart())) -+ // Fold it to the (non-reference) type which g++ would have produced. -+ DI = SemaRef.Context.getTrivialTypeSourceInfo( -+ DI->getType().getNonReferenceType()); -+ - // Create the new typedef - TypedefNameDecl *Typedef; - if (IsTypeAlias) diff --git a/extra/llvm/clang-pure64.patch b/extra/llvm/clang-pure64.patch deleted file mode 100644 index 9bbbfaa8b..000000000 --- a/extra/llvm/clang-pure64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::ppc64) - CmdArgs.push_back("/lib64/ld64.so.1"); - else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/extra/ltrace/fix-crash-on-int3-after-symcall.patch b/extra/ltrace/fix-crash-on-int3-after-symcall.patch deleted file mode 100644 index 5e0a7911c..000000000 --- a/extra/ltrace/fix-crash-on-int3-after-symcall.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -upr ltrace-0.6.0.orig/handle_event.c ltrace-0.6.0/handle_event.c ---- ltrace-0.6.0.orig/handle_event.c 2011-01-07 21:29:30.000000000 +0200 -+++ ltrace-0.6.0/handle_event.c 2012-01-06 05:14:04.000000000 +0200 -@@ -617,6 +617,10 @@ handle_breakpoint(Event *event) { - } - - if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) { -+ if (sbp->libsym == NULL) { -+ continue_after_breakpoint(event->proc, sbp); -+ return; -+ } - if (strcmp(sbp->libsym->name, "") == 0) { - debug(2, "Hit _dl_debug_state breakpoint!\n"); - arch_check_dbg(event->proc); diff --git a/extra/lua/lua-5.1-cflags.diff b/extra/lua/lua-5.1-cflags.diff deleted file mode 100644 index db658aeca..000000000 --- a/extra/lua/lua-5.1-cflags.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile ---- lua-5.1.orig/src/Makefile 2006-02-16 16:45:09.000000000 +0100 -+++ lua-5.1/src/Makefile 2006-03-01 14:55:29.000000000 +0100 -@@ -8,7 +8,8 @@ - PLAT= none - - CC= gcc --CFLAGS= -O2 -Wall $(MYCFLAGS) -+CFLAGS ?= -O2 -Wall -+CFLAGS += $(MYCFLAGS) - AR= ar rcu - RANLIB= ranlib - RM= rm -f diff --git a/extra/lua/lua-arch.patch b/extra/lua/lua-arch.patch deleted file mode 100644 index d8650c3a2..000000000 --- a/extra/lua/lua-arch.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc ---- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200 -+++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100 -@@ -8,6 +8,6 @@ - - # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --prefix= /usr/local -+prefix= /usr - INSTALL_BIN= ${prefix}/bin - INSTALL_INC= ${prefix}/include - INSTALL_LIB= ${prefix}/lib -diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h ---- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 -+++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100 -@@ -94,7 +94,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ -diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile ---- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100 -+++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100 -@@ -23,6 +23,7 @@ - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -36,7 +37,7 @@ - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) - ALL_A= $(LUA_A) - - default: $(PLAT) -@@ -51,6 +52,11 @@ - $(AR) $@ $? - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - ---- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200 -+++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100 -@@ -53,7 +53,7 @@ - all: $(PLAT) - - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) - - test: dummy - src/lua test/hello.lua diff --git a/extra/mahjong/PKGBUILD b/extra/mahjong/PKGBUILD deleted file mode 100644 index 1e87da8b1..000000000 --- a/extra/mahjong/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 160020 2012-05-28 05:16:18Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Jason Chu <jchu@xentac.net> - -pkgname=mahjong -pkgver=1.12.1 -pkgrel=1 -pkgdesc="The classical game of Mah Jong (not the solitare version) with network support" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.stevens-bradfield.com/MahJong/" -license=('GPL' 'custom') -depends=('gtk2') -source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz) -md5sums=('a74acae39d6a49bad9c34b84088f72f3') - -build() { - cd "$srcdir/mj-$pkgver-src" - sed -i 's/& Calling/Calling/' gui-dial.c - make LDLIBS="-lm" -} - -package() { - cd "$srcdir/mj-$pkgver-src" - make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man - install -D -m644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt" -} diff --git a/extra/mcrypt/PKGBUILD b/extra/mcrypt/PKGBUILD deleted file mode 100644 index bcbc3a275..000000000 --- a/extra/mcrypt/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136972 2011-09-04 11:41:22Z pierre $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=mcrypt -pkgver=2.6.8 -pkgrel=2.1 -pkgdesc="A program for encrypting files or streams" -url="http://mcrypt.sourceforge.net/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('mhash' 'libmcrypt' 'zlib') -source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz") -md5sums=('97639f8821b10f80943fa17da302607e') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/extra/memcached/ChangeLog b/extra/memcached/ChangeLog deleted file mode 100644 index d1f1e44d0..000000000 --- a/extra/memcached/ChangeLog +++ /dev/null @@ -1,24 +0,0 @@ -2011-02-07 Ionut Biru <ibiru@archlinux.org> - * Rebuild 1.4.5 against libevent 2.0.10 - -2011-01-31 Dan McGee <dan@archlinux.org> - * Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream - -2009-11-14 Dan McGee <dan@archlinux.org> - * Bump to 1.4.3 - * Added memcached-tool to package - -2009-09-13 Dan McGee <dan@archlinux.org> - * Bump to 1.4.1 - * Add new required conf.d option MEMCACHED_USER - * Rework the way we store the PID for init script usage - -2009-04-12 Dan McGee <dan@archlinux.org> - * Bump to 1.2.8 - -2009-04-05 Dan McGee <dan@archlinux.org> - * Bump to 1.2.7 - -2008-12-13 Dan McGee <dan@archlinux.org> - * Added conf file to backup array - * Fixed the not quite right default config diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index ec2850e85..2279b37f7 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174611 2013-01-05 08:40:08Z giovanni $ +# $Id: PKGBUILD 177821 2013-02-09 16:46:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.4.2 +pkgver=2.5.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('ffae81c0366c13ae852e9fdc26fc3690' +md5sums=('18bee60e0cb3aa9c0c59bb11930f5f51' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa-demos/LICENSE b/extra/mesa-demos/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/extra/mesa-demos/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/extra/mesa-demos/PKGBUILD b/extra/mesa-demos/PKGBUILD deleted file mode 100644 index 79f57c0e6..000000000 --- a/extra/mesa-demos/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 151280 2012-02-25 12:34:36Z pierre $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname='mesa-demos' -pkgver=8.0.1 -pkgrel=2 -arch=('i686' 'x86_64') -pkgdesc="Mesa demos and tools" -url="http://mesa3d.sourceforge.net" -license=('custom') -depends=('glew') -source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2" - 'LICENSE') -md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4' - '5c65a0fe315dd347e09b1f2826a1df5a') - -build() { - cd "${srcdir}/mesa-demos-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/mesa-demos-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos" - install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/" -} diff --git a/extra/mesa/git_fixes.diff b/extra/mesa/git_fixes.diff deleted file mode 100644 index 8132d1d10..000000000 --- a/extra/mesa/git_fixes.diff +++ /dev/null @@ -1,93 +0,0 @@ -From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 08 Oct 2012 22:07:10 +0000 -Subject: docs: Add 9.0 release md5sums - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> ---- -diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html -index d72c5bb..02b7324 100644 ---- a/docs/relnotes-9.0.html -+++ b/docs/relnotes-9.0.html -@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported. - - <h2>MD5 checksums</h2> - <pre> --tbd -+be4cd34c6599a7cb9d254b05c48bdb1f MesaLib-9.0.tar.gz -+60e557ce407be3732711da484ab3db6c MesaLib-9.0.tar.bz2 -+16b128544cd3f7e237927bb9f8aab7ce MesaLib-9.0.zip - </pre> - - --- -cgit v0.9.0.2-2-gbebe -From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Fri, 05 Oct 2012 22:47:40 +0000 -Subject: mesa: don't call TexImage driver hooks for zero-sized images - -This simply avoids some failed assertions but there's no reason to -call the driver hooks for storing a tex image if its size is zero. - -Note: This is a candidate for the stable branches. -(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d) ---- -diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c -index 21646cc..8004876 100644 ---- a/src/mesa/main/teximage.c -+++ b/src/mesa/main/teximage.c -@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, - border, internalFormat, texFormat); - - /* Give the texture to the driver. <pixels> may be null. */ -- if (compressed) { -- ctx->Driver.CompressedTexImage(ctx, dims, texImage, -- imageSize, pixels); -- } -- else { -- ctx->Driver.TexImage(ctx, dims, texImage, format, -- type, pixels, unpack); -+ if (width > 0 && height > 0 && depth > 0) { -+ if (compressed) { -+ ctx->Driver.CompressedTexImage(ctx, dims, texImage, -+ imageSize, pixels); -+ } -+ else { -+ ctx->Driver.TexImage(ctx, dims, texImage, format, -+ type, pixels, unpack); -+ } - } - - check_gen_mipmap(ctx, target, texObj, level); --- -cgit v0.9.0.2-2-gbebe -From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Fri, 05 Oct 2012 22:59:27 +0000 -Subject: mesa: fix error check for zero-sized compressed subtexture - -For glCompressedTexSubImage, width or height = 0 is legal. -Fixes a failure in piglit's s3tc-errors test. - -This is for the 9.0 and 8.0 branches. Already fixed on master. ---- -diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c -index 8004876..38fa9fa 100644 ---- a/src/mesa/main/teximage.c -+++ b/src/mesa/main/teximage.c -@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions, - if (!_mesa_is_compressed_format(ctx, format)) - return GL_INVALID_ENUM; - -- if (width < 1 || width > maxTextureSize) -+ if (width < 0 || width > maxTextureSize) - return GL_INVALID_VALUE; - -- if ((height < 1 || height > maxTextureSize) -+ if ((height < 0 || height > maxTextureSize) - && dimensions > 1) - return GL_INVALID_VALUE; - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch deleted file mode 100644 index a567b5926..000000000 --- a/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index a50a51d..f1bb4d9 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -235,7 +235,24 @@ lp_disassemble(const void* func) - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif - --#if HAVE_LLVM >= 0x0300 -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); -+ if (!MRI) { -+ debug_printf("error: no register info for target %s\n", Triple.c_str()); -+ return; -+ } -+ -+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); -+ if (!MII) { -+ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); -+ return; -+ } -+#endif -+ -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); -+#elif HAVE_LLVM == 0x0300 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); - #elif HAVE_LLVM >= 0x0208 -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe7616b..68f8808 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -62,7 +62,11 @@ - extern "C" void - lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) - { -+#if HAVE_LLVM >= 0x0301 -+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); -+#else - llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); -+#endif - } - - diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD deleted file mode 100644 index 2536b39fe..000000000 --- a/extra/misdnuser/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 166730 2012-09-17 05:26:17Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=misdnuser -pkgver=2.0.17_20120917 -pkgrel=1 -pkgdesc="Tools and library for mISDN" -arch=('i686' 'x86_64') -url="http://www.misdn.org" -license=('GPL') -depends=('isdn4k-utils' 'spandsp') -backup=('etc/capi20.conf') -options=('!makeflags' '!libtool' '!strip') -source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz - misdncapid.rc - mISDNcapid.service - c2faxrecv-mISDNcapid.service - mISDNcapid.conf) - -build() { - # only enable for debugging! - #export CFLAGS+=" -g -O0" - #export CXXFLAGS+=" -g -O0" - cd ${srcdir}/${pkgname}-${pkgver} - make - ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m 755 ${srcdir}/misdncapid.rc ${pkgdir}/etc/rc.d/misdncapid - # fix udev rule - mkdir -p ${pkgdir}/usr/lib/udev/rules.d - mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d - rm -r ${pkgdir}/etc/udev/ - # add systemd files - install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service - # mISDNcapid: - # tends to crash on avmfritz card, add an extra systemd file for - # restarting the services until segfaults are fixed! - install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service - install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf -} -md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8' - '2009563b144de037ecb20f8d727a772e' - '8f305ee6e35fa12a8bec0632bfe7a076' - '32ead7f063e007c784aa883d441f33c2' - '42c3b46880a68c3883ee1ed00af34b45') diff --git a/extra/misdnuser/c2faxrecv-mISDNcapid.service b/extra/misdnuser/c2faxrecv-mISDNcapid.service deleted file mode 100644 index 7a98ca435..000000000 --- a/extra/misdnuser/c2faxrecv-mISDNcapid.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=mISDN CAPI to fax receive -Requires=faxq.service mISDNcapid.service -After=faxq.service mISDNcapid.service - -[Service] -ExecStart=/usr/bin/c2faxrecv -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/extra/misdnuser/mISDNcapid.conf b/extra/misdnuser/mISDNcapid.conf deleted file mode 100644 index 7607e262d..000000000 --- a/extra/misdnuser/mISDNcapid.conf +++ /dev/null @@ -1 +0,0 @@ -D /var/run/mISDNcapid 0755 root root - diff --git a/extra/misdnuser/mISDNcapid.service b/extra/misdnuser/mISDNcapid.service deleted file mode 100644 index 94f38478a..000000000 --- a/extra/misdnuser/mISDNcapid.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=mISDN CAPI daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/mISDNcapid -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/extra/misdnuser/misdncapid.rc b/extra/misdnuser/misdncapid.rc deleted file mode 100755 index 5c47ca0a9..000000000 --- a/extra/misdnuser/misdncapid.rc +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$(pidof -o %PPID /usr/sbin/mISDNcapid)" -case "$1" in - start) - stat_busy "Starting misdncapid" - if [ ! -x /var/run/mISDNcapid ] ; then - install -m755 -d /var/run/mISDNcapid - fi - - [ -z "$PID" ] && /usr/sbin/mISDNcapid >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/sbin/mISDNcapid) - echo $PID > /var/run/misdncapid.pid - add_daemon misdncapid - stat_done - fi - ;; - stop) - stat_busy "Stopping misdncapid" - [ -f /var/run/misdncapid.pid ] && kill `cat /var/run/misdncapid.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/misdncapid.pid - rm_daemon misdncapid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/extra/mkvtoolnix/mm_io.patch b/extra/mkvtoolnix/mm_io.patch deleted file mode 100644 index 9ee9e018f..000000000 --- a/extra/mkvtoolnix/mm_io.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/common/mm_io.cpp 2012-07-08 20:06:02.000000000 +0200 -+++ b/src/common/mm_io.cpp 2012-07-21 11:59:59.000000000 +0200 -@@ -147,7 +147,7 @@ - void - mm_file_io_c::prepare_path(const std::string &path) { - boost::filesystem::path directory = boost::filesystem::path(path).parent_path(); -- if (boost::filesystem::exists(directory)) -+ if (directory.empty() || boost::filesystem::exists(directory)) - return; - - boost::system::error_code error_code; diff --git a/extra/mod_fastcgi/PKGBUILD b/extra/mod_fastcgi/PKGBUILD deleted file mode 100644 index 8b637bc32..000000000 --- a/extra/mod_fastcgi/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 150579 2012-02-18 15:20:31Z pierre $ -# Maintainer: -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=mod_fastcgi -pkgver=2.4.6 -pkgrel=4 -pkgdesc="Apache module to support the FastCGI protocol" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.fastcgi.com/" -depends=('apache') -options=('!libtool') -source=("http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz" - 'lp381384.patch') -md5sums=('a21a613dd5dacf4c8ad88c8550294fed' - '7dd09e6579cc9bf2f992bbd82d1d1537') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/lp381384.patch" - cp Makefile.AP2 Makefile - make top_dir=/usr/lib/httpd -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make top_dir=/usr/lib/httpd DESTDIR="${pkgdir}" install - install -Dm644 docs/LICENSE.TERMS \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/mod_fastcgi/lp381384.patch b/extra/mod_fastcgi/lp381384.patch deleted file mode 100644 index e7c978d10..000000000 --- a/extra/mod_fastcgi/lp381384.patch +++ /dev/null @@ -1,34 +0,0 @@ -References: -http://thread.gmane.org/gmane.comp.web.fastcgi.devel/2613 -http://article.gmane.org/gmane.comp.web.fastcgi.devel/1167 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=509116 -https://bugs.launchpad.net/ubuntu/+source/libapache-mod-fastcgi/+bug/381384 - -Patch extracted from the SNAP-0811090952 snapshot tarball. -2009-05-28 Martin von Gagern - -diff -ru mod_fastcgi-2.4.6/CHANGES mod_fastcgi-2.4.6-lp381384/CHANGES ---- mod_fastcgi-2.4.6/CHANGES 2007-11-13 13:26:35.000000000 +0100 -+++ mod_fastcgi-2.4.6-lp381384/CHANGES 2009-05-28 21:02:31.000000000 +0200 -@@ -1,3 +1,6 @@ -+ *) Don't let the Content-Length header propagate on errors or across -+ redirects. [Artur Zaprzala <arturz ownmail.net>] -+ - 2.4.6 - - *) Fix a bug I introduced in 2.4.4 that broke dynamic application -diff -ru mod_fastcgi-2.4.6/mod_fastcgi.c mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c ---- mod_fastcgi-2.4.6/mod_fastcgi.c 2007-11-13 00:00:10.000000000 +0100 -+++ mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c 2009-05-28 21:02:31.000000000 +0200 -@@ -753,6 +753,11 @@ - ap_table_set(r->headers_out, "Location", value); - continue; - } -+ -+ if (strcasecmp(name, "Content-Length") == 0) { -+ ap_table_set(r->headers_out, name, value); -+ continue; -+ } - - /* If the script wants them merged, it can do it */ - ap_table_add(r->err_headers_out, name, value); diff --git a/extra/mod_mono/mod_mono.install b/extra/mod_mono/mod_mono.install deleted file mode 100644 index 4945a714b..000000000 --- a/extra/mod_mono/mod_mono.install +++ /dev/null @@ -1,20 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - ---> As of version 1.1.10 mod_mono let's you use asp pages very easily by some ---> auto integration in apache. Please read: - http://www.mono-project.com/AutoConfiguration ---> to get the idea. To use mod_mono, you only have to type into httpd.conf: -Include /etc/httpd/conf/mod_mono.conf - -EOM -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# vim: ft=sh diff --git a/extra/monica/PKGBUILD b/extra/monica/PKGBUILD deleted file mode 100644 index 0615205f3..000000000 --- a/extra/monica/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 130314 2011-07-04 22:06:55Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=monica -pkgver=3.7 -pkgrel=2 -pkgdesc="A monitor calibration tool" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.pcbypaul.com/software/monica.html" -license=('BSD') -depends=('fltk' 'xorg-xgamma') -makedepends=('librsvg') -#http://www.pcbypaul.com/software/dl/${pkgname}-${pkgver}.tar.bz2 -source=(ftp://ftp.archlinux.org/other/monica/${pkgname}-${pkgver}.tar.bz2 \ - monica.desktop monica.svg) -md5sums=('490aabc35b830e4a3dc32a2f893ba805' - 'a337bfda1fca7228420db0ce92256816' - '4569f5df7d7b3eaf20108adf48e8dfe4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -Dm755 monica "${pkgdir}/usr/bin/monica" - install -Dm644 "${srcdir}/monica.desktop" "${pkgdir}/usr/share/applications/monica.desktop" - install -Dm644 "${srcdir}/monica.svg" "${pkgdir}/usr/share/pixmaps/monica.svg" - rsvg-convert -w 64 -h 57 -f png -o "${pkgdir}/usr/share/pixmaps/monica.png" "${srcdir}/monica.svg" - install -Dm644 licence "${pkgdir}/usr/share/licenses/monica/license.txt" -} diff --git a/extra/monica/monica.desktop b/extra/monica/monica.desktop deleted file mode 100644 index 6b17659ca..000000000 --- a/extra/monica/monica.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Monica -Comment=Monitor Calibration for x-server -Exec=monica -Icon=monica -Terminal=false -Type=Application -X-MultipleArgs=false -Categories=Application;Settings;System; diff --git a/extra/monica/monica.svg b/extra/monica/monica.svg deleted file mode 100644 index bb9f77d9b..000000000 --- a/extra/monica/monica.svg +++ /dev/null @@ -1,248 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="monica.svg" - sodipodi:docbase="/home/pool/graphics/arch_candy/svg-icons" - height="67.000000pt" - width="70.000000pt" - inkscape:version="0.41" - sodipodi:version="0.32" - id="svg1573"> - <defs - id="defs1575"> - <linearGradient - id="linearGradient1606"> - <stop - id="stop1607" - offset="0.0000000" - style="stop-color:#000000;stop-opacity:0.62745100;" /> - <stop - id="stop1608" - offset="1.0000000" - style="stop-color:#000000;stop-opacity:0.0000000;" /> - </linearGradient> - <radialGradient - gradientTransform="translate(0.000000,3.125000)" - gradientUnits="userSpaceOnUse" - fy="12.500000" - fx="12.500000" - r="12.433378" - cy="12.500000" - cx="12.500000" - id="radialGradient1636" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.437333,0.000000,0.000000,0.410284,0.000000,3.125000)" - y2="0.0000000" - x2="20.514223" - y1="30.771334" - x1="20.514223" - id="linearGradient1638" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(-12.50000,3.250000)" - gradientUnits="userSpaceOnUse" - fy="12.500000" - fx="100.00000" - r="12.500000" - cy="12.500000" - cx="100.00000" - id="radialGradient1643" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.447214,0.000000,0.000000,2.236068,-12.50000,3.250000)" - y2="19.565595" - x2="251.55765" - y1="19.565595" - x1="223.60680" - id="linearGradient1645" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.508806,0.000000,0.000000,1.965387,0.000000,3.125000)" - y2="18.889412" - x2="0.0000000" - y1="18.889412" - x1="25.058681" - id="linearGradient1647" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.814390,0.000000,0.000000,0.355317,0.000000,-10.12500)" - y2="246.61094" - x2="22.207298" - y1="211.07926" - x1="22.207298" - id="linearGradient1649" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(0.000000,-10.12500)" - gradientUnits="userSpaceOnUse" - fy="75.000000" - fx="12.500000" - r="12.500000" - cy="75.000000" - cx="12.500000" - id="radialGradient1651" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(-12.50000,-10.000000)" - gradientUnits="userSpaceOnUse" - fy="75.000000" - fx="100.00000" - r="12.500000" - cy="75.000000" - cx="100.00000" - id="radialGradient1653" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - </defs> - <sodipodi:namedview - inkscape:current-layer="svg1573" - inkscape:window-y="3" - inkscape:window-x="0" - inkscape:grid-points="true" - inkscape:grid-bbox="true" - gridtolerance="2.0000000px" - gridoriginx="0.0000000pt" - gridoriginy="0.0000000pt" - gridspacingx="10.000000pt" - gridspacingy="10.000000pt" - snaptogrid="false" - showgrid="true" - inkscape:window-height="1002" - inkscape:window-width="1272" - inkscape:cy="50.235475" - inkscape:cx="67.194289" - inkscape:zoom="7.9999998" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" /> - <metadata - id="metadata1576"> - <rdf:RDF - id="RDF1577"> - <cc:Work - id="Work1578" - rdf:about=""> - <dc:description - id="description1579">Created with Inkscape -http://www.inkscape.org/</dc:description> - <dc:format - id="format1581">image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" - id="type1583" /> - <dc:title - id="title1606">ML-Term Icon</dc:title> - <dc:date - id="date1608">2004-07-14</dc:date> - <dc:creator - id="creator1610"> - <cc:Agent - id="Agent1611"> - <dc:title - id="title1612">Tobias Kieslich</dc:title> - </cc:Agent> - </dc:creator> - <dc:coverage - id="coverage1614" /> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" - id="license1616" /> - </cc:Work> - <cc:License - id="License1624" - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - id="permits1625" - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - id="permits1626" - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - id="requires1627" - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - id="permits1628" - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - id="requires1629" - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - id="requires1630" - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> - </rdf:RDF> - </metadata> - <path - sodipodi:nodetypes="cc" - id="path2775" - d="M 5.8437501,76.625001 L 82.343750,76.625001" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:9.1875000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2007" - d="M 10.593750,6.8437510 L 77.343750,6.8437510" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cccc" - id="path2803" - d="M 8.2187499,9.3437490 L 8.2187499,59.593751 L 79.718750,59.593751 L 79.718750,9.3437490" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2807" - d="M 29.750001,67.218750 L 58.125000,67.218750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:14.937500;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2953" - d="M 22.468750,14.718749 L 22.468750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#3f0000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2955" - d="M 27.468750,14.718749 L 27.468750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ff1500;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2957" - d="M 41.593750,14.718749 L 41.593750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#0b2f00;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2959" - d="M 46.593750,14.718749 L 46.593750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#08ce00;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2961" - d="M 60.718750,14.718749 L 60.718750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#00004e;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2963" - d="M 65.718750,14.718749 L 65.718750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#0072ff;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> -</svg> diff --git a/extra/mono/mono.rc.d b/extra/mono/mono.rc.d deleted file mode 100644 index 548cc2d7b..000000000 --- a/extra/mono/mono.rc.d +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Registering .NET IL binaries with mono" - if [ ! -d /proc/sys/fs/binfmt_misc ]; then - stat_die "You need support for \"misc binaries\" in your kernel!" - fi - mount | grep -q binfmt_misc - if [ $? != 0 ]; then - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc - if [ $? != 0 ]; then - stat_die - fi - fi - echo ':CLR:M::MZ::/usr/bin/mono:' > /proc/sys/fs/binfmt_misc/register - stat_done - ;; - stop) - - stat_busy "Unregistering .NET IL binaries" - if [ -f /proc/sys/fs/binfmt_misc/CLR ]; then - echo '-1' > /proc/sys/fs/binfmt_misc/CLR - fi - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/monodevelop/monodevelop_gnome3.patch b/extra/monodevelop/monodevelop_gnome3.patch deleted file mode 100644 index 4ea101f6a..000000000 --- a/extra/monodevelop/monodevelop_gnome3.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs -index 4d8954c..e1a1937 100644 ---- a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs -+++ b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs -@@ -1,5 +1,6 @@ - using System; - using System.Collections; -+using System.Collections.Generic; - - namespace Stetic.Wrapper { - public abstract class Object : Stetic.ObjectWrapper { -@@ -11,17 +12,32 @@ namespace Stetic.Wrapper { - ((GLib.Object)Wrapped).RemoveNotification (NotifyHandler); - base.Dispose (); - } -- -+ -+ IEnumerable<string> GladePropertyNames { -+ get { -+ foreach (ItemGroup group in ClassDescriptor.ItemGroups) { -+ foreach (ItemDescriptor item in group) { -+ TypedPropertyDescriptor prop = item as TypedPropertyDescriptor; -+ if (prop != null && !string.IsNullOrEmpty (prop.GladeName)) { -+ yield return prop.GladeName; -+ } -+ } -+ } -+ } -+ } -+ - internal protected override void OnDesignerAttach (IDesignArea designer) - { - base.OnDesignerAttach (designer); -- ((GLib.Object)Wrapped).AddNotification (NotifyHandler); -+ foreach (string property in GladePropertyNames) -+ ((GLib.Object)Wrapped).AddNotification (property, NotifyHandler); - } - - internal protected override void OnDesignerDetach (IDesignArea designer) - { - base.OnDesignerDetach (designer); -- ((GLib.Object)Wrapped).RemoveNotification (NotifyHandler); -+ foreach (string property in GladePropertyNames) -+ ((GLib.Object)Wrapped).RemoveNotification (property, NotifyHandler); - } - - public static Object Lookup (GLib.Object obj) - -diff --git a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs -index 89f04b5..75d7b17 100644 ---- a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs -+++ b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs -@@ -1540,22 +1540,39 @@ namespace MonoDevelop.Components.Commands - internal class ToolbarTracker - { - Gtk.IconSize lastSize; -- -+ - public void Track (Gtk.Toolbar toolbar) - { - lastSize = toolbar.IconSize; -- toolbar.AddNotification (OnToolbarPropChanged); -+ toolbar.AddNotification ("icon-size", IconSizeChanged); -+ toolbar.OrientationChanged += HandleToolbarOrientationChanged; -+ toolbar.StyleChanged += HandleToolbarStyleChanged; -+ - toolbar.Destroyed += delegate { -- toolbar.RemoveNotification (OnToolbarPropChanged); -+ toolbar.StyleChanged -= HandleToolbarStyleChanged; -+ toolbar.OrientationChanged -= HandleToolbarOrientationChanged; -+ toolbar.RemoveNotification ("icon-size", IconSizeChanged); - }; - } -- -- void OnToolbarPropChanged (object ob, GLib.NotifyArgs args) -+ -+ void HandleToolbarStyleChanged (object o, Gtk.StyleChangedArgs args) - { -- Gtk.Toolbar t = (Gtk.Toolbar) ob; -- if (lastSize != t.IconSize || args.Property == "orientation" || args.Property == "toolbar-style") -+ Gtk.Toolbar t = (Gtk.Toolbar) o; -+ if (lastSize != t.IconSize) - UpdateCustomItems (t); -- lastSize = t.IconSize; -+ } -+ -+ void HandleToolbarOrientationChanged (object o, Gtk.OrientationChangedArgs args) -+ { -+ Gtk.Toolbar t = (Gtk.Toolbar) o; -+ if (lastSize != t.IconSize) -+ UpdateCustomItems (t); -+ } -+ -+ void IconSizeChanged (object o, GLib.NotifyArgs args) -+ { -+ this.lastSize = ((Gtk.Toolbar) o).IconSize; -+ UpdateCustomItems ((Gtk.Toolbar) o); - } - - void UpdateCustomItems (Gtk.Toolbar t) - diff --git a/extra/mpck/PKGBUILD b/extra/mpck/PKGBUILD deleted file mode 100644 index aa701f30c..000000000 --- a/extra/mpck/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 143907 2011-11-30 20:27:25Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=mpck -pkgver=0.19 -pkgrel=2 -license=('GPL') -pkgdesc="Reads MP3 files and tries to determine if they are correct" -arch=('i686' 'x86_64' 'mips64el') -url="http://checkmate.gissen.nl/" -depends=('glibc') -source=("http://checkmate.gissen.nl/checkmate-${pkgver}.tar.gz") -md5sums=('f72114b0982a101b68ddeb65f99b84f7') - -build() { - cd "${srcdir}/checkmate-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/checkmate-${pkgver}" - - make prefix="${pkgdir}/usr" install -} diff --git a/extra/mplayer/PKGBUILD b/extra/mplayer/PKGBUILD deleted file mode 100644 index 767521e76..000000000 --- a/extra/mplayer/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 171266 2012-11-16 23:35:46Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgbase=mplayer -pkgname=('mplayer' 'mencoder') -pkgver=35421 -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' -'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' -'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion') -license=('GPL') -url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop) -md5sums=('b8a82ad1e1d6c3ac847074772daba817' - 'c0d6ef795cf6de48e3b87ff7c23f0319') - -build() { - cd "$srcdir/$pkgbase" - - ./configure --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --disable-ass-internal \ - --disable-cdparanoia \ - --enable-xvmc \ - --enable-radio \ - --enable-radio-capture \ - --language=all \ - --confdir=/etc/mplayer - [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak - - make -} - -package_mplayer() { - pkgdesc="A movie player for linux" - install=mplayer.install - backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') - depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' - 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' - 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') - - cd "$srcdir/$pkgbase" - - make DESTDIR="$pkgdir" install-mplayer install-mplayer-man - install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" - install -dm755 "$pkgdir/usr/share/mplayer/" - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf" - rm -rf "$pkgdir/usr/share/mplayer/font" - #desktop file FS#14770 - install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop" - install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" -} - -package_mencoder() { - pkgdesc="Free command line video decoding, encoding and filtering tool" - depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' - 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio' 'libvorbis') - - cd "$srcdir/$pkgbase" - make DESTDIR="$pkgdir" install-mencoder install-mencoder-man - find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; -} -md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' - 'c0d6ef795cf6de48e3b87ff7c23f0319') diff --git a/extra/mplayer/mplayer.desktop b/extra/mplayer/mplayer.desktop deleted file mode 100644 index 07acea13f..000000000 --- a/extra/mplayer/mplayer.desktop +++ /dev/null @@ -1,21 +0,0 @@ -[Desktop Entry] -Type=Application -Name=MPlayer Media Player -Name[ca]=Reproductor multimèdia MPlayer -Name[pl]=MPlayer odtwarzacz multimedialny -GenericName=Multimedia player -Comment=Play movies and songs -Comment[ca]=ReproduĂŻu vĂdeos i cançons -Comment[de]=Filme und Musik abspielen -Comment[es]=Reproduzca vĂdeos y canciones -Comment[fr]=Lecteur multimĂ©dia -Comment[it]=Lettore multimediale -Comment[zh]=多媒体ć’放器 -Comment[pl]=Odtwarzaj filmy i muzykÄ™ -Icon=mplayer -TryExec=mplayer -Exec=mplayer %F -Terminal=false -NoDisplay=true -Categories=GTK;AudioVideo;Audio;Video;Player;TV; -MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska; diff --git a/extra/mplayer/mplayer.install b/extra/mplayer/mplayer.install deleted file mode 100644 index 660593cf5..000000000 --- a/extra/mplayer/mplayer.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/mplayer/mplayer.png b/extra/mplayer/mplayer.png Binary files differdeleted file mode 100644 index 799769335..000000000 --- a/extra/mplayer/mplayer.png +++ /dev/null diff --git a/extra/mrtg/PKGBUILD b/extra/mrtg/PKGBUILD deleted file mode 100644 index b60143b19..000000000 --- a/extra/mrtg/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 146521 2012-01-12 10:46:44Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=mrtg -pkgver=2.17.4 -pkgrel=1 -pkgdesc="Multi Router Traffic Grapher." -arch=('i686' 'x86_64' 'mips64el') -url="http://oss.oetiker.ch/mrtg/" -license=('GPL') -depends=('gd' 'perl') -source=("http://oss.oetiker.ch/mrtg/pub/${pkgname}-${pkgver}.tar.gz") -md5sums=('197565e97f97212eef7b414463c8d40c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed 's|LD_RUN_PATH=$(LD_RUN_PATH) ||g' -i Makefile.in - ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix=${pkgdir}/usr install -} diff --git a/extra/mutt/1a4c43138685.patch b/extra/mutt/1a4c43138685.patch deleted file mode 100644 index ec1bc198a..000000000 --- a/extra/mutt/1a4c43138685.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: muttlib.c
-===================================================================
---- muttlib.c (revision 6128:eff500f87889)
-+++ muttlib.c (revision 6161:1a4c43138685)
-@@ -1961,5 +1961,6 @@
- char *p = safe_strdup (src);
- int rc = mutt_convert_string (&p, Charset, "utf-8", 0);
-- strfcpy (dest, rc == 0 ? p : src, dlen);
-+ /* `src' may be NULL, such as when called from the pop3 driver. */
-+ strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);
- FREE (&p);
- }
diff --git a/extra/mysql/mysqld b/extra/mysql/mysqld deleted file mode 100755 index 1ac88a7cc..000000000 --- a/extra/mysql/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MySQL Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MySQL Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/mysql/mysqld.rc b/extra/mysql/mysqld.rc deleted file mode 100755 index 4bbddb5a4..000000000 --- a/extra/mysql/mysqld.rc +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MySQL Server" - [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MySQL Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index f30a2ac81..984aa32cc 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,19 +1,25 @@ -# $Id: PKGBUILD 177625 2013-02-08 08:55:45Z andrea $ +# $Id: PKGBUILD 177801 2013-02-09 06:06:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'fix-recursive-indexing.patch') +sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264' + 'faa0f661fe642af01ac72eda7347dfc659e091e1') build() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-recursive-indexing.patch + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/nepomuk-core/fix-recursive-indexing.patch b/extra/nepomuk-core/fix-recursive-indexing.patch new file mode 100644 index 000000000..c4db4e414 --- /dev/null +++ b/extra/nepomuk-core/fix-recursive-indexing.patch @@ -0,0 +1,103 @@ +From: Vishesh Handa <me@vhanda.in> +Date: Fri, 08 Feb 2013 20:58:33 +0000 +Subject: Revert "BasicIndexingQueue: Use stacks instead of queues" +X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=b651f9231ac30072418bb06d602951f0f05da22c +--- +Revert "BasicIndexingQueue: Use stacks instead of queues" + +This reverts commit 2f33141aa6716550e38b11ec9a0b000dd74eea79. + +The commit breaks recursive indexing. Doh! + +BUG: 314559 +--- + + +--- a/services/fileindexer/basicindexingqueue.cpp ++++ b/services/fileindexer/basicindexingqueue.cpp +@@ -54,14 +54,14 @@ + + void BasicIndexingQueue::clear(const QString& path) + { +- QMutableVectorIterator< QPair<QString, UpdateDirFlags> > it( m_paths ); ++ QMutableListIterator< QPair<QString, UpdateDirFlags> > it( m_paths ); + while( it.hasNext() ) { + it.next(); + if( it.value().first.startsWith( path ) ) + it.remove(); + } + +- QMutableVectorIterator< QPair<QDirIterator*, UpdateDirFlags> > iter( m_iterators ); ++ QMutableListIterator< QPair<QDirIterator*, UpdateDirFlags> > iter( m_iterators ); + while( iter.hasNext() ) { + QDirIterator* dirIter = iter.next().first; + +@@ -100,7 +100,7 @@ + { + kDebug() << path; + bool wasEmpty = m_paths.empty(); +- m_paths.push( qMakePair( path, flags ) ); ++ m_paths.enqueue( qMakePair( path, flags ) ); + callForNextIteration(); + + if( wasEmpty ) +@@ -120,12 +120,12 @@ + processingFile = process( dirIt->next(), pair.second ); + } + else { +- delete m_iterators.pop().first; ++ delete m_iterators.dequeue().first; + } + } + + else if( !m_paths.isEmpty() ) { +- QPair< QString, UpdateDirFlags > pair = m_paths.pop(); ++ QPair< QString, UpdateDirFlags > pair = m_paths.dequeue(); + processingFile = process( pair.first, pair.second ); + } + +@@ -161,7 +161,7 @@ + QDir::Filters dirFilter = QDir::NoDotAndDotDot|QDir::Readable|QDir::Files|QDir::Dirs; + + QPair<QDirIterator*, UpdateDirFlags> pair = qMakePair( new QDirIterator( path, dirFilter ), flags ); +- m_iterators.push( pair ); ++ m_iterators.enqueue( pair ); + } + } + else if( info.isFile() && (forced || indexingRequired) ) { +@@ -259,12 +259,6 @@ + + emit endIndexingFile( url ); + +- // Give back the memory +- if( m_paths.isEmpty() ) +- m_paths.clear(); +- if( m_iterators.isEmpty() ) +- m_iterators.clear(); +- + // Continue the queue + finishIteration(); + } + +--- a/services/fileindexer/basicindexingqueue.h ++++ b/services/fileindexer/basicindexingqueue.h +@@ -23,7 +23,6 @@ + + #include "indexingqueue.h" + #include <KJob> +-#include <QtCore/QStack> + + namespace Nepomuk2 { + +@@ -106,8 +105,8 @@ + */ + bool process(const QString& path, Nepomuk2::UpdateDirFlags flags); + +- QStack< QPair<QString, UpdateDirFlags> > m_paths; +- QStack< QPair<QDirIterator*, UpdateDirFlags> > m_iterators; ++ QQueue< QPair<QString, UpdateDirFlags> > m_paths; ++ QQueue< QPair<QDirIterator*, UpdateDirFlags> > m_iterators; + + QUrl m_currentUrl; + QString m_currentMimeType; + diff --git a/extra/nepomuk-core/regression-crash.patch b/extra/nepomuk-core/regression-crash.patch deleted file mode 100644 index 2559c99c4..000000000 --- a/extra/nepomuk-core/regression-crash.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: David Faure <faure@kde.org> -Date: Tue, 02 Oct 2012 18:27:03 +0000 -Subject: Fix crash when watchUserLimitReached() leads to deleting the KInotify instance -X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=804e54f83ade8a377d392d350981ead07f60a9d3 ---- -Fix crash when watchUserLimitReached() leads to deleting the KInotify instance - -... which emitted the signal. So don't use a direct delete. - -BUG: 307388 -FIXED-IN: 4.9.3 ---- - - ---- a/services/filewatch/nepomukfilewatch.cpp -+++ b/services/filewatch/nepomukfilewatch.cpp -@@ -323,7 +323,8 @@ - void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached() - { - // we do it the brutal way for now hoping with new kernels and defaults this will never happen -- delete m_dirWatch; -+ // Delete the KInotify and switch to KDirNotify dbus signals -+ m_dirWatch->deleteLater(); - m_dirWatch = 0; - connectToKDirWatch(); - } - -From: Dan Vrátil <dvratil@redhat.com> -Date: Wed, 03 Oct 2012 11:27:22 +0000 -Subject: Add null-crash guards for m_dirWatch to FileWatch -X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=32b44881dda4f243932c59c11bf39c91f30c224b ---- -Add null-crash guards for m_dirWatch to FileWatch - -BUG: 307388 ---- - - ---- a/services/filewatch/nepomukfilewatch.cpp -+++ b/services/filewatch/nepomukfilewatch.cpp -@@ -114,6 +114,7 @@ - - Nepomuk2::FileWatch::FileWatch( QObject* parent, const QList<QVariant>& ) - : Service( parent ) -+ , m_dirWatch( 0 ) - { - // Create the configuration instance singleton (for thread-safety) - // ============================================================== -@@ -324,8 +325,10 @@ - { - // we do it the brutal way for now hoping with new kernels and defaults this will never happen - // Delete the KInotify and switch to KDirNotify dbus signals -- m_dirWatch->deleteLater(); -- m_dirWatch = 0; -+ if( m_dirWatch ) { -+ m_dirWatch->deleteLater(); -+ m_dirWatch = 0; -+ } - connectToKDirWatch(); - } - #endif -@@ -413,7 +416,9 @@ - void Nepomuk2::FileWatch::slotDeviceTeardownRequested(const Nepomuk2::RemovableMediaCache::Entry* entry ) - { - #ifdef BUILD_KINOTIFY -- m_dirWatch->removeWatch( entry->mountPath() ); -+ if( m_dirWatch ) { -+ m_dirWatch->removeWatch( entry->mountPath() ); -+ } - #endif - } - - diff --git a/extra/networkmanager/dont-fight-over-ipv6.patch b/extra/networkmanager/dont-fight-over-ipv6.patch deleted file mode 100644 index f7945335f..000000000 --- a/extra/networkmanager/dont-fight-over-ipv6.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 77de91e5a8b1c1993ae65c54b37e0411e78e6fe6 Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Thu, 19 Apr 2012 18:27:12 +0000 -Subject: core: don't fight with the kernel over the default IPv6 route - -The kernel wants there to be a default route over every RA-ed IPv6 -interface, and it gets confused and annoyed if we remove that default -route and replace it with our own (causing it to effectively drop all -further RAs on the floor, which is particularly bad if some of the -information in the earlier RA had an expiration time). - -So, rather than replacing the kernel's default route(s), just add an -additional one of our own, with a lower (ie, higher priority) metric. - -https://bugzilla.redhat.com/show_bug.cgi?id=785772 ---- -diff --git a/src/nm-system.c b/src/nm-system.c -index 91153ec..4cebb13 100644 ---- a/src/nm-system.c -+++ b/src/nm-system.c -@@ -1023,7 +1023,7 @@ add_ip6_route_to_gateway (int ifindex, const struct in6_addr *gw) - } - - static int --replace_default_ip6_route (int ifindex, const struct in6_addr *gw) -+add_default_ip6_route (int ifindex, const struct in6_addr *gw) - { - struct rtnl_route *route = NULL; - struct nl_sock *nlh; -@@ -1037,22 +1037,36 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw) - route = nm_netlink_route_new (ifindex, AF_INET6, 0, - NMNL_PROP_SCOPE, RT_SCOPE_UNIVERSE, - NMNL_PROP_TABLE, RT_TABLE_MAIN, -+ NMNL_PROP_PRIO, 1, - NULL); - g_return_val_if_fail (route != NULL, -ENOMEM); - - /* Add the new default route */ -- err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_REPLACE); -- if (err == -NLE_EXIST) { -- /* FIXME: even though we use NLM_F_REPLACE the kernel won't replace -- * the route if it's the same. Suppress the pointless error. -- */ -+ err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE); -+ if (err == -NLE_EXIST) - err = 0; -- } - - rtnl_route_put (route); - return err; - } - -+static struct rtnl_route * -+find_static_default_routes (struct rtnl_route *route, -+ struct nl_addr *dst, -+ const char *iface, -+ gpointer user_data) -+{ -+ GList **def_routes = user_data; -+ -+ if ( nl_addr_get_prefixlen (dst) == 0 -+ && rtnl_route_get_protocol (route) == RTPROT_STATIC) { -+ rtnl_route_get (route); -+ *def_routes = g_list_prepend (*def_routes, route); -+ } -+ -+ return NULL; -+} -+ - /* - * nm_system_replace_default_ip6_route - * -@@ -1062,12 +1076,35 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw) - gboolean - nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw) - { -- struct rtnl_route *gw_route = NULL; -+ GList *def_routes, *iter; -+ struct rtnl_route *route, *gw_route = NULL; - gboolean success = FALSE; - char *iface; - int err; - -- err = replace_default_ip6_route (ifindex, gw); -+ /* We can't just use NLM_F_REPLACE here like in the IPv4 case, because -+ * the kernel doesn't like it if we replace the default routes it -+ * creates. (See rh#785772.) So we delete any non-kernel default routes, -+ * and then add a new default route of our own with a lower metric than -+ * the kernel ones. -+ */ -+ def_routes = NULL; -+ nm_netlink_foreach_route (ifindex, AF_INET6, RT_SCOPE_UNIVERSE, TRUE, -+ find_static_default_routes, &def_routes); -+ for (iter = def_routes; iter; iter = iter->next) { -+ route = iter->data; -+ if (!nm_netlink_route_delete (route)) { -+ iface = nm_netlink_index_to_iface (ifindex); -+ nm_log_err (LOGD_DEVICE | LOGD_IP6, -+ "(%s): failed to delete existing IPv6 default route", -+ iface); -+ g_free (iface); -+ } -+ rtnl_route_put (route); -+ } -+ g_list_free (def_routes); -+ -+ err = add_default_ip6_route (ifindex, gw); - if (err == 0) - return TRUE; - -@@ -1091,7 +1128,7 @@ nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw) - goto out; - - /* Try adding the original route again */ -- err = replace_default_ip6_route (ifindex, gw); -+ err = add_default_ip6_route (ifindex, gw); - if (err != 0) { - nm_netlink_route_delete (gw_route); - nm_log_err (LOGD_DEVICE | LOGD_IP6, --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/networkmanager/initialize-GError.patch b/extra/networkmanager/initialize-GError.patch deleted file mode 100644 index 58f0b9cb3..000000000 --- a/extra/networkmanager/initialize-GError.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8bb278944496102a4afad46b53e1e8279425aaac Mon Sep 17 00:00:00 2001 -From: Jiřà Klimeš <jklimes@redhat.com> -Date: Mon, 02 Apr 2012 14:37:55 +0000 -Subject: libnm-glib: initialize GError, else invalid free() crash can occur (rh #809123) - ---- -(limited to 'libnm-glib/nm-remote-settings.c') - -diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c -index 9a81a8d..68aaeb4 100644 ---- a/libnm-glib/nm-remote-settings.c -+++ b/libnm-glib/nm-remote-settings.c -@@ -109,7 +109,7 @@ static void - _nm_remote_settings_ensure_inited (NMRemoteSettings *self) - { - NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self); -- GError *error; -+ GError *error = NULL; - - if (!priv->inited) { - if (!g_initable_init (G_INITABLE (self), NULL, &error)) { --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/networkmanager/systemd-fallback.patch b/extra/networkmanager/systemd-fallback.patch deleted file mode 100644 index f5acc9dc6..000000000 --- a/extra/networkmanager/systemd-fallback.patch +++ /dev/null @@ -1,470 +0,0 @@ -diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac ---- NetworkManager-0.9.3.995/configure.ac 2012-03-02 01:05:21.000000000 +0100 -+++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac 2012-03-06 16:55:58.294793902 +0100 -@@ -344,7 +344,7 @@ - case $with_session_tracking in - ck|none) ;; - systemd) -- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) -+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) - ;; - *) - AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd]) -diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c ---- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c 2012-02-27 16:57:16.000000000 +0100 -+++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c 2012-03-06 16:55:01.285264295 +0100 -@@ -28,6 +28,10 @@ - #include <glib/gstdio.h> - #include <systemd/sd-login.h> - #include <stdlib.h> -+#include <systemd/sd-daemon.h> -+#include <sys/stat.h> -+#include <gio/gio.h> -+#include "nm-logging.h" - - #include "nm-session-utils.h" - #include "nm-session-monitor.h" -@@ -107,10 +111,20 @@ - return source; - } - -+/********************************************************************/ -+ -+#define CKDB_PATH "/var/run/ConsoleKit/database" -+ - struct _NMSessionMonitor { - GObject parent_instance; - - GSource *sd_source; -+ -+ GKeyFile *database; -+ GFileMonitor *database_monitor; -+ time_t database_mtime; -+ GHashTable *sessions_by_uid; -+ GHashTable *sessions_by_user; - }; - - struct _NMSessionMonitorClass { -@@ -130,6 +144,215 @@ - - /* ---------------------------------------------------------------------------------------------------- */ - -+typedef struct { -+ char *user; -+ uid_t uid; -+ gboolean local; -+ gboolean active; -+} Session; -+ -+static void -+session_free (Session *s) -+{ -+ g_free (s->user); -+ memset (s, 0, sizeof (Session)); -+ g_free (s); -+} -+ -+static gboolean -+check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error) -+{ -+ if (g_key_file_has_key (keyfile, group, key, error)) -+ return TRUE; -+ -+ if (!error) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, -+ "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key", -+ group, key); -+ } -+ return FALSE; -+} -+ -+static Session * -+session_new (GKeyFile *keyfile, const char *group, GError **error) -+{ -+ GError *local = NULL; -+ Session *s; -+ const char *uname = NULL; -+ -+ s = g_new0 (Session, 1); -+ g_assert (s); -+ -+ s->uid = G_MAXUINT; /* paranoia */ -+ if (!check_key (keyfile, group, "uid", &local)) -+ goto error; -+ s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local); -+ if (local) -+ goto error; -+ -+ if (!check_key (keyfile, group, "is_active", &local)) -+ goto error; -+ s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local); -+ if (local) -+ goto error; -+ -+ if (!check_key (keyfile, group, "is_local", &local)) -+ goto error; -+ s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local); -+ if (local) -+ goto error; -+ -+ if (!nm_session_uid_to_user (s->uid, &uname, error)) -+ return FALSE; -+ s->user = g_strdup (uname); -+ -+ return s; -+ -+error: -+ session_free (s); -+ g_propagate_error (error, local); -+ return NULL; -+} -+ -+static void -+session_merge (Session *src, Session *dest) -+{ -+ g_return_if_fail (src != NULL); -+ g_return_if_fail (dest != NULL); -+ -+ g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0); -+ g_warn_if_fail (src->uid == dest->uid); -+ -+ dest->local = (dest->local || src->local); -+ dest->active = (dest->active || src->active); -+} -+ -+/********************************************************************/ -+ -+static void -+free_database (NMSessionMonitor *self) -+{ -+ if (self->database != NULL) { -+ g_key_file_free (self->database); -+ self->database = NULL; -+ } -+ -+ g_hash_table_remove_all (self->sessions_by_uid); -+ g_hash_table_remove_all (self->sessions_by_user); -+} -+ -+static gboolean -+reload_database (NMSessionMonitor *self, GError **error) -+{ -+ struct stat statbuf; -+ char **groups = NULL; -+ gsize len = 0, i; -+ Session *s; -+ -+ free_database (self); -+ -+ errno = 0; -+ if (stat (CKDB_PATH, &statbuf) != 0) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, -+ "Error statting file " CKDB_PATH ": %s", -+ strerror (errno)); -+ goto error; -+ } -+ self->database_mtime = statbuf.st_mtime; -+ -+ self->database = g_key_file_new (); -+ if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error)) -+ goto error; -+ -+ groups = g_key_file_get_groups (self->database, &len); -+ if (!groups) { -+ g_set_error_literal (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_IO_ERROR, -+ "Could not load groups from " CKDB_PATH ""); -+ goto error; -+ } -+ -+ for (i = 0; i < len; i++) { -+ Session *found; -+ -+ if (!g_str_has_prefix (groups[i], "Session ")) -+ continue; -+ -+ s = session_new (self->database, groups[i], error); -+ if (!s) -+ goto error; -+ -+ found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user); -+ if (found) { -+ session_merge (s, found); -+ session_free (s); -+ } else { -+ /* Entirely new user */ -+ g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s); -+ g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s); -+ } -+ } -+ -+ g_strfreev (groups); -+ return TRUE; -+ -+error: -+ if (groups) -+ g_strfreev (groups); -+ free_database (self); -+ return FALSE; -+} -+ -+static gboolean -+ensure_database (NMSessionMonitor *self, GError **error) -+{ -+ gboolean ret = FALSE; -+ -+ if (self->database != NULL) { -+ struct stat statbuf; -+ -+ errno = 0; -+ if (stat (CKDB_PATH, &statbuf) != 0) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, -+ "Error statting file " CKDB_PATH " to check timestamp: %s", -+ strerror (errno)); -+ goto out; -+ } -+ -+ if (statbuf.st_mtime == self->database_mtime) { -+ ret = TRUE; -+ goto out; -+ } -+ } -+ -+ ret = reload_database (self, error); -+ -+out: -+ return ret; -+} -+ -+static void -+on_file_monitor_changed (GFileMonitor * file_monitor, -+ GFile * file, -+ GFile * other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data) -+{ -+ NMSessionMonitor *self = NM_SESSION_MONITOR (user_data); -+ -+ /* throw away cache */ -+ free_database (self); -+ -+ g_signal_emit (self, signals[CHANGED_SIGNAL], 0); -+} -+ - static gboolean - sessions_changed (gpointer user_data) - { -@@ -143,9 +366,50 @@ - static void - nm_session_monitor_init (NMSessionMonitor *monitor) - { -- monitor->sd_source = sd_source_new (); -- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -- g_source_attach (monitor->sd_source, NULL); -+ if (sd_booted () > 0) { -+ monitor->sd_source = sd_source_new (); -+ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -+ g_source_attach (monitor->sd_source, NULL); -+ -+ monitor->database_monitor = NULL; -+ monitor->database = NULL; -+ } else { -+ monitor->sd_source = NULL; -+ -+ GError *error = NULL; -+ GFile *file; -+ -+ /* Sessions-by-user is responsible for destroying the Session objects */ -+ monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal, -+ NULL, (GDestroyNotify) session_free); -+ monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal); -+ -+ -+ error = NULL; -+ if (!ensure_database (monitor, &error)) { -+ /* Ignore the first error if the CK database isn't found yet */ -+ if (g_error_matches (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) { -+ nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message); -+ } -+ g_error_free (error); -+ } -+ -+ error = NULL; -+ file = g_file_new_for_path (CKDB_PATH); -+ monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); -+ g_object_unref (file); -+ if (monitor->database_monitor == NULL) { -+ nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } else { -+ g_signal_connect (monitor->database_monitor, -+ "changed", -+ G_CALLBACK (on_file_monitor_changed), -+ monitor); -+ } -+ } - } - - static void -@@ -158,6 +422,12 @@ - g_source_unref (monitor->sd_source); - } - -+ if (monitor->database_monitor != NULL) -+ g_object_unref (monitor->database_monitor); -+ -+ if (monitor->database != NULL) -+ free_database (monitor); -+ - if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL) - G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object); - } -@@ -206,15 +476,36 @@ - uid_t *out_uid, - GError **error) - { -- uid_t uid; -+ if (monitor->sd_source != NULL) { -+ uid_t uid; - -- if (!nm_session_user_to_uid (username, &uid, error)) -- return FALSE; -+ if (!nm_session_user_to_uid (username, &uid, error)) -+ return FALSE; - -- if (out_uid) -- *out_uid = uid; -+ if (out_uid) -+ *out_uid = uid; - -- return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); -+ return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); -+ } else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for user '%s'", -+ username); -+ return FALSE; -+ } -+ -+ if (out_uid) -+ *out_uid = s->uid; -+ return TRUE; -+ } - } - - gboolean -@@ -222,12 +513,31 @@ - const char *username, - GError **error) - { -- uid_t uid; -+ if (monitor->sd_source != NULL) { -+ uid_t uid; - -- if (!nm_session_user_to_uid (username, &uid, error)) -- return FALSE; -+ if (!nm_session_user_to_uid (username, &uid, error)) -+ return FALSE; -+ -+ return nm_session_monitor_uid_active (monitor, uid, error); -+ } else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for user '%s'", -+ username); -+ return FALSE; -+ } - -- return nm_session_monitor_uid_active (monitor, uid, error); -+ return s->active; -+ } - } - - gboolean -@@ -236,10 +546,31 @@ - const char **out_user, - GError **error) - { -- if (!nm_session_uid_to_user (uid, out_user, error)) -- return FALSE; -+ if (monitor->sd_source != NULL) { -+ if (!nm_session_uid_to_user (uid, out_user, error)) -+ return FALSE; - -- return sd_uid_get_sessions (uid, FALSE, NULL) > 0; -+ return sd_uid_get_sessions (uid, FALSE, NULL) > 0; -+ } else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for uid %d", -+ uid); -+ return FALSE; -+ } -+ -+ if (out_user) -+ *out_user = s->user; -+ return TRUE; -+ } - } - - gboolean -@@ -247,5 +578,24 @@ - uid_t uid, - GError **error) - { -- return sd_uid_get_sessions (uid, TRUE, NULL) > 0; -+ if (monitor->sd_source != NULL) -+ return sd_uid_get_sessions (uid, TRUE, NULL) > 0; -+ else { -+ Session *s; -+ -+ if (!ensure_database (monitor, error)) -+ return FALSE; -+ -+ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); -+ if (!s) { -+ g_set_error (error, -+ NM_SESSION_MONITOR_ERROR, -+ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, -+ "No session found for uid '%d'", -+ uid); -+ return FALSE; -+ } -+ -+ return s->active; -+ } - } diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD deleted file mode 100644 index eafd29181..000000000 --- a/extra/nicotine/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168342 2012-10-09 00:13:39Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: Andrew Wright <andreww@photism.org> - -pkgname=nicotine -pkgver=1.2.16 -pkgrel=4 -pkgdesc="Soulseek music-sharing client, written in python" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/nicotine-plus/" -license=('GPL') -depends=('pygtk' 'mutagen') -optdepends=('python2-geoip: to enable Geographical blocker') -source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2) -md5sums=('ac7433c21ef619a37e079a7ae68da94a') - -build() { - cd "${srcdir}/${pkgname}+-${pkgver}" - sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476 - sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ - -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py - - python2 setup.py install --root="${pkgdir}" - cd trayicon - python2 autogen.py - make -} - -package() { - cd "${srcdir}/${pkgname}+-${pkgver}/trayicon" - make DESTDIR="${pkgdir}" install - ln -s nicotine.py "${pkgdir}/usr/bin/nicotine" -} diff --git a/extra/nmap/kdesu.patch b/extra/nmap/kdesu.patch deleted file mode 100644 index daed631d6..000000000 --- a/extra/nmap/kdesu.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur old/zenmap/install_scripts/unix/su-to-zenmap.sh new/zenmap/install_scripts/unix/su-to-zenmap.sh ---- old/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:34:05.863827354 +1000 -+++ new/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:35:53.872952226 +1000 -@@ -40,8 +40,8 @@ - fi - case $SU_TO_ROOT_X in - gksu) gksu -u "$PRIV" "$COMMAND";; -- kdesu) kdesu -u "$PRIV" "$COMMAND";; -- kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";; -+ kdesu) kdesu -u "$PRIV" -c "$COMMAND";; -+ kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";; - ktsuss) ktsuss -u "$PRIV" "$COMMAND";; - # As a last resort, open a new xterm use sudo/su - sdterm) xterm -e "sudo -u $PRIV $COMMAND";; diff --git a/extra/normalize/PKGBUILD b/extra/normalize/PKGBUILD deleted file mode 100644 index 9733d387a..000000000 --- a/extra/normalize/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 149021 2012-02-05 14:18:12Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=normalize -pkgver=0.7.7 -pkgrel=6 -pkgdesc="A tool for adjusting the volume of WAV files to a standard level" -arch=('i686' 'x86_64' 'mips64el') -url="http://normalize.nongnu.org" -license=('GPL') -depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123') -makedepends=('pkg-config' 'intltool') -source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'normalize-0.7.7-audiofile-pkgconfig.patch' - 'normalize-0.7.7-m4.patch') -md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436' - '77d565e29bef11837e80347adfd42b58' - '0b4bca7bf183275b9f939576ebad4233') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/normalize-0.7.7-audiofile-pkgconfig.patch" - patch -Np0 -i "${srcdir}/normalize-0.7.7-m4.patch" - - touch AUTHORS NEWS ChangeLog - libtoolize --force --copy - aclocal -I m4 - autoreconf - automake --add-missing - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --with-audiofile \ - --with-mad - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch b/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch deleted file mode 100644 index 09f211cdf..000000000 --- a/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch +++ /dev/null @@ -1,55 +0,0 @@ -Use pkgconfig to check for audiofile since the audiofile-config script was -removed from >=audiofile-0.3.0. - ---- normalize-0.7.7/configure.ac.orig -+++ normalize-0.7.7/configure.ac -@@ -248,33 +248,16 @@ - - - dnl *** Stuff for audiofile library *** --dnl v0.2.1 and before have bugs with 24-bit LE files --AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ]) --dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true) -+AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile], -+ [use the audiofile library (default yes)])) - AH_TEMPLATE([USE_AUDIOFILE], - [Define if you want to use the audiofile library.]) --AC_ARG_WITH(audiofile, -- AC_HELP_STRING([--with-audiofile], -- [use the audiofile library (default yes)]), -- [ case "$withval" in -- no) with_audiofile=false ;; -- *) with_audiofile=true ;; -- esac ]) - --use_audiofile=false --if test x$with_audiofile != xfalse; then -- if test x$have_audiofile = xtrue; then -- AC_DEFINE(USE_AUDIOFILE) -- use_audiofile=true --dnl AUDIOFILELIBS="-laudiofile" -- elif test x$with_audiofile = xtrue; then -- AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found]) -- fi --fi --dnl AC_SUBST(AUDIOFILELIBS) --test x$use_audiofile = xfalse && AUDIOFILE_LIBS= --test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS= --AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue) -+AS_IF([test "x$with_audiofile" = "xyes"], [ -+ PKG_CHECK_MODULES([AUDIOFILE], [audiofile]) -+ AC_DEFINE(USE_AUDIOFILE) -+]) -+AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes) - - - dnl *** Stuff for mad mpeg audio decoder library *** -@@ -330,7 +313,7 @@ - - echo - echo "Configuration:" --echo " audiofile library: $use_audiofile" -+echo " audiofile library: $with_audiofile" - echo " mpeg audio support: $use_mad" - echo " xmms volume adjust plugin: $use_xmms" - echo diff --git a/extra/normalize/normalize-0.7.7-m4.patch b/extra/normalize/normalize-0.7.7-m4.patch deleted file mode 100644 index 2aeb3e451..000000000 --- a/extra/normalize/normalize-0.7.7-m4.patch +++ /dev/null @@ -1,553 +0,0 @@ ---- m4/extra.m4 -+++ m4/extra.m4 -@@ -0,0 +1,550 @@ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005 Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+# Configure paths for GLIB -+# Owen Taylor 97-11-3 -+ -+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -+dnl gthread is specified in MODULES, pass to glib-config -+dnl -+AC_DEFUN(AM_PATH_GLIB, -+[dnl -+dnl Get the cflags and libraries from the glib-config script -+dnl -+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], -+ glib_config_prefix="$withval", glib_config_prefix="") -+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], -+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], -+ , enable_glibtest=yes) -+ -+ if test x$glib_config_exec_prefix != x ; then -+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" -+ if test x${GLIB_CONFIG+set} != xset ; then -+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config -+ fi -+ fi -+ if test x$glib_config_prefix != x ; then -+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix" -+ if test x${GLIB_CONFIG+set} != xset ; then -+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config -+ fi -+ fi -+ -+ for module in . $4 -+ do -+ case "$module" in -+ gmodule) -+ glib_config_args="$glib_config_args gmodule" -+ ;; -+ gthread) -+ glib_config_args="$glib_config_args gthread" -+ ;; -+ esac -+ done -+ -+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no) -+ min_glib_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -+ no_glib="" -+ if test "$GLIB_CONFIG" = "no" ; then -+ no_glib=yes -+ else -+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` -+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` -+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+dnl -+dnl Now check if the installed GLIB is sufficiently new. (Also sanity -+dnl checks the results of glib-config to some extent -+dnl -+ rm -f conf.glibtest -+ AC_TRY_RUN([ -+#include <glib.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.glibtest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } -+ -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If glib-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); -+ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } -+ else -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the glib-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); -+ printf("*** correct copy of glib-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GLIB_CONFIG" = "no" ; then -+ echo "*** The glib-config script installed by GLIB could not be found" -+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GLIB_CONFIG environment variable to the" -+ echo "*** full path to glib-config." -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include <glib.h> -+#include <stdio.h> -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GLIB or finding the wrong" -+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed" -+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you" -+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ rm -f conf.glibtest -+]) -+ -+# Configure paths for GTK+ -+# Owen Taylor 97-11-3 -+ -+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN(AM_PATH_GTK, -+[dnl -+dnl Get the cflags and libraries from the gtk-config script -+dnl -+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], -+ gtk_config_prefix="$withval", gtk_config_prefix="") -+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], -+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], -+ , enable_gtktest=yes) -+ -+ for module in . $4 -+ do -+ case "$module" in -+ gthread) -+ gtk_config_args="$gtk_config_args gthread" -+ ;; -+ esac -+ done -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -+ min_gtk_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ no_gtk="" -+ if test "$GTK_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+dnl -+dnl Now check if the installed GTK is sufficiently new. (Also sanity -+dnl checks the results of gtk-config to some extent -+dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include <gtk/gtk.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+#endif /* defined (GTK_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GTK_CONFIG" = "no" ; then -+ echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GTK_CONFIG environment variable to the" -+ echo "*** full path to gtk-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ AC_TRY_LINK([ -+#include <gtk/gtk.h> -+#include <stdio.h> -+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) -+ -+# CFLAGS and library paths for XMMS -+# written 15 December 1999 by Ben Gertzfield <che@debian.org> -+ -+dnl Usage: -+dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl -+dnl Example: -+dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***])) -+dnl -+dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, -+dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, -+dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR, -+dnl and XMMS_VERSION for your plugin pleasure. -+dnl -+ -+dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]]) -+AC_DEFUN(XMMS_TEST_VERSION, [ -+ -+# Determine which version number is greater. Prints 2 to stdout if -+# the second number is greater, 1 if the first number is greater, -+# 0 if the numbers are equal. -+ -+# Written 15 December 1999 by Ben Gertzfield <che@debian.org> -+# Revised 15 December 1999 by Jim Monty <monty@primenet.com> -+ -+ AC_PROG_AWK -+ xmms_got_version=[` $AWK ' \ -+BEGIN { \ -+ print vercmp(ARGV[1], ARGV[2]); \ -+} \ -+ \ -+function vercmp(ver1, ver2, ver1arr, ver2arr, \ -+ ver1len, ver2len, \ -+ ver1int, ver2int, len, i, p) { \ -+ \ -+ ver1len = split(ver1, ver1arr, /\./); \ -+ ver2len = split(ver2, ver2arr, /\./); \ -+ \ -+ len = ver1len > ver2len ? ver1len : ver2len; \ -+ \ -+ for (i = 1; i <= len; i++) { \ -+ p = 1000 ^ (len - i); \ -+ ver1int += ver1arr[i] * p; \ -+ ver2int += ver2arr[i] * p; \ -+ } \ -+ \ -+ if (ver1int < ver2int) \ -+ return 2; \ -+ else if (ver1int > ver2int) \ -+ return 1; \ -+ else \ -+ return 0; \ -+}' $1 $2`] -+ -+ if test $xmms_got_version -eq 2; then # failure -+ ifelse([$4], , :, $4) -+ else # success! -+ ifelse([$3], , :, $3) -+ fi -+]) -+ -+AC_DEFUN(AM_PATH_XMMS, -+[ -+AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], -+ xmms_config_prefix="$withval", xmms_config_prefix="") -+AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], -+ xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") -+ -+if test x$xmms_config_exec_prefix != x; then -+ xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix" -+ if test x${XMMS_CONFIG+set} != xset; then -+ XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config -+ fi -+fi -+ -+if test x$xmms_config_prefix != x; then -+ xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix" -+ if test x${XMMS_CONFIG+set} != xset; then -+ XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config -+ fi -+fi -+ -+AC_PATH_PROG(XMMS_CONFIG, xmms-config, no) -+min_xmms_version=ifelse([$1], ,0.9.5.1, $1) -+ -+if test "$XMMS_CONFIG" = "no"; then -+ no_xmms=yes -+else -+ XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags` -+ XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs` -+ XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version` -+ XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir` -+ XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir` -+ XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \ -+ --visualization-plugin-dir` -+ XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir` -+ XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir` -+ XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir` -+ XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir` -+ -+ XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version) -+fi -+ -+AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version) -+ -+if test "x$no_xmms" = x; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+else -+ AC_MSG_RESULT(no) -+ -+ if test "$XMMS_CONFIG" = "no" ; then -+ echo "*** The xmms-config script installed by XMMS could not be found." -+ echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the XMMS_CONFIG environment variable to the" -+ echo "*** full path to xmms-config." -+ else -+ if test "$no_xmms" = "version"; then -+ echo "*** An old version of XMMS, $XMMS_VERSION, was found." -+ echo "*** You need a version of XMMS newer than $min_xmms_version." -+ echo "*** The latest version of XMMS is always available from" -+ echo "*** http://www.xmms.org/" -+ echo "***" -+ -+ echo "*** If you have already installed a sufficiently new version, this error" -+ echo "*** probably means that the wrong copy of the xmms-config shell script is" -+ echo "*** being found. The easiest way to fix this is to remove the old version" -+ echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the" -+ echo "*** correct copy of xmms-config. (In this case, you will have to" -+ echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" -+ echo "*** so that the correct libraries are found at run-time)" -+ fi -+ fi -+ XMMS_CFLAGS="" -+ XMMS_LIBS="" -+ ifelse([$3], , :, [$3]) -+fi -+AC_SUBST(XMMS_CFLAGS) -+AC_SUBST(XMMS_LIBS) -+AC_SUBST(XMMS_VERSION) -+AC_SUBST(XMMS_DATA_DIR) -+AC_SUBST(XMMS_PLUGIN_DIR) -+AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR) -+AC_SUBST(XMMS_INPUT_PLUGIN_DIR) -+AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR) -+AC_SUBST(XMMS_GENERAL_PLUGIN_DIR) -+AC_SUBST(XMMS_EFFECT_PLUGIN_DIR) -+]) diff --git a/extra/nss/nss-no-rpath.patch b/extra/nss/nss-no-rpath.patch deleted file mode 100644 index 35ea57315..000000000 --- a/extra/nss/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/extra/ntp/logrotate.d b/extra/ntp/logrotate.d deleted file mode 100644 index 8a9f066c3..000000000 --- a/extra/ntp/logrotate.d +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/ntp.log { - missingok - copytruncate -} diff --git a/extra/nvidia-304xx-lts/PKGBUILD b/extra/nvidia-304xx-lts/PKGBUILD deleted file mode 100644 index 9794500d9..000000000 --- a/extra/nvidia-304xx-lts/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 172304 2012-12-02 11:03:10Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=nvidia-304xx-lts -pkgver=304.64 -_extramodules=extramodules-3.0-lts -pkgrel=1 -pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux-lts>=3.0.0' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-lts-headers>=3.0.0') -conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts') -provides=('nvidia-304xx') -license=('custom') -install=nvidia-304xx-lts.install -options=(!strip) -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('6964415cf648a5f4f38117b168369de2') -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('76007ed4b72afd334e26377b646f5f7e') -fi - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}/kernel" - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf" - echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" -} diff --git a/extra/nvidia-304xx-lts/nvidia-304xx-lts.install b/extra/nvidia-304xx-lts/nvidia-304xx-lts.install deleted file mode 100644 index d1f5eccaa..000000000 --- a/extra/nvidia-304xx-lts/nvidia-304xx-lts.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/extra/nvidia-lts/PKGBUILD b/extra/nvidia-lts/PKGBUILD deleted file mode 100644 index 606cabfa8..000000000 --- a/extra/nvidia-lts/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 171130 2012-11-16 19:30:17Z ibiru $ -# Maintainer: Eric BĂ©langer <eric@archlinux.org> - -pkgname=nvidia-lts -pkgver=310.19 -_extramodules=extramodules-3.0-lts -pkgrel=1 -pkgdesc="NVIDIA drivers for linux-lts" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux-lts>=3.0.0' "nvidia-utils=$pkgver") -makedepends=('linux-lts-headers>=3.0.0') -provides=('nvidia') -license=('custom') -install=nvidia-lts.install -options=(!strip) -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('2adbdd38540b3a8955714760e05f575d') -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('0ba08d32852e442ebba5ba22c7abed36') -fi - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${srcdir}" - sh ${_pkg}.run --extract-only - cd "${_pkg}/kernel" - make SYSSRC=/usr/lib/modules/${_kernver}/build module -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/kernel/drivers/video/nvidia.ko" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/kernel/drivers/video/nvidia.ko" - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-lts.conf" - echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-lts.conf" - install -D -m644 "${srcdir}/${_pkg}/LICENSE" "${pkgdir}/usr/share/licenses/nvidia-lts/LICENSE" -} diff --git a/extra/nvidia-lts/nvidia-lts.install b/extra/nvidia-lts/nvidia-lts.install deleted file mode 100644 index d1f5eccaa..000000000 --- a/extra/nvidia-lts/nvidia-lts.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/extra/nvidia-utils/PKGBUILD b/extra/nvidia-utils/PKGBUILD deleted file mode 100644 index 073fb8a9b..000000000 --- a/extra/nvidia-utils/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# $Id: PKGBUILD 171131 2012-11-16 19:33:17Z ibiru $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> -# Contributor: James Rayner <iphitus@gmail.com> -pkgbase=nvidia-utils -pkgname=('nvidia-utils' 'opencl-nvidia') -pkgver=310.19 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -license=('custom') -options=('!strip') - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('2adbdd38540b3a8955714760e05f575d') -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('0ba08d32852e442ebba5ba22c7abed36') -fi - -create_links() { - # create soname links - while read -d '' _lib; do - _soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')" - [[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}" - [[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" "${_soname/.[0-9]*/}" - done < <(find "${pkgdir}" -type f -name '*.so*' -print0) -} - -build() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only -} - -package_opencl-nvidia() { - pkgdesc="OpenCL implemention for NVIDIA" - depends=('libcl' 'zlib') - optdepends=('opencl-headers: headers necessary for OpenCL development') - cd "${srcdir}/${_pkg}" - - # OpenCL - install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" - install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" - install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" - - create_links -} - -package_nvidia-utils() { - pkgdesc="NVIDIA drivers utilities and libraries." - depends=('xorg-server' 'libxvmc') - optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig' - 'opencl-nvidia: OpenCL support') - conflicts=('libgl') - provides=('libgl') - cd "${srcdir}/${_pkg}" - - # X driver - install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" - # GLX extension module for X - install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise - # OpenGL library - install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" - # OpenGL core library - install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" - # VDPAU - install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" - # nvidia-tls library - install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" - install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" - - install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" - # CUDA - install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" - install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}" - - # nvidia-xconfig - install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig" - install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz" - # nvidia-settings - install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" - install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" - install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" - install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" - sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" - # nvidia-bug-report - install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh" - # nvidia-smi - install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi" - install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz" - - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE" - ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils" - install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README" - install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog" - ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils" - - create_links -} diff --git a/extra/nvidia/PKGBUILD b/extra/nvidia/PKGBUILD deleted file mode 100644 index 574df67df..000000000 --- a/extra/nvidia/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 171241 2012-11-16 21:41:41Z ibiru $ -# Maintainer : Thomas Baechler <thomas@archlinux.org> - -pkgname=nvidia -pkgver=310.19 -_extramodules=extramodules-3.6-ARCH -pkgrel=2 -pkgdesc="NVIDIA drivers for linux." -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.6' 'linux-headers<3.7') -conflicts=('nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) - -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('2adbdd38540b3a8955714760e05f575d') -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('0ba08d32852e442ebba5ba22c7abed36') -fi - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}/kernel" - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package() { - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" -} diff --git a/extra/nvidia/nvidia.install b/extra/nvidia/nvidia.install deleted file mode 100644 index c2c292ae9..000000000 --- a/extra/nvidia/nvidia.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then - echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' - fi -} - -post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/extra/nx/nx-x11.ld.so.conf.d b/extra/nx/nx-x11.ld.so.conf.d deleted file mode 100644 index 5d15cb6e2..000000000 --- a/extra/nx/nx-x11.ld.so.conf.d +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/nx/ diff --git a/extra/nxclient/PKGBUILD b/extra/nxclient/PKGBUILD deleted file mode 100644 index e11b0d8a8..000000000 --- a/extra/nxclient/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 162204 2012-06-23 13:26:36Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nxclient -pkgver=3.5.0.7 -pkgrel=3 -pkgdesc="Nomachine's closed source client for NX servers" -arch=('i686' 'x86_64') -url="http://nomachine.com" -license=('custom:nomachine') -depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-common>=3.5.0-4.1' 'desktop-file-utils') -makedepends=('rpmextract' 'chrpath') -optdepends=('cups: for printing support') -[ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm nomachine.key nxclient.wrapper) -[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44') -[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key nxclient.wrapper) -[ "$CARCH" = "i686" ] && md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44') -install=nxclient.install - -build() { - cd ${srcdir} - rpmextract.sh *.rpm - sed -i -e 's:/usr/NX:/usr/lib/nx:g' etc/profile.d/nx.* - sed -i -e 's:/usr/NX:/usr/lib/nx:g' ${srcdir}/usr/NX/share/applnk/network/*.desktop -} - -package() { - # profile files - install -D -m 755 ${srcdir}/etc/profile.d/nx.sh ${pkgdir}/etc/profile.d/nx.sh - install -D -m 755 ${srcdir}/etc/profile.d/nx.csh ${pkgdir}/etc/profile.d/nx.csh - # menu entries - install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop ${pkgdir}/usr/share/applications/nxclient-wizard.desktop - install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop ${pkgdir}/usr/share/applications/nxclient.desktop - install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop ${pkgdir}/usr/share/applications/nxclient-admin.desktop - rm -r ${srcdir}/usr/NX/share/applnk - - # remove libs that come in system and are provided by libxcomp/nx-x11 - rm ${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*} - - # provided by nx-common - rm ${srcdir}/usr/NX/bin/nxssh - rm ${srcdir}/usr/NX/bin/nxesd # esd support has been fully dropped - - # provide default key file later - rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key - - # move files - install -dm755 ${pkgdir}/usr/{bin,lib/nx} - cp -aR ${srcdir}/usr/NX/* ${pkgdir}/usr/lib/nx - # add symlinks - cd ${pkgdir}/usr/bin - ln -sv /usr/lib/nx/bin/{nxclient,nxkill,nxprint,nxservice} . - # install wrapper including Linker fix - mv ${pkgdir}/usr/lib/nx/bin/nxclient ${pkgdir}/usr/lib/nx/bin/nxclient_orig - install -m 755 ${srcdir}/nxclient.wrapper ${pkgdir}/usr/lib/nx/bin/nxclient - - # add default key file - install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/nx/share/keys/server.id_dsa.key - - # add license file - mkdir -p ${pkgdir}/usr/share/licenses/nxclient - mv ${pkgdir}/usr/lib/nx/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE - - # some cleanup - rm -rf ${pkgdir}/usr/lib/nx/share/{documents,cups} - - # fix insecure rpath - chrpath -d "$pkgdir/usr/lib/nx/bin/nxclient_orig" -} diff --git a/extra/nxclient/nomachine.key b/extra/nxclient/nomachine.key deleted file mode 100644 index e6eadbc15..000000000 --- a/extra/nxclient/nomachine.key +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBuwIBAAKBgQCXv9AzQXjxvXWC1qu3CdEqskX9YomTfyG865gb4D02ZwWuRU/9 -C3I9/bEWLdaWgJYXIcFJsMCIkmWjjeSZyTmeoypI1iLifTHUxn3b7WNWi8AzKcVF -aBsBGiljsop9NiD1mEpA0G+nHHrhvTXz7pUvYrsrXcdMyM6rxqn77nbbnwIVALCi -xFdHZADw5KAVZI7r6QatEkqLAoGBAI4L1TQGFkq5xQ/nIIciW8setAAIyrcWdK/z -5/ZPeELdq70KDJxoLf81NL/8uIc4PoNyTRJjtT3R4f8Az1TsZWeh2+ReCEJxDWgG -fbk2YhRqoQTtXPFsI4qvzBWct42WonWqyyb1bPBHk+JmXFscJu5yFQ+JUVNsENpY -+Gkz3HqTAoGANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfa -QU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3 -mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8CFDIm1xRf -8xAPsSKs6yZ6j1FNklfu ------END DSA PRIVATE KEY----- diff --git a/extra/nxclient/nxclient.install b/extra/nxclient/nxclient.install deleted file mode 100644 index 9edb5939b..000000000 --- a/extra/nxclient/nxclient.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - update-desktop-database -q - - echo "For correct setup please take a look at the wiki:" - echo "http://wiki.archlinux.org/index.php/FreeNX" - - -} - -post_upgrade() { - update-desktop-database -q - - if [ "`vercmp $2 3.5.0.7-1.1`" -lt 0 ]; then - # important upgrade notice - echo "because file location of the default key has been moved" - echo "you may need to reconfigure your connection and settings" - fi -} - -post_remove() { - update-desktop-database -q -} diff --git a/extra/nxclient/nxclient.wrapper b/extra/nxclient/nxclient.wrapper deleted file mode 100644 index ab9cc2532..000000000 --- a/extra/nxclient/nxclient.wrapper +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -LD_LIBRARY_PATH=/usr/lib/nx/lib:$LD_LIBRARY_PATH /usr/lib/nx/bin/nxclient_orig $@ diff --git a/extra/ocaml/fix-ocaml-binutils-2.21.patch b/extra/ocaml/fix-ocaml-binutils-2.21.patch deleted file mode 100644 index fa7664cec..000000000 --- a/extra/ocaml/fix-ocaml-binutils-2.21.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Stephane Glondu <steph@glondu.net> -Date: Tue, 8 Mar 2011 21:17:40 +0100 -Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: http://caml.inria.fr/mantis/view.php?id=5237 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 -Authors: Eric Cooper, spiralvoice -Reviewed-by: StĂ©phane Glondu <steph@glondu.net> ---- - asmcomp/amd64/emit.mlp | 13 +++++++------ - asmcomp/i386/emit.mlp | 6 +++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp -index 4a3f844..525c6e6 100644 ---- a/asmcomp/amd64/emit.mlp -+++ b/asmcomp/amd64/emit.mlp -@@ -679,17 +679,18 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -+ begin match Config.system with -+ "linux" | "gnu" -> -+ ` .type {emit_symbol fundecl.fun_name},@function\n`; -+ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -+ | _ -> () -+ end; - if !float_constants <> [] then begin - if macosx - then ` .literal8\n` - else ` .section .rodata.cst8,\"a\",@progbits\n`; - List.iter emit_float_constant !float_constants -- end; -- match Config.system with -- "linux" | "gnu" -> -- ` .type {emit_symbol fundecl.fun_name},@function\n`; -- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ end - - (* Emission of data *) - -diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp -index 2992f29..0b1252c 100644 ---- a/asmcomp/i386/emit.mlp -+++ b/asmcomp/i386/emit.mlp -@@ -905,12 +905,12 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -- List.iter emit_float_constant !float_constants; -- match Config.system with -+ begin match Config.system with - "linux_elf" | "bsd_elf" | "gnu" -> - ` .type {emit_symbol fundecl.fun_name},@function\n`; - ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ | _ -> () end; -+ List.iter emit_float_constant !float_constants - - - (* Emission of data *) --- diff --git a/extra/octave/buildfix.diff b/extra/octave/buildfix.diff deleted file mode 100644 index 8288b7bec..000000000 --- a/extra/octave/buildfix.diff +++ /dev/null @@ -1,85 +0,0 @@ ---- libgnu/stdio.in.h.origs 2012-05-24 12:46:13.000000000 -0600 -+++ libgnu/stdio.in.h 2012-05-24 16:29:54.813734894 -0600 -@@ -1,12 +1,10 @@ --/* -*- buffer-read-only: t -*- vi: set ro: */ --/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ - /* A GNU-like <stdio.h>. - - Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc. - - 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 3, or (at your option) -+ the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, -@@ -15,8 +13,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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ along with this program; if not, see <http://www.gnu.org/licenses/>. */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -55,7 +52,8 @@ - #include <stddef.h> - - /* Get off_t and ssize_t. Needed on many systems, including glibc 2.8 -- and eglibc 2.11.2. */ -+ and eglibc 2.11.2. -+ May also define off_t to a 64-bit type on native Windows. */ - #include <sys/types.h> - - /* The __attribute__ feature is available in gcc versions 2.5 and later. -@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose); - #elif defined GNULIB_POSIXCHECK - # undef pclose - # if HAVE_RAW_DECL_PCLOSE --_GL_WARN_ON_USE (pclose, "popen is unportable - " -+_GL_WARN_ON_USE (pclose, "pclose is unportable - " - "use gnulib module pclose for more portability"); - # endif - #endif -@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/extra/octave/curlfix.patch b/extra/octave/curlfix.patch deleted file mode 100644 index 26f3d92f9..000000000 --- a/extra/octave/curlfix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DLD-FUNCTIONS/urlwrite.cc.old 2011-07-02 16:39:22.466603778 +0200 -+++ src/DLD-FUNCTIONS/urlwrite.cc 2011-07-02 16:39:54.543269859 +0200 -@@ -52,7 +52,6 @@ - - #include <curl/curl.h> - #include <curl/curlver.h> --#include <curl/types.h> - #include <curl/easy.h> - - static int diff --git a/extra/octave/imread.patch b/extra/octave/imread.patch deleted file mode 100644 index 4a7b73ea0..000000000 --- a/extra/octave/imread.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/DLD-FUNCTIONS/__magick_read__.cc.orig 2010-03-06 08:05:25.000000000 +0000 -+++ src/DLD-FUNCTIONS/__magick_read__.cc 2009-08-25 09:26:01.000000000 +0100 -@@ -30,6 +30,7 @@ - #include "defun-dld.h" - #include "error.h" - #include "ov-struct.h" -+#include "oct-env.h" - - #ifdef HAVE_MAGICK - -@@ -359,6 +358,18 @@ - - #ifdef HAVE_MAGICK - -+ static bool initialized = false; -+ -+ if (! initialized) -+ { -+ std::string program_name = octave_env::get_program_invocation_name (); -+ -+ Magick::InitializeMagick (program_name.c_str ()); -+ -+ initialized = true; -+ } -+ -+ - if (args.length () > 2 || args.length () < 1 || ! args(0).is_string () - || nargout > 3) - { diff --git a/extra/octave/octave-3.4.0-gcc46.patch b/extra/octave/octave-3.4.0-gcc46.patch deleted file mode 100644 index c174204ac..000000000 --- a/extra/octave/octave-3.4.0-gcc46.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h ---- octave-3.4.0/liboctave/oct-alloc.h.gcc46 2011-02-08 03:00:51.000000000 -0700 -+++ octave-3.4.0/liboctave/oct-alloc.h 2011-02-08 09:41:23.984081687 -0700 -@@ -23,6 +23,8 @@ along with Octave; see the file COPYING. - #if !defined (octave_oct_alloc_h) - #define octave_oct_alloc_h 1 - -+#include <cstddef> -+ - class - OCTAVE_API - octave_allocator -diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc ---- octave-3.4.0/src/pr-output.cc.gcc46 2011-02-08 03:00:52.000000000 -0700 -+++ octave-3.4.0/src/pr-output.cc 2011-02-08 09:55:16.149662744 -0700 -@@ -3024,7 +3024,7 @@ abs (T x) - } - - #define INSTANTIATE_ABS(T) \ -- template /* static */ inline T abs (T) -+ template /* static */ T abs (T) - - INSTANTIATE_ABS(signed char); - INSTANTIATE_ABS(short); diff --git a/extra/openmpi/openmpi-hostfile.patch b/extra/openmpi/openmpi-hostfile.patch deleted file mode 100644 index f6377674b..000000000 --- a/extra/openmpi/openmpi-hostfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c ---- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile 2012-04-24 13:18:21.000000000 -0600 -+++ openmpi-1.6/orte/runtime/orte_mca_params.c 2012-05-15 16:35:24.769565442 -0600 -@@ -225,7 +225,7 @@ int orte_register_params(void) - false, false, 1000, &orte_timeout_usec_per_proc); - - /* default hostfile */ -- asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix); -+ asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir); - mca_base_param_reg_string_name("orte", "default_hostfile", - "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)", - false, false, orte_default_hostfile, &orte_default_hostfile); diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD deleted file mode 100644 index 41b02b3be..000000000 --- a/extra/oprofile/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 169713 2012-10-27 01:52:54Z stephane $ -# Maintainer : Aaron Griffin <aaron@archlinux.org> - -pkgname=oprofile -pkgver=0.9.8 -pkgrel=1 -pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" -arch=('i686' 'x86_64' 'mips64el') -url="http://oprofile.sourceforge.net" -license=('GPL') -depends=('popt' 'gcc-libs' 'zlib' 'sh') -makedepends=('qt') -optdepends=('qt: for oprof_start gui') -options=('!libtool') -install=oprofile.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-kernel-support --with-x --enable-gui=qt4 - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -d "$pkgdir/var/lib/oprofile" - -# installing development libraries and headers - FS#20089 - install -d "$pkgdir/usr/include/oprofile" - install -m644 config.h libop/op_*.h libregex/op_*.h libdb/odb.h \ - libpp/{locate_images.h,image_errors.h} libutil/op_*.h \ - libutil++/{op_*.h,bfd_support.h,utility.h,cached_value.h} "$pkgdir/usr/include/oprofile" - install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/" - install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a" - install -m644 libutil/libutil.a "$pkgdir/usr/lib/liboputil.a" - install -m644 libutil++/libutil++.a "$pkgdir/usr/lib/liboputil++.a" -} diff --git a/extra/oprofile/oprofile.install b/extra/oprofile/oprofile.install deleted file mode 100644 index 5cd3e7e22..000000000 --- a/extra/oprofile/oprofile.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install(){ - groupadd -g 492 oprofile &>/dev/null - useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null -} - -post_upgrade(){ - getent group oprofile >/dev/null 2>&1 || groupadd -g 492 oprofile &>/dev/null - getent passwd oprofile >/dev/null 2>&1 || useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null - if [ "$(vercmp $2 0.9.7-2)" -lt 0 ] ; then - usermod -d /var/lib/oprofile oprofile - fi -} - -post_remove(){ - if getent passwd oprofile >/dev/null 2>&1; then - userdel oprofile - fi - if getent group oprofile >/dev/null 2>&1; then - groupdel oprofile - fi -} diff --git a/extra/ortp/libzrtpcpp2.patch b/extra/ortp/libzrtpcpp2.patch deleted file mode 100644 index c433c314d..000000000 --- a/extra/ortp/libzrtpcpp2.patch +++ /dev/null @@ -1,69 +0,0 @@ -Only in ortp-0.20.0.my/build: Makefile -Only in ortp-0.20.0.my/build/win32native: Makefile -Only in ortp-0.20.0.my/build/wince: Makefile -Only in ortp-0.20.0.my/build/winmob: Makefile -Only in ortp-0.20.0.my: config.log -Only in ortp-0.20.0.my: config.status -Only in ortp-0.20.0.my: doc -Only in ortp-0.20.0.my/include: Makefile -Only in ortp-0.20.0.my/include/ortp: Makefile -Only in ortp-0.20.0.my: libtool -Only in ortp-0.20.0.my: Makefile -Only in ortp-0.20.0.my: ortp-config.h -Only in ortp-0.20.0.my: ortp.defs -Only in ortp-0.20.0.my: ortp.pc -Only in ortp-0.20.0.my/src: avprofile.lo -Only in ortp-0.20.0.my/src: b64.lo -Only in ortp-0.20.0.my/src: .deps -Only in ortp-0.20.0.my/src: event.lo -Only in ortp-0.20.0.my/src: jitterctl.lo -Only in ortp-0.20.0.my/src: libortp.la -Only in ortp-0.20.0.my/src: .libs -Only in ortp-0.20.0.my/src: Makefile -Only in ortp-0.20.0.my/src: netsim.lo -Only in ortp-0.20.0.my/src: ortp.lo -Only in ortp-0.20.0.my/src: ortp_srtp.lo -Only in ortp-0.20.0.my/src: payloadtype.lo -Only in ortp-0.20.0.my/src: port.lo -Only in ortp-0.20.0.my/src: posixtimer.lo -Only in ortp-0.20.0.my/src: rtcp.lo -Only in ortp-0.20.0.my/src: rtcpparse.lo -Only in ortp-0.20.0.my/src: rtpparse.lo -Only in ortp-0.20.0.my/src: rtpsession_inet.lo -Only in ortp-0.20.0.my/src: rtpsession.lo -Only in ortp-0.20.0.my/src: rtpsignaltable.lo -Only in ortp-0.20.0.my/src: rtptimer.lo -Only in ortp-0.20.0.my/src: scheduler.lo -Only in ortp-0.20.0.my/src: sessionset.lo -Only in ortp-0.20.0.my/src: str_utils.lo -Only in ortp-0.20.0.my/src: stun.lo -Only in ortp-0.20.0.my/src: stun_udp.lo -Only in ortp-0.20.0.my/src: telephonyevents.lo -Only in ortp-0.20.0.my/src/tests: .deps -Only in ortp-0.20.0.my/src/tests: Makefile -Only in ortp-0.20.0.my/src/tests/win_receiver: Makefile -Only in ortp-0.20.0.my/src/tests/win_sender: Makefile -Only in ortp-0.20.0.my/src: utils.lo -diff -wbBur ortp-0.20.0/src/zrtp.c ortp-0.20.0.my/src/zrtp.c ---- ortp-0.20.0/src/zrtp.c 2012-02-22 20:19:51.000000000 +0400 -+++ ortp-0.20.0.my/src/zrtp.c 2012-05-16 19:11:25.000000000 +0400 -@@ -837,7 +837,7 @@ - userData->session=s; - ortp_zrtp_configure(context); - ortp_message("Initialized ZRTP context"); -- zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0); -+ zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData); - return ortp_zrtp_configure_context(userData,s,params); - } - -@@ -867,7 +867,7 @@ - userData->session=s; - ortp_zrtp_configure(context); - -- zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0); -+ zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData); - - ortp_message("setting zrtp_setMultiStrParams"); - zrtp_setMultiStrParams(context,multiparams,length); -Only in ortp-0.20.0.my/src: zrtp.lo -Only in ortp-0.20.0.my: stamp-h1 diff --git a/extra/p7zip/7zFM.desktop b/extra/p7zip/7zFM.desktop deleted file mode 100644 index 62b8e8562..000000000 --- a/extra/p7zip/7zFM.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=7-Zip FM -GenericName=7-Zip File Manager -Type=Application -Categories=GTK;Utility;Archiving;Compression; -Terminal=false -Icon=p7zip -Exec=7zFM diff --git a/extra/p7zip/PKGBUILD b/extra/p7zip/PKGBUILD deleted file mode 100644 index 4bb2bb474..000000000 --- a/extra/p7zip/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 143961 2011-11-30 22:27:42Z andrea $ -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: TuxSpirit<tuxspirit@archlinux.fr> 2007/11/17 21:22:36 UTC -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=p7zip -pkgver=9.20.1 -pkgrel=6 -pkgdesc='Command-line version of the 7zip compressed file archiver' -url='http://p7zip.sourceforge.net/' -license=('GPL' 'custom') -arch=('i686' 'x86_64') -depends=('gcc-libs' 'bash') -optdepends=('wxgtk: GUI' - 'desktop-file-utils: desktop entries') -makedepends=('yasm' 'nasm' 'wxgtk') -options=('!makeflags') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2" - '7zFM.desktop') -sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' - 'f2c370d6f1b286b7ce9a2804e22541b755616a40') - -install=install - -build() { - cd "${srcdir}/${pkgname}_${pkgver}" - - [[ $CARCH = x86_64 ]] \ - && cp makefile.linux_amd64_asm makefile.machine \ - || cp makefile.linux_x86_asm_gcc_4.X makefile.machine - - make all4 OPTFLAGS="${CXXFLAGS}" -} - -package() { - cd "${srcdir}/${pkgname}_${pkgver}" - - make install \ - DEST_DIR="${pkgdir}" \ - DEST_HOME="/usr" \ - DEST_MAN="/usr/share/man" - - # Licenses - install -d "${pkgdir}"/usr/share/licenses/p7zip - ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \ - /usr/share/doc/p7zip/DOCS/License.txt \ - /usr/share/doc/p7zip/DOCS/unRarLicense.txt - - # Integration with stuff... - install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png - install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} - cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ - cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ - ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx - - find GUI/help -type d -exec chmod 755 {} \; - cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ - - chmod -R u+w "${pkgdir}/usr" -} diff --git a/extra/p7zip/install b/extra/p7zip/install deleted file mode 100644 index 7f3cc4358..000000000 --- a/extra/p7zip/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true - [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true -} - -post_upgrade() { - post_install -} - - -post_remove() { - post_install -} diff --git a/extra/perl-event/PKGBUILD b/extra/perl-event/PKGBUILD deleted file mode 100644 index 24c4d81d9..000000000 --- a/extra/perl-event/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 160529 2012-06-02 10:27:35Z bluewind $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: François Charette <francois.archlinux.org> - -pkgname=perl-event -_srcname=Event -pkgver=1.20 -pkgrel=2 -pkgdesc="Framework for GUI events" -arch=('i686' 'x86_64' 'mips64el') -license=('PerlArtistic' 'GPL') -url="http://search.cpan.org/dist/${_srcname}/" -depends=('perl') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) -md5sums=('bdbdf6c1b235c3e13c25f3b0491c5134') - -build() { - cd "${srcdir}/${_srcname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_srcname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_srcname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/extra/perl-unicode-string/PKGBUILD b/extra/perl-unicode-string/PKGBUILD deleted file mode 100644 index 0090d429c..000000000 --- a/extra/perl-unicode-string/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 160563 2012-06-02 10:28:34Z bluewind $ -# Maintainer: James Rayner <iphitus@gmail.com> -# Contributor: Andrew Simmons <andrew.simmons@gmail.com> - -pkgname=perl-unicode-string -_realname=Unicode-String -pkgver=2.09 -pkgrel=7 -pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" -arch=('i686' 'x86_64' 'mips64el') -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('553e68e603723bf7c631f8701ab0d678') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # in stall module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/extra/php-apc/svn.patch b/extra/php-apc/svn.patch deleted file mode 100644 index 6a846a752..000000000 --- a/extra/php-apc/svn.patch +++ /dev/null @@ -1,108 +0,0 @@ -Index: apc_string.c -=================================================================== ---- apc_string.c (Revision 325040) -+++ apc_string.c (Revision 326091) -@@ -91,17 +91,18 @@ - p = p->pNext; - } - -- if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength) >= -+ if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1) >= - APCSG(interned_strings_end)) { - /* no memory */ - return NULL; - } - - p = (Bucket *) APCSG(interned_strings_top); -- APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength); -+ APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1); - - p->arKey = (char*)(p+1); - memcpy(p->arKey, arKey, nKeyLength); -+ ((char *)p->arKey)[nKeyLength] = '\0'; - p->nKeyLength = nKeyLength; - p->h = h; - p->pData = &p->pDataPtr; -@@ -154,7 +155,7 @@ - } - - if (ce->name) { -- ce->name = apc_new_interned_string(ce->name, ce->name_length TSRMLS_CC); -+ ce->name = apc_new_interned_string(ce->name, ce->name_length+1 TSRMLS_CC); - } - - q = ce->properties_info.pListHead; -@@ -166,7 +167,7 @@ - } - - if (info->name) { -- info->name = apc_new_interned_string(info->name, info->name_length TSRMLS_CC); -+ info->name = apc_new_interned_string(info->name, info->name_length+1 TSRMLS_CC); - } - - q = q->pListNext; -Index: apc.php -=================================================================== ---- apc.php (Revision 325040) -+++ apc.php (Revision 326091) -@@ -91,7 +91,7 @@ - 'SORT1' => '/^[AHSMCDTZ]$/', // first sort key - 'SORT2' => '/^[DA]$/', // second sort key - 'AGGR' => '/^\d+$/', // aggregation by dir level -- 'SEARCH' => '~^[a-zA-Z0-1/_.-]*$~' // aggregation by dir level -+ 'SEARCH' => '~^[a-zA-Z0-9/_.-]*$~' // aggregation by dir level - ); - - // default cache mode -Index: php_apc.c -=================================================================== ---- php_apc.c (Revision 325040) -+++ php_apc.c (Revision 326091) -@@ -724,6 +724,10 @@ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) { - return; - } -+ -+ if (success) { -+ zval_dtor(success); -+ } - - if(_apc_update(strkey, strkey_len, inc_updater, &args TSRMLS_CC)) { - if(success) ZVAL_TRUE(success); -@@ -747,6 +751,10 @@ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) { - return; - } -+ -+ if (success) { -+ zval_dtor(success); -+ } - - args.step = args.step * -1; - -Index: php_apc.h -=================================================================== ---- php_apc.h (Revision 325040) -+++ php_apc.h (Revision 326091) -@@ -35,7 +35,7 @@ - #include "apc_php.h" - #include "apc_globals.h" - --#define PHP_APC_VERSION "3.1.9" -+#define PHP_APC_VERSION "3.1.10" - - extern zend_module_entry apc_module_entry; - #define apc_module_ptr &apc_module_entry -Index: apc_cache.c -=================================================================== ---- apc_cache.c (Revision 325040) -+++ apc_cache.c (Revision 326091) -@@ -944,7 +944,7 @@ - - len = strlen(filename); - if(APCG(fpstat)==0) { -- if(IS_ABSOLUTE_PATH(filename,len)) { -+ if(IS_ABSOLUTE_PATH(filename,len) || strstr(filename, "://")) { - key->data.fpfile.fullpath = filename; - key->data.fpfile.fullpath_len = len; - key->h = string_nhash_8(key->data.fpfile.fullpath, key->data.fpfile.fullpath_len); diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm deleted file mode 100644 index a8cb9eca9..000000000 --- a/extra/php/rc.d.php-fpm +++ /dev/null @@ -1,144 +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 - - stat_done -} - -case "$1" in - start) - test_config - stat_busy 'Starting php-fpm' - - /usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid - - if [ "$?" != 0 ] ; then - stat_fail - exit 1 - fi - - wait_for_pid created /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 /run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -QUIT `cat /run/php-fpm/php-fpm.pid` - - wait_for_pid removed /run/php-fpm/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 /run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -TERM `cat /run/php-fpm/php-fpm.pid` - - wait_for_pid removed /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 /run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR2 `cat /run/php-fpm/php-fpm.pid` - stat_done - ;; - - *) - echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" - exit 1 - ;; - -esac diff --git a/extra/pidgin-encryption/PKGBUILD b/extra/pidgin-encryption/PKGBUILD deleted file mode 100644 index 3f843ccc3..000000000 --- a/extra/pidgin-encryption/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150421 2012-02-17 13:03:41Z allan $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Dan McGee <dan@archlinux.org> -# Contributor: Dale Blount <dale@archlinux.org> - -pkgname=pidgin-encryption -pkgver=3.1 -pkgrel=2.1 -pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://pidgin-encrypt.sourceforge.net/" -depends=('pidgin' 'nss') -options=('!libtool') -source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz - glib.patch) -md5sums=('d839eec602c21f913b32b742dc512f4b' - '6183c2e70e11c9ef874b21a996c93d2f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/glib.patch" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/extra/pidgin-encryption/fix_header_escaping.patch b/extra/pidgin-encryption/fix_header_escaping.patch deleted file mode 100644 index 84df67b19..000000000 --- a/extra/pidgin-encryption/fix_header_escaping.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- pidgin-encryption-3.0.orig/encrypt.c 2007-05-06 23:37:55.000000000 -0400 -+++ pidgin-encryption-3.0.new/encrypt.c 2009-11-22 22:28:34.052010351 -0500 -@@ -1114,21 +1114,21 @@ static void PE_headers_init() { - notify_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - - g_hash_table_insert(header_table, g_strdup("prpl-toc"), -- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\"")); -+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\"")); - g_hash_table_insert(footer_table, g_strdup("prpl-toc"), - g_strdup("\"></A>")); - g_hash_table_insert(notify_table, g_strdup("prpl-toc"), - g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>")); - - g_hash_table_insert(header_table, g_strdup("prpl-oscar"), -- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\"")); -+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\"")); - g_hash_table_insert(footer_table, g_strdup("prpl-oscar"), - g_strdup("\"></A>")); - g_hash_table_insert(notify_table, g_strdup("prpl-oscar"), - g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>")); - - g_hash_table_insert(header_table, g_strdup("prpl-aim"), -- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\"")); -+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\"")); - g_hash_table_insert(footer_table, g_strdup("prpl-aim"), - g_strdup("\"></A>")); - g_hash_table_insert(notify_table, g_strdup("prpl-aim"), -@@ -1136,7 +1136,7 @@ static void PE_headers_init() { - - /* If jabber stops stripping HTML, we can go back to these headers */ - /* g_hash_table_insert(header_table, g_strdup("prpl-jabber"), */ --/* g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF='")); */ -+/* g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF='")); */ - /* g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), */ - /* g_strdup("'></A>")); */ - /* g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), */ -@@ -1144,22 +1144,22 @@ static void PE_headers_init() { - - - g_hash_table_insert(header_table, g_strdup("prpl-jabber"), -- g_strdup("*** Encrypted with the Gaim-Encryption plugin ")); -+ g_strdup("--- Encrypted with the Gaim-Encryption plugin ")); - g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), - g_strdup(" ")); - g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), - g_strdup("<A HREF='Gaim-Encryption Capable'> </A>")); - -- header_default = g_strdup("*** Encrypted :"); -+ header_default = g_strdup("--- Encrypted :"); - } - --/* #define CRYPT_HEADER "*** Encrypted with the Gaim-Encryption plugin <A HREF=\"" */ -+/* #define CRYPT_HEADER "--- Encrypted with the Gaim-Encryption plugin <A HREF=\"" */ - /* #define CRYPT_FOOTER "\"></A>" */ - /* #define CRYPT_NOTIFY_HEADER "<A HREF=\"Gaim-Encryption Capable\"></A>" */ - - // Jabber seems to turn our double quotes into single quotes at times, so define - // the same headers, only with single quotes. Lengths MUST be the same as above --/* #define CRYPT_HEADER_MANGLED "*** Encrypted with the Gaim-Encryption plugin <A HREF='" */ -+/* #define CRYPT_HEADER_MANGLED "--- Encrypted with the Gaim-Encryption plugin <A HREF='" */ - /* #define CRYPT_NOTIFY_HEADER_MANGLED "<A HREF='Gaim-Encryption Capable'></A>" */ - - - diff --git a/extra/pidgin-encryption/glib.patch b/extra/pidgin-encryption/glib.patch deleted file mode 100644 index 9d156c32c..000000000 --- a/extra/pidgin-encryption/glib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c ---- pidgin-encryption-3.1.orig/rsa_nss.c 2012-12-26 13:57:18.637297343 +0100 -+++ pidgin-encryption-3.1/rsa_nss.c 2012-12-26 14:00:37.782680833 +0100 -@@ -24,7 +24,7 @@ - #include <debug.h> - #include <gtkdialogs.h> - --#include "glib/gmain.h" -+#include <glib.h> - - #include <string.h> - #include <assert.h> diff --git a/extra/pidgin-encryption/log_crash.patch b/extra/pidgin-encryption/log_crash.patch deleted file mode 100644 index a18416144..000000000 --- a/extra/pidgin-encryption/log_crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pidgin-encryption-3.0.orig/state_ui.c 2007-05-07 02:15:27.000000000 +0200 -+++ pidgin-encryption-3.0.new/state_ui.c 2009-04-26 17:08:02.000000000 +0200 -@@ -268,6 +268,8 @@ - static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) { - GtkIMHtmlSmiley * smiley; - const char* category = gtk_imhtml_get_protocol_name(imhtml); -+ -+ if (!category) return NULL; - - /* make sure that the category we're about to use to add (based on the protocol name) */ - /* already exists. If it doesn't, just use the default category so it isn't created. */ diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 8f731703a..d58bb068b 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176805 2013-01-31 17:39:46Z andyrtr $ +# $Id: PKGBUILD 177807 2013-02-09 09:15:39Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.14 +_dcpkgver=2.1.15 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.3 -pkgrel=5 +pkgrel=6 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/pixman/test_failures_on_x86-32.diff b/extra/pixman/test_failures_on_x86-32.diff deleted file mode 100644 index 6e333c03a..000000000 --- a/extra/pixman/test_failures_on_x86-32.diff +++ /dev/null @@ -1,46 +0,0 @@ -From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Sun, 27 May 2012 17:01:57 +0000 -Subject: mmx: add missing _mm_empty calls - -Fixes spurious test failures on x86-32. ---- -diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c -index bb125bf..6e292c6 100644 ---- a/pixman/pixman-mmx.c -+++ b/pixman/pixman-mmx.c -@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp, - w--; - } - } -+ -+ _mm_empty (); - } - - static void -@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask) - w--; - } - -+ _mm_empty (); - return iter->buffer; - } - -@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask) - w--; - } - -+ _mm_empty (); - return iter->buffer; - } - -@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask) - w--; - } - -+ _mm_empty (); - return iter->buffer; - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/polkit/autogen.sh b/extra/polkit/autogen.sh deleted file mode 100755 index d08b00a49..000000000 --- a/extra/polkit/autogen.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -DIE=0 - -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory $srcdir does not look like the" - echo " top-level package directory" - exit 1 -} - -olddir=`pwd` -cd "$srcdir" - -touch ChangeLog - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have autoconf installed." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && { - (libtoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have libtool installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - } -} - -(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have gtk-doc installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - DIE=1 -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have automake installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing aclocal. The version of automake" - echo "installed doesn't appear recent enough." - echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - - -# if no automake, don't bother testing for autoreconf -test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have autoreconf installed." - echo "You can get autoreconf from ..." - DIE=1 -} - - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "**Warning**: I am going to run configure with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo $0 " command line." - echo -fi - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - - aclocalinclude="$ACLOCAL_FLAGS" - - echo "Running autoreconf on test/mocklibc ..." - (cd "test/mocklibc"; autoreconf --install) - - if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then - if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - fi - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu -Wno-portability $am_opt ..." - automake --add-missing --gnu -Wno-portability $am_opt - echo "Running autoconf ..." - autoconf - -intltoolize --copy --force --automake || exit 1 - -cd "$olddir" - -conf_flags="--enable-maintainer-mode --enable-gtk-doc" - -if test x$NOCONFIGURE = x; then - echo "Running $srcdir/configure $conf_flags $@ ..." - $srcdir/configure $conf_flags "$@" \ - && echo "Now type make to compile." || exit 1 -else - echo "Skipping configure process." -fi diff --git a/extra/polkit/fix-empty-wheel.patch b/extra/polkit/fix-empty-wheel.patch deleted file mode 100644 index d6f99c43d..000000000 --- a/extra/polkit/fix-empty-wheel.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001 -From: David Zeuthen <zeuthen@gmail.com> -Date: Tue, 18 Sep 2012 18:47:06 +0000 -Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty - -For example, this can happen if the wheel group has no members. This -was reported in Red Hat bug 834494, see - - https://bugzilla.redhat.com/show_bug.cgi?id=834494 - -Signed-off-by: David Zeuthen <zeuthen@gmail.com> ---- -diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index 1d4a555..3bd2f0b 100644 ---- a/src/polkitbackend/polkitbackendinteractiveauthority.c -+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract - PolkitDetails *details) - { - PolkitBackendInteractiveAuthorityClass *klass; -- GList *ret; -+ GList *ret = NULL; - - klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority); - -- if (klass->get_admin_identities == NULL) -- { -- ret = g_list_prepend (NULL, polkit_unix_user_new (0)); -- } -- else -+ if (klass->get_admin_identities != NULL) - { - ret = klass->get_admin_identities (authority, - caller, -@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, - } - } - -+ /* Fall back to uid 0 if no users are available (rhbz #834494) */ -+ if (user_identities == NULL) -+ user_identities = g_list_prepend (NULL, polkit_unix_user_new (0)); -+ - session = authentication_session_new (agent, - cookie, - subject, --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/polkit/systemd-fallback.patch b/extra/polkit/systemd-fallback.patch deleted file mode 100644 index f89ce10ae..000000000 --- a/extra/polkit/systemd-fallback.patch +++ /dev/null @@ -1,1571 +0,0 @@ -diff -u -rN polkit-0.104/configure.ac polkit-0.104-systemd-fallback/configure.ac ---- polkit-0.104/configure.ac 2012-01-03 17:25:49.000000000 +0100 -+++ polkit-0.104-systemd-fallback/configure.ac 2012-03-06 15:45:55.275860194 +0100 -@@ -160,14 +160,14 @@ - [enable_systemd=auto]) - if test "$enable_systemd" != "no"; then - PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login], -+ [libsystemd-login libsystemd-daemon], - have_systemd=yes, - have_systemd=no) - if test "$have_systemd" = "yes"; then - SESSION_TRACKING=systemd - else - if test "$enable_systemd" = "yes"; then -- AC_MSG_ERROR([systemd support requested but libsystemd-login1 library not found]) -+ AC_MSG_ERROR([systemd support requested but systemd libraries not found]) - fi - fi - fi -diff -u -rN polkit-0.104/src/polkit/Makefile.am polkit-0.104-systemd-fallback/src/polkit/Makefile.am ---- polkit-0.104/src/polkit/Makefile.am 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkit/Makefile.am 2012-03-06 15:19:25.108853325 +0100 -@@ -79,15 +79,8 @@ - polkitimplicitauthorization.c polkitimplicitauthorization.h \ - polkittemporaryauthorization.c polkittemporaryauthorization.h \ - polkitpermission.c polkitpermission.h \ -- $(NULL) -- --if HAVE_SYSTEMD --libpolkit_gobject_1_la_SOURCES += \ -- polkitunixsession-systemd.c polkitunixsession.h --else --libpolkit_gobject_1_la_SOURCES += \ - polkitunixsession.c polkitunixsession.h --endif -+ $(NULL) - - libpolkit_gobject_1_la_CFLAGS = \ - -D_POLKIT_COMPILATION \ -diff -u -rN polkit-0.104/src/polkit/polkitunixsession.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c ---- polkit-0.104/src/polkit/polkitunixsession.c 2011-10-18 19:02:27.000000000 +0200 -+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c 2012-03-06 15:17:29.829788021 +0100 -@@ -23,12 +23,18 @@ - # include "config.h" - #endif - -+#include <stdlib.h> - #include <string.h> - #include "polkitunixsession.h" - #include "polkitsubject.h" - #include "polkiterror.h" - #include "polkitprivate.h" - -+#ifdef HAVE_SYSTEMD -+# include <systemd/sd-daemon.h> -+# include <systemd/sd-login.h> -+#endif -+ - /** - * SECTION:polkitunixsession - * @title: PolkitUnixSession -@@ -364,34 +370,44 @@ - PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); - GDBusConnection *connection; - GVariant *result; -- gboolean ret; -- -- ret = FALSE; -+ gboolean ret = FALSE; - -- connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -- if (connection == NULL) -- goto out; -- -- result = g_dbus_connection_call_sync (connection, -- "org.freedesktop.ConsoleKit", /* name */ -- session->session_id, /* object path */ -- "org.freedesktop.ConsoleKit.Session", /* interface name */ -- "GetUser", /* method */ -- NULL, /* parameters */ -- G_VARIANT_TYPE ("(u)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- cancellable, -- error); -- if (result == NULL) -- goto out; -+#ifdef HAVE_SYSTEMD -+ uid_t uid; -+ -+ if (sd_booted () > 0) -+ { -+ if (sd_session_get_uid (session->session_id, &uid) == 0) -+ ret = TRUE; -+ } -+ else -+#endif -+ { -+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -+ if (connection == NULL) -+ goto out; -+ -+ result = g_dbus_connection_call_sync (connection, -+ "org.freedesktop.ConsoleKit", /* name */ -+ session->session_id, /* object path */ -+ "org.freedesktop.ConsoleKit.Session", /* interface name */ -+ "GetUser", /* method */ -+ NULL, /* parameters */ -+ G_VARIANT_TYPE ("(u)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ cancellable, -+ error); -+ if (result == NULL) -+ goto out; - -- ret = TRUE; -- g_variant_unref (result); -+ ret = TRUE; -+ g_variant_unref (result); - -- out: -- if (connection != NULL) -- g_object_unref (connection); -+ out: -+ if (connection != NULL) -+ g_object_unref (connection); -+ } - return ret; - } - -@@ -470,12 +486,9 @@ - GError **error) - { - PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable); -- GDBusConnection *connection; -+ GDBusConnection *connection = NULL; - GVariant *result; -- gboolean ret; -- -- connection = NULL; -- ret = FALSE; -+ gboolean ret = FALSE; - - if (session->session_id != NULL) - { -@@ -484,33 +497,56 @@ - goto out; - } - -- connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -- if (connection == NULL) -- goto out; -+#ifdef HAVE_SYSTEMD -+ char *s; -+ -+ if (sd_booted () > 0) -+ { -+ if (sd_pid_get_session (session->pid, &s) == 0) -+ { -+ session->session_id = g_strdup (s); -+ free (s); -+ ret = TRUE; -+ goto out; -+ } -+ -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "No session for pid %d", -+ (gint) session->pid); -+ } -+ else -+#endif -+ { -+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -+ if (connection == NULL) -+ goto out; -+ -+ result = g_dbus_connection_call_sync (connection, -+ "org.freedesktop.ConsoleKit", /* name */ -+ "/org/freedesktop/ConsoleKit/Manager", /* object path */ -+ "org.freedesktop.ConsoleKit.Manager", /* interface name */ -+ "GetSessionForUnixProcess", /* method */ -+ g_variant_new ("(u)", session->pid), /* parameters */ -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ cancellable, -+ error); -+ if (result == NULL) -+ goto out; - -- result = g_dbus_connection_call_sync (connection, -- "org.freedesktop.ConsoleKit", /* name */ -- "/org/freedesktop/ConsoleKit/Manager", /* object path */ -- "org.freedesktop.ConsoleKit.Manager", /* interface name */ -- "GetSessionForUnixProcess", /* method */ -- g_variant_new ("(u)", session->pid), /* parameters */ -- G_VARIANT_TYPE ("(o)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- cancellable, -- error); -- if (result == NULL) -- goto out; -+ g_variant_get (result, "(o)", &session->session_id); -+ g_variant_unref (result); - -- g_variant_get (result, "(o)", &session->session_id); -- g_variant_unref (result); -+ ret = TRUE; -+ } - -- ret = TRUE; - - out: - if (connection != NULL) - g_object_unref (connection); -- - return ret; - } - -diff -u -rN polkit-0.104/src/polkit/polkitunixsession-systemd.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c ---- polkit-0.104/src/polkit/polkitunixsession-systemd.c 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,481 +0,0 @@ --/* -- * Copyright (C) 2011 Red Hat, Inc. -- * -- * This library 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 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 -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General -- * Public License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -- * Boston, MA 02111-1307, USA. -- * -- * Author: Matthias Clasen -- */ -- --#ifdef HAVE_CONFIG_H --# include "config.h" --#endif -- --#include <string.h> --#include "polkitunixsession.h" --#include "polkitsubject.h" --#include "polkiterror.h" --#include "polkitprivate.h" -- --#include <systemd/sd-login.h> -- --/** -- * SECTION:polkitunixsession -- * @title: PolkitUnixSession -- * @short_description: Unix sessions -- * -- * An object that represents an user session. -- * -- * The session id is an opaque string obtained from ConsoleKit. -- */ -- --/** -- * PolkitUnixSession: -- * -- * The #PolkitUnixSession struct should not be accessed directly. -- */ --struct _PolkitUnixSession --{ -- GObject parent_instance; -- -- gchar *session_id; -- -- gint pid; --}; -- --struct _PolkitUnixSessionClass --{ -- GObjectClass parent_class; --}; -- --enum --{ -- PROP_0, -- PROP_SESSION_ID, -- PROP_PID, --}; -- --static void subject_iface_init (PolkitSubjectIface *subject_iface); --static void initable_iface_init (GInitableIface *initable_iface); --static void async_initable_iface_init (GAsyncInitableIface *async_initable_iface); -- --G_DEFINE_TYPE_WITH_CODE (PolkitUnixSession, polkit_unix_session, G_TYPE_OBJECT, -- G_IMPLEMENT_INTERFACE (POLKIT_TYPE_SUBJECT, subject_iface_init) -- G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init) -- G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init) -- ); -- --static void --polkit_unix_session_init (PolkitUnixSession *session) --{ --} -- --static void --polkit_unix_session_finalize (GObject *object) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (object); -- -- g_free (session->session_id); -- -- if (G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize != NULL) -- G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize (object); --} -- --static void --polkit_unix_session_get_property (GObject *object, -- guint prop_id, -- GValue *value, -- GParamSpec *pspec) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (object); -- -- switch (prop_id) -- { -- case PROP_SESSION_ID: -- g_value_set_string (value, session->session_id); -- break; -- -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --static void --polkit_unix_session_set_property (GObject *object, -- guint prop_id, -- const GValue *value, -- GParamSpec *pspec) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (object); -- -- switch (prop_id) -- { -- case PROP_SESSION_ID: -- polkit_unix_session_set_session_id (session, g_value_get_string (value)); -- break; -- -- case PROP_PID: -- session->pid = g_value_get_int (value); -- break; -- -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --static void --polkit_unix_session_class_init (PolkitUnixSessionClass *klass) --{ -- GObjectClass *gobject_class = G_OBJECT_CLASS (klass); -- -- gobject_class->finalize = polkit_unix_session_finalize; -- gobject_class->get_property = polkit_unix_session_get_property; -- gobject_class->set_property = polkit_unix_session_set_property; -- -- /** -- * PolkitUnixSession:session-id: -- * -- * The UNIX session id. -- */ -- g_object_class_install_property (gobject_class, -- PROP_SESSION_ID, -- g_param_spec_string ("session-id", -- "Session ID", -- "The UNIX session ID", -- NULL, -- G_PARAM_CONSTRUCT | -- G_PARAM_READWRITE | -- G_PARAM_STATIC_NAME | -- G_PARAM_STATIC_BLURB | -- G_PARAM_STATIC_NICK)); -- -- -- /** -- * PolkitUnixSession:pid: -- * -- * The UNIX process id to look up the session. -- */ -- g_object_class_install_property (gobject_class, -- PROP_PID, -- g_param_spec_int ("pid", -- "Process ID", -- "Process ID to use for looking up the session", -- 0, -- G_MAXINT, -- 0, -- G_PARAM_CONSTRUCT_ONLY | -- G_PARAM_WRITABLE | -- G_PARAM_STATIC_NAME | -- G_PARAM_STATIC_BLURB | -- G_PARAM_STATIC_NICK)); -- --} -- --/** -- * polkit_unix_session_get_session_id: -- * @session: A #PolkitUnixSession. -- * -- * Gets the session id for @session. -- * -- * Returns: The session id for @session. Do not free this string, it -- * is owned by @session. -- **/ --const gchar * --polkit_unix_session_get_session_id (PolkitUnixSession *session) --{ -- g_return_val_if_fail (POLKIT_IS_UNIX_SESSION (session), NULL); -- return session->session_id; --} -- --/** -- * polkit_unix_session_set_session_id: -- * @session: A #PolkitUnixSession. -- * @session_id: The session id. -- * -- * Sets the session id for @session to @session_id. -- **/ --void --polkit_unix_session_set_session_id (PolkitUnixSession *session, -- const gchar *session_id) --{ -- g_return_if_fail (POLKIT_IS_UNIX_SESSION (session)); -- /*g_return_if_fail (session_id != NULL);*/ -- g_free (session->session_id); -- session->session_id = g_strdup (session_id); --} -- --/** -- * polkit_unix_session_new: -- * @session_id: The session id. -- * -- * Creates a new #PolkitUnixSession for @session_id. -- * -- * Returns: (transfer full): A #PolkitUnixSession. Free with g_object_unref(). -- **/ --PolkitSubject * --polkit_unix_session_new (const gchar *session_id) --{ -- return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_SESSION, -- "session-id", session_id, -- NULL)); --} -- --/** -- * polkit_unix_session_new_for_process: -- * @pid: The process id of the process to get the session for. -- * @cancellable: (allow-none): A #GCancellable or %NULL. -- * @callback: A #GAsyncReadyCallback to call when the request is satisfied -- * @user_data: The data to pass to @callback. -- * -- * Asynchronously creates a new #PolkitUnixSession object for the -- * process with process id @pid. -- * -- * When the operation is finished, @callback will be invoked in the -- * <link linkend="g-main-context-push-thread-default">thread-default -- * main loop</link> of the thread you are calling this method -- * from. You can then call -- * polkit_unix_session_new_for_process_finish() to get the result of -- * the operation. -- * -- * This method constructs the object asynchronously, for the synchronous and blocking version -- * use polkit_unix_session_new_for_process_sync(). -- **/ --void --polkit_unix_session_new_for_process (gint pid, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data) --{ -- g_async_initable_new_async (POLKIT_TYPE_UNIX_SESSION, -- G_PRIORITY_DEFAULT, -- cancellable, -- callback, -- user_data, -- "pid", pid, -- NULL); --} -- --/** -- * polkit_unix_session_new_for_process_finish: -- * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to polkit_unix_session_new_for_process(). -- * @error: (allow-none): Return location for error. -- * -- * Finishes constructing a #PolkitSubject for a process id. -- * -- * Returns: (transfer full) (allow-none): A #PolkitUnixSession for the @pid passed to -- * polkit_unix_session_new_for_process() or %NULL if @error is -- * set. Free with g_object_unref(). -- **/ --PolkitSubject * --polkit_unix_session_new_for_process_finish (GAsyncResult *res, -- GError **error) --{ -- GObject *object; -- GObject *source_object; -- -- source_object = g_async_result_get_source_object (res); -- g_assert (source_object != NULL); -- -- object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), -- res, -- error); -- g_object_unref (source_object); -- -- if (object != NULL) -- return POLKIT_SUBJECT (object); -- else -- return NULL; --} -- -- --/** -- * polkit_unix_session_new_for_process_sync: -- * @pid: The process id of the process to get the session for. -- * @cancellable: (allow-none): A #GCancellable or %NULL. -- * @error: (allow-none): Return location for error. -- * -- * Creates a new #PolkitUnixSession for the process with process id @pid. -- * -- * This is a synchronous call - the calling thread is blocked until a -- * reply is received. For the asynchronous version, see -- * polkit_unix_session_new_for_process(). -- * -- * Returns: (allow-none) (transfer full): A #PolkitUnixSession for -- * @pid or %NULL if @error is set. Free with g_object_unref(). -- **/ --PolkitSubject * --polkit_unix_session_new_for_process_sync (gint pid, -- GCancellable *cancellable, -- GError **error) --{ -- return POLKIT_SUBJECT (g_initable_new (POLKIT_TYPE_UNIX_SESSION, -- cancellable, -- error, -- "pid", pid, -- NULL)); --} -- --static guint --polkit_unix_session_hash (PolkitSubject *subject) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); -- -- return g_str_hash (session->session_id); --} -- --static gboolean --polkit_unix_session_equal (PolkitSubject *a, -- PolkitSubject *b) --{ -- PolkitUnixSession *session_a; -- PolkitUnixSession *session_b; -- -- session_a = POLKIT_UNIX_SESSION (a); -- session_b = POLKIT_UNIX_SESSION (b); -- -- return g_strcmp0 (session_a->session_id, session_b->session_id) == 0; --} -- --static gchar * --polkit_unix_session_to_string (PolkitSubject *subject) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); -- -- return g_strdup_printf ("unix-session:%s", session->session_id); --} -- --static gboolean --polkit_unix_session_exists_sync (PolkitSubject *subject, -- GCancellable *cancellable, -- GError **error) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); -- gboolean ret; -- uid_t uid; -- -- ret = FALSE; -- -- if (!sd_session_get_uid (session->session_id, &uid)) -- ret = FALSE; -- -- return ret; --} -- --static void --exists_in_thread_func (GSimpleAsyncResult *res, -- GObject *object, -- GCancellable *cancellable) --{ -- GError *error; -- error = NULL; -- if (!polkit_unix_session_exists_sync (POLKIT_SUBJECT (object), -- cancellable, -- &error)) -- { -- g_simple_async_result_set_from_error (res, error); -- g_error_free (error); -- } --} -- --static void --polkit_unix_session_exists (PolkitSubject *subject, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data) --{ -- GSimpleAsyncResult *simple; -- -- g_return_if_fail (POLKIT_IS_UNIX_SESSION (subject)); -- -- simple = g_simple_async_result_new (G_OBJECT (subject), -- callback, -- user_data, -- polkit_unix_session_exists); -- g_simple_async_result_run_in_thread (simple, -- exists_in_thread_func, -- G_PRIORITY_DEFAULT, -- cancellable); -- g_object_unref (simple); --} -- --static gboolean --polkit_unix_session_exists_finish (PolkitSubject *subject, -- GAsyncResult *res, -- GError **error) --{ -- GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); -- gboolean ret; -- -- g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == polkit_unix_session_exists); -- -- ret = FALSE; -- -- if (g_simple_async_result_propagate_error (simple, error)) -- goto out; -- -- ret = g_simple_async_result_get_op_res_gboolean (simple); -- -- out: -- return ret; --} -- --static void --subject_iface_init (PolkitSubjectIface *subject_iface) --{ -- subject_iface->hash = polkit_unix_session_hash; -- subject_iface->equal = polkit_unix_session_equal; -- subject_iface->to_string = polkit_unix_session_to_string; -- subject_iface->exists = polkit_unix_session_exists; -- subject_iface->exists_finish = polkit_unix_session_exists_finish; -- subject_iface->exists_sync = polkit_unix_session_exists_sync; --} -- --static gboolean --polkit_unix_session_initable_init (GInitable *initable, -- GCancellable *cancellable, -- GError **error) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable); -- gboolean ret; -- -- ret = FALSE; -- -- if (session->session_id != NULL) -- { -- /* already set, nothing to do */ -- ret = TRUE; -- goto out; -- } -- -- if (!sd_pid_get_session (session->pid, &session->session_id)) -- ret = TRUE; -- --out: -- return ret; --} -- --static void --initable_iface_init (GInitableIface *initable_iface) --{ -- initable_iface->init = polkit_unix_session_initable_init; --} -- --static void --async_initable_iface_init (GAsyncInitableIface *async_initable_iface) --{ -- /* use default implementation to run GInitable code in a thread */ --} -diff -u -rN polkit-0.104/src/polkitbackend/Makefile.am polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am ---- polkit-0.104/src/polkitbackend/Makefile.am 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am 2012-03-06 15:44:15.380014886 +0100 -@@ -41,15 +41,8 @@ - polkitbackendconfigsource.h polkitbackendconfigsource.c \ - polkitbackendactionlookup.h polkitbackendactionlookup.c \ - polkitbackendlocalauthorizationstore.h polkitbackendlocalauthorizationstore.c \ -- $(NULL) -- --if HAVE_SYSTEMD --libpolkit_backend_1_la_SOURCES += \ -- polkitbackendsessionmonitor.h polkitbackendsessionmonitor-systemd.c --else --libpolkit_backend_1_la_SOURCES += \ - polkitbackendsessionmonitor.h polkitbackendsessionmonitor.c --endif -+ $(NULL) - - libpolkit_backend_1_la_CFLAGS = \ - -D_POLKIT_COMPILATION \ -diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c ---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c 2011-10-18 19:02:27.000000000 +0200 -+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c 2012-03-06 15:43:49.353562242 +0100 -@@ -26,6 +26,12 @@ - #include <string.h> - #include <glib/gstdio.h> - -+#ifdef HAVE_SYSTEMD -+# include <systemd/sd-daemon.h> -+# include <systemd/sd-login.h> -+# include <stdlib.h> -+#endif -+ - #include <polkit/polkit.h> - #include "polkitbackendsessionmonitor.h" - -@@ -39,6 +45,88 @@ - * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions. - */ - -+#ifdef HAVE_SYSTEMD -+typedef struct -+{ -+ GSource source; -+ GPollFD pollfd; -+ sd_login_monitor *monitor; -+} SdSource; -+ -+static gboolean -+sd_source_prepare (GSource *source, -+ gint *timeout) -+{ -+ *timeout = -1; -+ return FALSE; -+} -+ -+static gboolean -+sd_source_check (GSource *source) -+{ -+ SdSource *sd_source = (SdSource *)source; -+ -+ return sd_source->pollfd.revents != 0; -+} -+ -+static gboolean -+sd_source_dispatch (GSource *source, -+ GSourceFunc callback, -+ gpointer user_data) -+ -+{ -+ SdSource *sd_source = (SdSource *)source; -+ gboolean ret; -+ -+ g_warn_if_fail (callback != NULL); -+ -+ ret = (*callback) (user_data); -+ -+ sd_login_monitor_flush (sd_source->monitor); -+ -+ return ret; -+} -+ -+static void -+sd_source_finalize (GSource *source) -+{ -+ SdSource *sd_source = (SdSource*)source; -+ -+ sd_login_monitor_unref (sd_source->monitor); -+} -+ -+static GSourceFuncs sd_source_funcs = { -+ sd_source_prepare, -+ sd_source_check, -+ sd_source_dispatch, -+ sd_source_finalize -+}; -+ -+static GSource * -+sd_source_new (void) -+{ -+ GSource *source; -+ SdSource *sd_source; -+ int ret; -+ -+ source = g_source_new (&sd_source_funcs, sizeof (SdSource)); -+ sd_source = (SdSource *)source; -+ -+ if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0) -+ { -+ g_printerr ("Error getting login monitor: %d", ret); -+ } -+ else -+ { -+ sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor); -+ sd_source->pollfd.events = G_IO_IN; -+ g_source_add_poll (source, &sd_source->pollfd); -+ } -+ -+ return source; -+} -+#endif /* HAVE_SYSTEMD */ -+ - struct _PolkitBackendSessionMonitor - { - GObject parent_instance; -@@ -48,6 +136,10 @@ - GKeyFile *database; - GFileMonitor *database_monitor; - time_t database_mtime; -+ -+#ifdef HAVE_SYSTEMD -+ GSource *sd_source; -+#endif - }; - - struct _PolkitBackendSessionMonitorClass -@@ -162,6 +254,18 @@ - g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); - } - -+#ifdef HAVE_SYSTEMD -+static gboolean -+sessions_changed (gpointer user_data) -+{ -+ PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data); -+ -+ g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); -+ -+ return TRUE; -+} -+#endif -+ - static void - polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) - { -@@ -176,31 +280,47 @@ - g_error_free (error); - } - -- error = NULL; -- if (!ensure_database (monitor, &error)) -- { -- g_printerr ("Error loading " CKDB_PATH ": %s", error->message); -- g_error_free (error); -- } -+#ifdef HAVE_SYSTEMD -+ monitor->sd_source = NULL; -+ -+ if (sd_booted () > 0) -+ { -+ monitor->sd_source = sd_source_new (); -+ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -+ g_source_attach (monitor->sd_source, NULL); - -- error = NULL; -- file = g_file_new_for_path (CKDB_PATH); -- monitor->database_monitor = g_file_monitor_file (file, -- G_FILE_MONITOR_NONE, -- NULL, -- &error); -- g_object_unref (file); -- if (monitor->database_monitor == NULL) -- { -- g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message); -- g_error_free (error); -+ monitor->database = NULL; -+ monitor->database_monitor = NULL; - } - else -+#endif - { -- g_signal_connect (monitor->database_monitor, -- "changed", -- G_CALLBACK (on_file_monitor_changed), -- monitor); -+ error = NULL; -+ if (!ensure_database (monitor, &error)) -+ { -+ g_printerr ("Error loading " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } -+ -+ error = NULL; -+ file = g_file_new_for_path (CKDB_PATH); -+ monitor->database_monitor = g_file_monitor_file (file, -+ G_FILE_MONITOR_NONE, -+ NULL, -+ &error); -+ g_object_unref (file); -+ if (monitor->database_monitor == NULL) -+ { -+ g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } -+ else -+ { -+ g_signal_connect (monitor->database_monitor, -+ "changed", -+ G_CALLBACK (on_file_monitor_changed), -+ monitor); -+ } - } - } - -@@ -212,6 +332,14 @@ - if (monitor->system_bus != NULL) - g_object_unref (monitor->system_bus); - -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ g_source_destroy (monitor->sd_source); -+ g_source_unref (monitor->sd_source); -+ } -+#endif -+ - if (monitor->database_monitor != NULL) - g_object_unref (monitor->database_monitor); - -@@ -328,22 +456,38 @@ - } - else if (POLKIT_IS_UNIX_SESSION (subject)) - { -- if (!ensure_database (monitor, error)) -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) - { -- g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": "); -- goto out; -+ if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Error getting uid for session"); -+ goto out; -+ } - } -- -- group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject))); -- local_error = NULL; -- uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error); -- if (local_error != NULL) -+ else -+#endif - { -- g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": "); -+ if (!ensure_database (monitor, error)) -+ { -+ g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": "); -+ goto out; -+ } -+ -+ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject))); -+ local_error = NULL; -+ uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error); -+ if (local_error != NULL) -+ { -+ g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": "); -+ g_free (group); -+ goto out; -+ } - g_free (group); -- goto out; - } -- g_free (group); - - ret = polkit_unix_user_new (uid); - } -@@ -373,29 +517,46 @@ - - if (POLKIT_IS_UNIX_PROCESS (subject)) - { -- const gchar *session_id; -- GVariant *result; -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.ConsoleKit", -- "/org/freedesktop/ConsoleKit/Manager", -- "org.freedesktop.ConsoleKit.Manager", -- "GetSessionForUnixProcess", -- g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))), -- G_VARIANT_TYPE ("(o)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(&o)", &session_id); -- session = polkit_unix_session_new (session_id); -- g_variant_unref (result); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ gchar *session_id; -+ pid_t pid; -+ -+ pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); -+ if (sd_pid_get_session (pid, &session_id) < 0) -+ goto out; -+ -+ session = polkit_unix_session_new (session_id); -+ free (session_id); -+ } -+ else -+#endif -+ { -+ const gchar *session_id; -+ GVariant *result; -+ result = g_dbus_connection_call_sync (monitor->system_bus, -+ "org.freedesktop.ConsoleKit", -+ "/org/freedesktop/ConsoleKit/Manager", -+ "org.freedesktop.ConsoleKit.Manager", -+ "GetSessionForUnixProcess", -+ g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))), -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, /* timeout_msec */ -+ NULL, /* GCancellable */ -+ error); -+ if (result == NULL) -+ goto out; -+ g_variant_get (result, "(&o)", &session_id); -+ session = polkit_unix_session_new (session_id); -+ g_variant_unref (result); -+ } - } - else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) - { - guint32 pid; -- const gchar *session_id; -+ gchar *session_id; - GVariant *result; - - result = g_dbus_connection_call_sync (monitor->system_bus, -@@ -414,22 +575,35 @@ - g_variant_get (result, "(u)", &pid); - g_variant_unref (result); - -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.ConsoleKit", -- "/org/freedesktop/ConsoleKit/Manager", -- "org.freedesktop.ConsoleKit.Manager", -- "GetSessionForUnixProcess", -- g_variant_new ("(u)", pid), -- G_VARIANT_TYPE ("(o)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(&o)", &session_id); -- session = polkit_unix_session_new (session_id); -- g_variant_unref (result); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ if (sd_pid_get_session (pid, &session_id) < 0) -+ goto out; -+ -+ session = polkit_unix_session_new (session_id); -+ free (session_id); -+ } -+ else -+#endif -+ { -+ result = g_dbus_connection_call_sync (monitor->system_bus, -+ "org.freedesktop.ConsoleKit", -+ "/org/freedesktop/ConsoleKit/Manager", -+ "org.freedesktop.ConsoleKit.Manager", -+ "GetSessionForUnixProcess", -+ g_variant_new ("(u)", pid), -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, /* timeout_msec */ -+ NULL, /* GCancellable */ -+ error); -+ if (result == NULL) -+ goto out; -+ g_variant_get (result, "(&o)", &session_id); -+ session = polkit_unix_session_new (session_id); -+ g_variant_unref (result); -+ } - } - else - { -@@ -490,7 +664,22 @@ - polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor, - PolkitSubject *session) - { -- return get_boolean (monitor, session, "is_local"); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ char *seat; -+ -+ if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat)) -+ { -+ free (seat); -+ return TRUE; -+ } -+ -+ return FALSE; -+ } -+ else -+#endif -+ return get_boolean (monitor, session, "is_local"); - } - - -@@ -498,6 +687,11 @@ - polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor, - PolkitSubject *session) - { -- return get_boolean (monitor, session, "is_active"); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); -+ else -+#endif -+ return get_boolean (monitor, session, "is_active"); - } - -diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c ---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,414 +0,0 @@ --/* -- * Copyright (C) 2011 Red Hat, Inc. -- * -- * This library 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 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 -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General -- * Public License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -- * Boston, MA 02111-1307, USA. -- * -- * Author: Matthias Clasen -- */ -- --#include "config.h" --#include <errno.h> --#include <pwd.h> --#include <grp.h> --#include <string.h> --#include <glib/gstdio.h> --#include <systemd/sd-login.h> --#include <stdlib.h> -- --#include <polkit/polkit.h> --#include "polkitbackendsessionmonitor.h" -- --/* <internal> -- * SECTION:polkitbackendsessionmonitor -- * @title: PolkitBackendSessionMonitor -- * @short_description: Monitor sessions -- * -- * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions. -- */ -- --typedef struct --{ -- GSource source; -- GPollFD pollfd; -- sd_login_monitor *monitor; --} SdSource; -- --static gboolean --sd_source_prepare (GSource *source, -- gint *timeout) --{ -- *timeout = -1; -- return FALSE; --} -- --static gboolean --sd_source_check (GSource *source) --{ -- SdSource *sd_source = (SdSource *)source; -- -- return sd_source->pollfd.revents != 0; --} -- --static gboolean --sd_source_dispatch (GSource *source, -- GSourceFunc callback, -- gpointer user_data) -- --{ -- SdSource *sd_source = (SdSource *)source; -- gboolean ret; -- -- g_warn_if_fail (callback != NULL); -- -- ret = (*callback) (user_data); -- -- sd_login_monitor_flush (sd_source->monitor); -- -- return ret; --} -- --static void --sd_source_finalize (GSource *source) --{ -- SdSource *sd_source = (SdSource*)source; -- -- sd_login_monitor_unref (sd_source->monitor); --} -- --static GSourceFuncs sd_source_funcs = { -- sd_source_prepare, -- sd_source_check, -- sd_source_dispatch, -- sd_source_finalize --}; -- --static GSource * --sd_source_new (void) --{ -- GSource *source; -- SdSource *sd_source; -- int ret; -- -- source = g_source_new (&sd_source_funcs, sizeof (SdSource)); -- sd_source = (SdSource *)source; -- -- if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0) -- { -- g_printerr ("Error getting login monitor: %d", ret); -- } -- else -- { -- sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor); -- sd_source->pollfd.events = G_IO_IN; -- g_source_add_poll (source, &sd_source->pollfd); -- } -- -- return source; --} -- --struct _PolkitBackendSessionMonitor --{ -- GObject parent_instance; -- -- GDBusConnection *system_bus; -- -- GSource *sd_source; --}; -- --struct _PolkitBackendSessionMonitorClass --{ -- GObjectClass parent_class; -- -- void (*changed) (PolkitBackendSessionMonitor *monitor); --}; -- -- --enum --{ -- CHANGED_SIGNAL, -- LAST_SIGNAL, --}; -- --static guint signals[LAST_SIGNAL] = {0}; -- --G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TYPE_OBJECT); -- --/* ---------------------------------------------------------------------------------------------------- */ -- --static gboolean --sessions_changed (gpointer user_data) --{ -- PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data); -- -- g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); -- -- return TRUE; --} -- -- --static void --polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) --{ -- GError *error; -- -- error = NULL; -- monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -- if (monitor->system_bus == NULL) -- { -- g_printerr ("Error getting system bus: %s", error->message); -- g_error_free (error); -- } -- -- monitor->sd_source = sd_source_new (); -- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -- g_source_attach (monitor->sd_source, NULL); --} -- --static void --polkit_backend_session_monitor_finalize (GObject *object) --{ -- PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (object); -- -- if (monitor->system_bus != NULL) -- g_object_unref (monitor->system_bus); -- -- if (monitor->sd_source != NULL) -- { -- g_source_destroy (monitor->sd_source); -- g_source_unref (monitor->sd_source); -- } -- -- if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL) -- G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object); --} -- --static void --polkit_backend_session_monitor_class_init (PolkitBackendSessionMonitorClass *klass) --{ -- GObjectClass *gobject_class; -- -- gobject_class = G_OBJECT_CLASS (klass); -- -- gobject_class->finalize = polkit_backend_session_monitor_finalize; -- -- /** -- * PolkitBackendSessionMonitor::changed: -- * @monitor: A #PolkitBackendSessionMonitor -- * -- * Emitted when something changes. -- */ -- signals[CHANGED_SIGNAL] = g_signal_new ("changed", -- POLKIT_BACKEND_TYPE_SESSION_MONITOR, -- G_SIGNAL_RUN_LAST, -- G_STRUCT_OFFSET (PolkitBackendSessionMonitorClass, changed), -- NULL, /* accumulator */ -- NULL, /* accumulator data */ -- g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, -- 0); --} -- --PolkitBackendSessionMonitor * --polkit_backend_session_monitor_new (void) --{ -- PolkitBackendSessionMonitor *monitor; -- -- monitor = POLKIT_BACKEND_SESSION_MONITOR (g_object_new (POLKIT_BACKEND_TYPE_SESSION_MONITOR, NULL)); -- -- return monitor; --} -- --/* ---------------------------------------------------------------------------------------------------- */ -- --GList * --polkit_backend_session_monitor_get_sessions (PolkitBackendSessionMonitor *monitor) --{ -- /* TODO */ -- return NULL; --} -- --/* ---------------------------------------------------------------------------------------------------- */ -- --/** -- * polkit_backend_session_monitor_get_user: -- * @monitor: A #PolkitBackendSessionMonitor. -- * @subject: A #PolkitSubject. -- * @error: Return location for error. -- * -- * Gets the user corresponding to @subject or %NULL if no user exists. -- * -- * Returns: %NULL if @error is set otherwise a #PolkitUnixUser that should be freed with g_object_unref(). -- */ --PolkitIdentity * --polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *subject, -- GError **error) --{ -- PolkitIdentity *ret; -- guint32 uid; -- -- ret = NULL; -- -- if (POLKIT_IS_UNIX_PROCESS (subject)) -- { -- uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)); -- if ((gint) uid == -1) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Unix process subject does not have uid set"); -- goto out; -- } -- ret = polkit_unix_user_new (uid); -- } -- else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) -- { -- GVariant *result; -- -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.DBus", -- "/org/freedesktop/DBus", -- "org.freedesktop.DBus", -- "GetConnectionUnixUser", -- g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))), -- G_VARIANT_TYPE ("(u)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(u)", &uid); -- g_variant_unref (result); -- -- ret = polkit_unix_user_new (uid); -- } -- else if (POLKIT_IS_UNIX_SESSION (subject)) -- { -- -- if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Error getting uid for session"); -- goto out; -- } -- -- ret = polkit_unix_user_new (uid); -- } -- -- out: -- return ret; --} -- --/** -- * polkit_backend_session_monitor_get_session_for_subject: -- * @monitor: A #PolkitBackendSessionMonitor. -- * @subject: A #PolkitSubject. -- * @error: Return location for error. -- * -- * Gets the session corresponding to @subject or %NULL if no session exists. -- * -- * Returns: %NULL if @error is set otherwise a #PolkitUnixSession that should be freed with g_object_unref(). -- */ --PolkitSubject * --polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *subject, -- GError **error) --{ -- PolkitSubject *session; -- -- session = NULL; -- -- if (POLKIT_IS_UNIX_PROCESS (subject)) -- { -- gchar *session_id; -- pid_t pid; -- -- pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); -- if (sd_pid_get_session (pid, &session_id) < 0) -- goto out; -- -- session = polkit_unix_session_new (session_id); -- free (session_id); -- } -- else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) -- { -- guint32 pid; -- gchar *session_id; -- GVariant *result; -- -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.DBus", -- "/org/freedesktop/DBus", -- "org.freedesktop.DBus", -- "GetConnectionUnixProcessID", -- g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))), -- G_VARIANT_TYPE ("(u)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(u)", &pid); -- g_variant_unref (result); -- -- if (sd_pid_get_session (pid, &session_id) < 0) -- goto out; -- -- session = polkit_unix_session_new (session_id); -- free (session_id); -- } -- else -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_NOT_SUPPORTED, -- "Cannot get user for subject of type %s", -- g_type_name (G_TYPE_FROM_INSTANCE (subject))); -- } -- -- out: -- -- return session; --} -- --gboolean --polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *session) --{ -- char *seat; -- -- if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat)) -- { -- free (seat); -- return TRUE; -- } -- -- return FALSE; --} -- -- --gboolean --polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *session) --{ -- return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); --} -- diff --git a/extra/postgresql/postgresql.confd b/extra/postgresql/postgresql.confd deleted file mode 100644 index 6001c16d1..000000000 --- a/extra/postgresql/postgresql.confd +++ /dev/null @@ -1,11 +0,0 @@ -## -## Parameters to be passed to postgresql -## -## Default data directory location -#PGROOT="/var/lib/postgres" -## Passed to initdb if necessary -INITOPTS="--locale en_US.UTF-8" -## Default log file location -#PGLOG="/var/log/postgresql.log" -## Additional options to pass via pg_ctl's '-o' option -#PGOPTS="" diff --git a/extra/postgresql/postgresql.rcd b/extra/postgresql/postgresql.rcd deleted file mode 100755 index f3600b30b..000000000 --- a/extra/postgresql/postgresql.rcd +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/postgresql - -# Default PGROOT if it wasn't defined in the conf.d file -PGROOT=${PGROOT:-/var/lib/postgres} -PGLOG=${PGLOG:-/var/log/postgresql.log} -PGCTL_BIN=/usr/bin/pg_ctl -PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w) -[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS") - -postgres_init() { - # initialization - if [[ ! -d "$PGROOT/data" ]]; then - mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT" - su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'" - fi - if [[ ! -e "$PGLOG" ]]; then - touch "$PGLOG" - chown postgres "$PGLOG" - fi -} - -do_postgres() { - su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}" "$@")" -} - -case $1 in - start) - postgres_init - stat_busy "Starting PostgreSQL" - if do_postgres start; then - add_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping PostgreSQL" - if do_postgres stop -m fast; then - rm_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - reload) - stat_busy "Reloading PostgreSQL" - if do_postgres reload; then - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - postgres_init - stat_busy "Restarting PostgreSQL" - if do_postgres restart -m fast; then - add_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - status) - stat_busy "Checking PostgreSQL status"; - ck_status postgresql - ;; - *) - echo "usage: $0 {start|stop|reload|restart|status}" - exit 1 -esac diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD deleted file mode 100644 index 801981082..000000000 --- a/extra/proftpd/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 165550 2012-08-23 12:54:55Z andrea $ -# Maintainer: -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4b -pkgrel=3 -epoch=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.proftpd.org/" -license=('GPL') -depends=('libmysqlclient' 'postgresql-libs') -backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -install=${pkgname}.install -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service' - 'proftpd.tmpfiles') -md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2' - 'e5b9bd78029a15f82994efcb7ed2e9fb' - 'c439a0a1dbc21b604d8382da87aa021b' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736' - '5709f27ebcbe906e52963ea75e4fde64' - '907b149a120b046f05647c73502e23c9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ - --sysconfdir=/etc \ - --localstatedir=/run/proftpd \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls \ - --with-systemd - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - - install -d "${pkgdir}/usr/lib/systemd/system/" - install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" - install -Dm644 "${srcdir}"/proftpd.tmpfiles \ - "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf - - # /run is tmpfs - rmdir "${pkgdir}"/run/{proftpd,} -} diff --git a/extra/proftpd/proftpd b/extra/proftpd/proftpd deleted file mode 100755 index 9ea1d47fc..000000000 --- a/extra/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /run/proftpd/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/extra/proftpd/proftpd.conf.d b/extra/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/extra/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/extra/proftpd/proftpd.install b/extra/proftpd/proftpd.install deleted file mode 100644 index 6d9888496..000000000 --- a/extra/proftpd/proftpd.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - systemd-tmpfiles --create proftpd.conf -} diff --git a/extra/proftpd/proftpd.logrotate b/extra/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/extra/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/extra/proftpd/proftpd.service b/extra/proftpd/proftpd.service deleted file mode 100644 index a07d17f46..000000000 --- a/extra/proftpd/proftpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=ProFTPD FTP Server -After=network.target - -[Service] -Type=forking -PIDFile=/run/proftpd/proftpd.pid -ExecStart=/usr/sbin/proftpd -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy = multi-user.target diff --git a/extra/proftpd/proftpd.tmpfiles b/extra/proftpd/proftpd.tmpfiles deleted file mode 100644 index 241dc7cb1..000000000 --- a/extra/proftpd/proftpd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/proftpd 0755 root root diff --git a/extra/psi/affiliationlistconfigmuc.patch b/extra/psi/affiliationlistconfigmuc.patch deleted file mode 100644 index dd9119e78..000000000 --- a/extra/psi/affiliationlistconfigmuc.patch +++ /dev/null @@ -1,92 +0,0 @@ -commit ef1df7a42e7aa7b6bfb1dca5b86b303f71739fc4 -Author: Rion <rion4ik@gmail.com> -Date: Fri Dec 3 16:39:56 2010 +0500 - - Fixed changing affiliations list from muc config dialog - -diff --git a/src/mucaffiliationsview.cpp b/src/mucaffiliationsview.cpp -index 8632c43..94adcec 100644 ---- a/src/mucaffiliationsview.cpp -+++ b/src/mucaffiliationsview.cpp -@@ -33,30 +33,6 @@ MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent) - setDropIndicatorShown(true); - } - --bool MUCAffiliationsView::addToCurrent(const QString& j) --{ -- QModelIndex index = currentIndex(); -- if (!index.isValid()) -- return false; -- -- if (index.parent().isValid()) -- index = index.parent(); -- -- if (!index.parent().isValid()) { -- XMPP::Jid jid(j); -- if (!jid.isValid()) -- return false; -- -- // TODO: Check if the user is already in the list -- -- int row = model()->rowCount(index); -- model()->insertRows(row,1,index); -- model()->setData(model()->index(row,0,index),QVariant(jid.bare())); -- return true; -- } -- return false; --} -- - void MUCAffiliationsView::removeCurrent() - { - QModelIndex index = currentIndex(); -diff --git a/src/mucaffiliationsview.h b/src/mucaffiliationsview.h -index 11f1446..54ee0ff 100644 ---- a/src/mucaffiliationsview.h -+++ b/src/mucaffiliationsview.h -@@ -32,7 +32,6 @@ public: - - public slots: - void removeCurrent(); -- bool addToCurrent(const QString&); - - signals: - void addEnabled(bool); -diff --git a/src/mucconfigdlg.cpp b/src/mucconfigdlg.cpp -index a10f14e..dcf4a35 100644 ---- a/src/mucconfigdlg.cpp -+++ b/src/mucconfigdlg.cpp -@@ -158,9 +158,31 @@ void MUCConfigDlg::add() - { - bool ok; - QString text = QInputDialog::getText(this, tr("Add affiliation"), tr("Enter the JID of the user:"), QLineEdit::Normal, "", &ok); -- if (ok) { -- if (text.isEmpty() || !ui_.tv_affiliations->addToCurrent(text)) -- QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID.")); -+ if (ok && ui_.tv_affiliations->currentIndex().isValid()) { -+ if (!text.isEmpty()) { -+ -+ QModelIndex index = affiliations_proxy_model_->mapToSource(ui_.tv_affiliations->currentIndex()); -+ -+ if (index.parent().isValid()) -+ index = index.parent(); -+ -+ if (!index.parent().isValid()) { -+ XMPP::Jid jid(text); -+ if (jid.isValid()) { -+ -+ // TODO: Check if the user is already in the list -+ -+ int row = affiliations_model_->rowCount(index); -+ affiliations_model_->insertRows(row,1,index); -+ QModelIndex newIndex = affiliations_model_->index(row,0,index); -+ affiliations_model_->setData(newIndex, QVariant(jid.bare())); -+ ui_.tv_affiliations->setCurrentIndex(affiliations_proxy_model_->mapFromSource(newIndex)); -+ return; -+ } -+ } -+ } -+ -+ QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID.")); - } - } - diff --git a/extra/psi/configureroomcrash.patch b/extra/psi/configureroomcrash.patch deleted file mode 100644 index 99fa30794..000000000 --- a/extra/psi/configureroomcrash.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd -Author: Michail Pishchagin <mblsha@users.sourceforge.net> -Date: Tue Oct 19 11:26:31 2010 +0400 - - Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087) - Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+ - -diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp -index 722b762..fd0a830 100644 ---- a/src/mucaffiliationsmodel.cpp -+++ b/src/mucaffiliationsmodel.cpp -@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists() - - void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a) - { -+ emit layoutAboutToBeChanged(); - enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false; - QModelIndex index = affiliationListIndex(a); - if (hasChildren(index)) { - removeRows(0,rowCount(index),index); - } -+ emit layoutChanged(); - } - - void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b) - { -+ emit layoutAboutToBeChanged(); - QModelIndex index = affiliationListIndex(a); - enabled_[(AffiliationListIndex) index.row()] = b; - emit layoutChanged(); -@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items) - foreach(MUCItem item, items) { - QModelIndex list = affiliationListIndex(item.affiliation()); - if (list.isValid() && !item.jid().isEmpty()) { -+ if (!dirty) { -+ emit layoutAboutToBeChanged(); -+ } - int row = rowCount(list); - if (row == 0) { - enabled_[(AffiliationListIndex) list.row()] = true; diff --git a/extra/psi/gcc-47.patch b/extra/psi/gcc-47.patch deleted file mode 100644 index 64cb83fba..000000000 --- a/extra/psi/gcc-47.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- iris/src/irisnet/corelib/netinterface_unix.cpp.orig 2012-01-07 19:46:39.493999646 +0100 -+++ iris/src/irisnet/corelib/netinterface_unix.cpp 2012-01-07 19:46:57.251002321 +0100 -@@ -33,6 +33,7 @@ - #include <net/route.h> - #include <netinet/in.h> - #include <errno.h> -+#include <unistd.h> - - // for solaris - #ifndef SIOCGIFCONF diff --git a/extra/psi/input-validation.patch b/extra/psi/input-validation.patch deleted file mode 100644 index 7260c80e1..000000000 --- a/extra/psi/input-validation.patch +++ /dev/null @@ -1,257 +0,0 @@ -commit c68fdd9926a38b2820bc5df97fd1905355a2640d -Author: rion <rion4ik@gmail.com> -Date: Fri Oct 7 22:19:05 2011 +0600 - - Fixed QLabel CVE - ---- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000 -+++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000 -@@ -1,105 +1,118 @@ --<ui version="4.0" > -+<?xml version="1.0" encoding="UTF-8"?> -+<ui version="4.0"> - <class>CertificateDisplay</class> -- <widget class="QDialog" name="CertificateDisplay" > -- <property name="geometry" > -+ <widget class="QDialog" name="CertificateDisplay"> -+ <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> -- <width>518</width> -+ <width>525</width> - <height>369</height> - </rect> - </property> -- <property name="windowTitle" > -+ <property name="windowTitle"> - <string>Certificate Information</string> - </property> -- <layout class="QVBoxLayout" > -- <property name="margin" > -+ <layout class="QVBoxLayout"> -+ <property name="spacing"> -+ <number>6</number> -+ </property> -+ <property name="margin"> - <number>11</number> - </property> -- <property name="spacing" > -- <number>6</number> -- </property> - <item> -- <layout class="QHBoxLayout" > -- <property name="margin" > -+ <layout class="QHBoxLayout"> -+ <property name="spacing"> -+ <number>6</number> -+ </property> -+ <property name="margin"> - <number>0</number> - </property> -- <property name="spacing" > -- <number>6</number> -- </property> - <item> -- <layout class="QVBoxLayout" > -- <property name="margin" > -+ <layout class="QVBoxLayout"> -+ <property name="spacing"> -+ <number>6</number> -+ </property> -+ <property name="margin"> - <number>0</number> - </property> -- <property name="spacing" > -- <number>6</number> -- </property> - <item> -- <widget class="QLabel" name="textLabel4" > -- <property name="text" > -+ <widget class="QLabel" name="textLabel4"> -+ <property name="text"> - <string>Certificate Validation:</string> - </property> - </widget> - </item> - <item> -- <widget class="QLabel" name="lb_valid" > -- <property name="text" > -+ <widget class="QLabel" name="lb_valid"> -+ <property name="text"> - <string/> - </property> -+ <property name="textFormat"> -+ <enum>Qt::PlainText</enum> -+ </property> - </widget> - </item> - <item> -- <widget class="QLabel" name="textLabel2" > -- <property name="text" > -+ <widget class="QLabel" name="textLabel2"> -+ <property name="text"> - <string>Valid From:</string> - </property> - </widget> - </item> - <item> -- <widget class="QLabel" name="lb_notBefore" > -- <property name="text" > -+ <widget class="QLabel" name="lb_notBefore"> -+ <property name="text"> - <string/> - </property> -+ <property name="textFormat"> -+ <enum>Qt::PlainText</enum> -+ </property> - </widget> - </item> - <item> -- <widget class="QLabel" name="textLabel3" > -- <property name="text" > -+ <widget class="QLabel" name="textLabel3"> -+ <property name="text"> - <string>Valid Until:</string> - </property> - </widget> - </item> - <item> -- <widget class="QLabel" name="lb_notAfter" > -- <property name="text" > -+ <widget class="QLabel" name="lb_notAfter"> -+ <property name="text"> - <string/> - </property> -+ <property name="textFormat"> -+ <enum>Qt::PlainText</enum> -+ </property> - </widget> - </item> - <item> -- <widget class="QLabel" name="textLabel1" > -- <property name="text" > -+ <widget class="QLabel" name="textLabel1"> -+ <property name="text"> - <string>Serial Number:</string> - </property> - </widget> - </item> - <item> -- <widget class="QLabel" name="lb_sn" > -- <property name="text" > -+ <widget class="QLabel" name="lb_sn"> -+ <property name="text"> - <string/> - </property> -+ <property name="textFormat"> -+ <enum>Qt::PlainText</enum> -+ </property> - </widget> - </item> - <item> - <spacer> -- <property name="orientation" > -+ <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> -- <property name="sizeType" > -+ <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> -- <property name="sizeHint" > -+ <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>106</height> -@@ -110,14 +123,14 @@ - </layout> - </item> - <item> -- <widget class="QTextBrowser" name="tb_cert" > -- <property name="minimumSize" > -+ <widget class="QTextBrowser" name="tb_cert"> -+ <property name="minimumSize"> - <size> - <width>350</width> - <height>300</height> - </size> - </property> -- <property name="horizontalScrollBarPolicy" > -+ <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - </widget> -@@ -125,35 +138,35 @@ - </layout> - </item> - <item> -- <widget class="Line" name="line1" > -- <property name="frameShape" > -+ <widget class="Line" name="line1"> -+ <property name="frameShape"> - <enum>QFrame::HLine</enum> - </property> -- <property name="frameShadow" > -+ <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> -- <property name="orientation" > -+ <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item> -- <layout class="QHBoxLayout" > -- <property name="margin" > -+ <layout class="QHBoxLayout"> -+ <property name="spacing"> -+ <number>6</number> -+ </property> -+ <property name="margin"> - <number>0</number> - </property> -- <property name="spacing" > -- <number>6</number> -- </property> - <item> - <spacer> -- <property name="orientation" > -+ <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> -- <property name="sizeType" > -+ <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> -- <property name="sizeHint" > -+ <property name="sizeHint" stdset="0"> - <size> - <width>421</width> - <height>20</height> -@@ -162,17 +175,17 @@ - </spacer> - </item> - <item> -- <widget class="QPushButton" native="1" name="pb_close"> -- <property name="text"> -- <string>Close</string> -- </property> -- </widget> -+ <widget class="QPushButton" name="pb_close"> -+ <property name="text"> -+ <string>Close</string> -+ </property> -+ </widget> - </item> - </layout> - </item> - </layout> - </widget> -- <layoutdefault spacing="6" margin="11" /> -+ <layoutdefault spacing="6" margin="11"/> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <tabstops> - <tabstop>tb_cert</tabstop> - diff --git a/extra/psutils/PKGBUILD b/extra/psutils/PKGBUILD deleted file mode 100644 index e5c9af4ae..000000000 --- a/extra/psutils/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 137768 2011-09-10 17:03:05Z pierre $ -# Maintainer: eric <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=psutils -pkgver=1.17 -pkgrel=3 -arch=('i686' 'x86_64') -pkgdesc="A set of postscript utilities" -url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html" -license=('custom') -depends=('glibc' 'ghostscript') -provides=('psutils-lprng') -replaces=('psutils-lprng') -options=('!makeflags') -source=("ftp://ftp.archlinux.org/other/psutils/${pkgname}-${pkgver}.tar.gz" - 'psutils-1.17.diff') -md5sums=('b161522f3bd1507655326afa7db4a0ad' - '2b49e9e796000b42f42804d4b50a2be1') - -build() { - cd "${srcdir}/${pkgname}" - patch -Np1 -i "${srcdir}/psutils-1.17.diff" - make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ - INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ - MANDIR="${pkgdir}/usr/share/man/man1" -} - -package() { - cd "${srcdir}/${pkgname}" - install -d -m755 "${pkgdir}/usr/include" - install -d -m755 "${pkgdir}/usr/share/man" - make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ - INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ - MANDIR="${pkgdir}/usr/share/man/man1" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/extra/psutils/psutils-1.17.diff b/extra/psutils/psutils-1.17.diff deleted file mode 100644 index 4af32bd7f..000000000 --- a/extra/psutils/psutils-1.17.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix ---- psutils.orig/Makefile.unix Tue Mar 11 14:52:59 1997 -+++ psutils/Makefile.unix Thu Jan 18 20:53:36 2001 -@@ -19,16 +19,16 @@ - # psnup puts multiple logical pages on one physical page - # psresize scales and moves pages to fit on different paper sizes - --PAPER=a4 -+PAPER=letter - - # Makefile for PSUtils under Unix - - OS = UNIX - --BINDIR = /usr/local/bin -+BINDIR = /usr/bin - SCRIPTDIR = $(BINDIR) --INCLUDEDIR = /usr/local/share/psutils --PERL = /usr/local/bin/perl -+INCLUDEDIR = /usr/share/psutils -+PERL = /usr/bin/perl - - BINMODE = 0755 - MANMODE = 0644 -@@ -36,7 +36,7 @@ - INSTALL = install -c -m $(BINMODE) - INSTALLMAN = install -c -m $(MANMODE) - MANEXT = 1 --MANDIR = /usr/local/share/man/man$(MANEXT) -+MANDIR = /usr/man/man$(MANEXT) - - CC = gcc - CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall diff --git a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch deleted file mode 100644 index 93167b79b..000000000 --- a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sat, 26 May 2012 02:58:11 +0200 -Subject: [PATCH] Remove usage of deprecated udev_get_*_path - -These symbols were removed in libudev.so.1.0.0. Replace them with -hardcoded strings. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/modules/module-udev-detect.c | 9 +++------ - src/modules/udev-util.c | 4 ++-- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c -index 1192194..31416bd 100644 ---- a/src/modules/module-udev-detect.c -+++ b/src/modules/module-udev-detect.c -@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { - pa_assert(u); - pa_assert(d); - -- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); -+ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); - accessible = access(cd, R_OK|W_OK) >= 0; - pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); - -@@ -621,7 +621,6 @@ fail: - } - - static int setup_inotify(struct userdata *u) { -- char *dev_snd; - int r; - - if (u->inotify_fd >= 0) -@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { - return -1; - } - -- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); -- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); -- pa_xfree(dev_snd); -+ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); - - if (r < 0) { - int saved_errno = errno; -diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c -index 2f18bc4..b0bb17d 100644 ---- a/src/modules/udev-util.c -+++ b/src/modules/udev-util.c -@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - --- -1.7.10.2 - diff --git a/extra/pymad/PKGBUILD b/extra/pymad/PKGBUILD deleted file mode 100644 index 2c145e71e..000000000 --- a/extra/pymad/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 150562 2012-02-18 14:43:39Z pierre $ -# Maintainer: Mark Rosenstand <mark@archlinux.org -# Contributor: Corrado Primier <cp663137@stud.polimi.it> - -pkgname=pymad -pkgver=0.6 -pkgrel=4 -pkgdesc="Python interface to libmad." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.spacepants.org/src/pymad/" -license=('LGPL') -depends=('libmad' 'python2') -source=("http://www.spacepants.org/src/pymad/download/$pkgname-$pkgver.tar.gz") -md5sums=('a1405fb4b610348565c8d0e400c5ff18') - -build() { - cd $srcdir/$pkgname-$pkgver - python2 config_unix.py --prefix=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver - python2 setup.py install --root=$pkgdir -} diff --git a/extra/pyqt/fix-pyuic4.patch b/extra/pyqt/fix-pyuic4.patch deleted file mode 100644 index 2173443d8..000000000 --- a/extra/pyqt/fix-pyuic4.patch +++ /dev/null @@ -1,91 +0,0 @@ -# HG changeset patch -# User Phil Thompson <phil at riverbankcomputing.com> -# Date 2012-07-13 13:39:28 +0100 -# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a -# Parent fd0f3da9d79ca9858d10a20c15fb85456cb832d7 -Fixed a regression in pyuic's handling of custom widgets. - -diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py ---- a/pyuic/uic/Compiler/qobjectcreator.py -+++ b/pyuic/uic/Compiler/qobjectcreator.py -@@ -1,6 +1,6 @@ - ############################################################################# - ## --## Copyright (C) 2011 Riverbank Computing Limited. -+## Copyright (C) 2012 Riverbank Computing Limited. - ## Copyright (C) 2006 Thorsten Marek. - ## All right reserved. - ## -@@ -100,7 +100,6 @@ - assert widgetClass not in self._widgets - self._widgets[widgetClass] = (baseClass, module) - -- - def _resolveBaseclass(self, baseClass): - try: - for x in range(0, 10): -@@ -114,19 +113,17 @@ - except KeyError: - raise ValueError("unknown baseclass %s" % baseClass) - -- - def search(self, cls): - try: -- self._usedWidgets.add(cls) - baseClass = self._resolveBaseclass(self._widgets[cls][0]) - DEBUG("resolved baseclass of %s: %s" % (cls, baseClass)) -- -- return type(cls, (baseClass,), -- {"module" : ""}) -- - except KeyError: - return None - -+ self._usedWidgets.add(cls) -+ -+ return type(cls, (baseClass, ), {"module" : ""}) -+ - def _writeImportCode(self): - imports = {} - for widget in self._usedWidgets: -diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py ---- a/pyuic/uic/objcreator.py -+++ b/pyuic/uic/objcreator.py -@@ -102,19 +102,26 @@ - self._modules.append(self._customWidgets) - - def createQObject(self, classname, *args, **kwargs): -- # Handle scoped names, typically static factory methods. -- parts = classname.split('.') -- factory = self.findQObjectType(parts[0]) -+ # Handle regular and custom widgets. -+ factory = self.findQObjectType(classname) - -- if factory is not None: -- for part in parts[1:]: -- factory = getattr(factory, part, None) -- if factory is None: -- break -- else: -- return self._cpolicy.instantiate(factory, *args, **kwargs) -+ if factory is None: -+ # Handle scoped names, typically static factory methods. -+ parts = classname.split('.') - -- raise NoSuchWidgetError(classname) -+ if len(parts) > 1: -+ factory = self.findQObjectType(parts[0]) -+ -+ if factory is not None: -+ for part in parts[1:]: -+ factory = getattr(factory, part, None) -+ if factory is None: -+ break -+ -+ if factory is None: -+ raise NoSuchWidgetError(classname) -+ -+ return self._cpolicy.instantiate(factory, *args, **kwargs) - - def invoke(self, rname, method, args=()): - return self._cpolicy.invoke(rname, method, args) diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch deleted file mode 100644 index 6055f9f35..000000000 --- a/extra/pyqt/fix-qthelp-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- PyQt-x11-gpl-4.9.1/configure.py~ 2012-02-13 20:16:11.418786488 +0000 -+++ PyQt-x11-gpl-4.9.1/configure.py 2012-02-13 20:16:50.561809527 +0000 -@@ -1261,7 +1261,7 @@ - opengl = (mname == "QtOpenGL") - - qt = [mname] -- if mname in ("QtOpenGL", "QtWebKit"): -+ if mname in ("QtHelp", "QtOpenGL", "QtWebKit"): - qt.append("QtCore") - - makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, diff --git a/extra/python-cairo/pycairo-1.8.10-pypath.patch b/extra/python-cairo/pycairo-1.8.10-pypath.patch deleted file mode 100644 index 07d4e1b7a..000000000 --- a/extra/python-cairo/pycairo-1.8.10-pypath.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up wafadmin/Tools/python.py.pypath wafadmin/Tools/python.py ---- wafadmin/Tools/python.py.pypath 2011-02-10 15:30:44.118506004 -0500 -+++ wafadmin/Tools/python.py 2011-02-10 15:32:50.922506002 -0500 -@@ -156,6 +156,9 @@ MACOSX_DEPLOYMENT_TARGET = %r - env.append_value('LINKFLAGS_PYEMBED',python_LDFLAGS.split()) - result=False - name='python'+env['PYTHON_VERSION'] -+ python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG') -+ if not python_config: -+ python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG') - if python_LIBDIR is not None: - path=[python_LIBDIR] - conf.log.write("\n\n# Trying LIBDIR: %r\n"%path) -@@ -169,6 +172,12 @@ MACOSX_DEPLOYMENT_TARGET = %r - path=[os.path.join(python_prefix,"libs")] - name='python'+env['PYTHON_VERSION'].replace('.','') - result=conf.check(lib=name,uselib='PYEMBED',libpath=path) -+ if not result and python_config: -+ conf.log.write("\n\n# try again with help of python-config\n") -+ for libstr in Utils.cmd_output("%s %s --libs"%(python,python_config)).strip().split(): -+ if(libstr.startswith('-lpython')): -+ name=libstr[2:] -+ result=conf.check(lib=name,uselib='PYEMBED',libpath=path) - if result: - env['LIBPATH_PYEMBED']=path - env.append_value('LIB_PYEMBED',name) -@@ -177,9 +186,6 @@ MACOSX_DEPLOYMENT_TARGET = %r - if(sys.platform=='win32'or sys.platform.startswith('os2')or sys.platform=='darwin'or Py_ENABLE_SHARED): - env['LIBPATH_PYEXT']=env['LIBPATH_PYEMBED'] - env['LIB_PYEXT']=env['LIB_PYEMBED'] -- python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG') -- if not python_config: -- python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG') - includes=[] - if python_config: - for incstr in Utils.cmd_output("%s %s --includes"%(python,python_config)).strip().split(): diff --git a/extra/python-pysqlite/ChangeLog b/extra/python-pysqlite/ChangeLog deleted file mode 100644 index 2f42c5de4..000000000 --- a/extra/python-pysqlite/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -2011-10-07 Angel Velasquez <angvp@archlinux.org> - * Updated to: 2.6.3 - * Added check function - -2009-08-06 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated to: 2.5.5 - -2009-07-19 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 2.5.5 - -2008-07-15 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 2.4.1 - diff --git a/extra/qemu/qemu-glibc-2.16-build.patch b/extra/qemu/qemu-glibc-2.16-build.patch deleted file mode 100644 index 08948fec6..000000000 --- a/extra/qemu/qemu-glibc-2.16-build.patch +++ /dev/null @@ -1,70 +0,0 @@ -From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" <rjones@redhat.com> -Date: Thu, 5 Jul 2012 14:28:03 +0100 -Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'. - -glibc 2.16 will remove the undocumented definition of 'struct siginfo' -from <bits/siginfo.h>. - -This change is already present in glibc 2.15.90, so qemu compilation -of certain targets (eg. cris-user) breaks. - -This struct was always typedef'd to be the same as 'siginfo_t' which -is what POSIX documents, so use that instead. - -Signed-off-by: Richard W.M. Jones <rjones@redhat.com> ---- - linux-user/signal.c | 8 ++++---- - user-exec.c | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/linux-user/signal.c b/linux-user/signal.c -index 43346dc..108dff9 100644 ---- a/linux-user/signal.c -+++ b/linux-user/signal.c -@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, - * Arguments to signal handler: - * - * a0 = signal number -- * a1 = pointer to struct siginfo -+ * a1 = pointer to siginfo_t - * a2 = pointer to struct ucontext - * - * $25 and PC point to the signal handler, $29 points to the -@@ -3255,7 +3255,7 @@ struct target_signal_frame { - }; - - struct rt_signal_frame { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - uint32_t tramp[2]; - }; -@@ -3474,9 +3474,9 @@ struct target_signal_frame { - }; - - struct rt_signal_frame { -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - uint8_t retcode[8]; /* Trampoline code. */ - }; -diff --git a/user-exec.c b/user-exec.c -index b2a4261..1a9c276 100644 ---- a/user-exec.c -+++ b/user-exec.c -@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - int cpu_signal_handler(int host_signum, void *pinfo, - void *puc) - { -- struct siginfo *info = pinfo; -+ siginfo_t *info = pinfo; - struct ucontext *uc = puc; - unsigned long pc = uc->uc_mcontext.sc_iaoq[0]; - uint32_t insn = *(uint32_t *)pc; --- -1.7.10.4 - diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD deleted file mode 100644 index fabfa0ec2..000000000 --- a/extra/qiv/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 148900 2012-02-05 11:54:52Z ibiru $ -# 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' 'mips64el') -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/extra/qt/disable-ssl-compression.patch b/extra/qt/disable-ssl-compression.patch deleted file mode 100644 index 443af57f3..000000000 --- a/extra/qt/disable-ssl-compression.patch +++ /dev/null @@ -1,68 +0,0 @@ -From d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001 -From: Richard Moore <rich@kde.org> -Date: Fri, 14 Sep 2012 00:13:08 +0100 -Subject: [PATCH] Disable SSL compression by default. - -Disable SSL compression by default since this appears to be the a likely -cause of the currently hyped CRIME attack. - -This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74 - -Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -Reviewed-by: Peter Hartmann <phartmann@rim.com> ---- - src/network/ssl/qssl.cpp | 5 +++-- - src/network/ssl/qsslconfiguration.cpp | 4 +++- - src/network/ssl/qsslconfiguration_p.h | 4 +++- - 3 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp -index 49e086f..9578178 100644 ---- a/src/network/ssl/qssl.cpp -+++ b/src/network/ssl/qssl.cpp -@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE - - By default, SslOptionDisableEmptyFragments is turned on since this causes - problems with a large number of servers. SslOptionDisableLegacyRenegotiation -- is also turned on, since it introduces a security risk. The other options -- are turned off. -+ is also turned on, since it introduces a security risk. -+ SslOptionDisableCompression is turned on to prevent the attack publicised by -+ CRIME. The other options are turned off. - - Note: Availability of above options depends on the version of the SSL - backend in use. -diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp -index 24c7b77..3a05f54 100644 ---- a/src/network/ssl/qsslconfiguration.cpp -+++ b/src/network/ssl/qsslconfiguration.cpp -@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const - d->privateKey.isNull() && - d->peerCertificate.isNull() && - d->peerCertificateChain.count() == 0 && -- d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)); -+ d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments -+ |QSsl::SslOptionDisableLegacyRenegotiation -+ |QSsl::SslOptionDisableCompression)); - } - - /*! -diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h -index 74f17cd..c36b651 100644 ---- a/src/network/ssl/qsslconfiguration_p.h -+++ b/src/network/ssl/qsslconfiguration_p.h -@@ -83,7 +83,9 @@ public: - : protocol(QSsl::SecureProtocols), - peerVerifyMode(QSslSocket::AutoVerifyPeer), - peerVerifyDepth(0), -- sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation) -+ sslOptions(QSsl::SslOptionDisableEmptyFragments -+ |QSsl::SslOptionDisableLegacyRenegotiation -+ |QSsl::SslOptionDisableCompression) - { } - - QSslCertificate peerCertificate; --- -1.7.10 - diff --git a/extra/qt/fix-assistant-crash.patch b/extra/qt/fix-assistant-crash.patch deleted file mode 100644 index 67bbbc48b..000000000 --- a/extra/qt/fix-assistant-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 -+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 -@@ -944,8 +944,7 @@ - if (helpEngine.usesAppFont()) - font = helpEngine.appFont(); - -- const QWidgetList &widgets = qApp->allWidgets(); -- foreach (QWidget* widget, widgets) -+ foreach (QWidget* widget, QApplication::allWidgets()) - widget->setFont(font); - } - diff --git a/extra/qt/fix-qtscript-crash.patch b/extra/qt/fix-qtscript-crash.patch deleted file mode 100644 index 97b1cc62d..000000000 --- a/extra/qt/fix-qtscript-crash.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e6b7178bc2e62a37b4737695bced1b46bced9215 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@digia.com> -Date: Mon, 22 Oct 2012 15:17:19 +0200 -Subject: [PATCH] Fix mmap usage. - -Add missing MAP_NORESERVE and fix error checking. - -Special thanks to Olivier JG for debugging the issue. - -Task-number: QTBUG-27322 -Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a -Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> ---- - .../JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp -index 16d0fb1..e1237e4 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp -@@ -305,8 +305,8 @@ public: - randomLocation += (1 << 24); - randomLocation <<= 21; - #endif -- m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); -- if (!m_base) -+ m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); -+ if (m_base == MAP_FAILED) - CRASH(); - - // For simplicity, we keep all memory in m_freeList in a 'released' state. --- -1.8.0 - diff --git a/extra/qt/qsortfilterproxymodel.patch b/extra/qt/qsortfilterproxymodel.patch deleted file mode 100644 index 33770e47d..000000000 --- a/extra/qt/qsortfilterproxymodel.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 989e6c5ee6f3e38b24632ec5caf49c5b03d17aed Mon Sep 17 00:00:00 2001 -From: Stephen Kelly <stephen.kelly@kdab.com> -Date: Fri, 14 Sep 2012 15:42:34 +0200 -Subject: [PATCH] Fix crash when invalidating a QSortFilterProxyModel - -Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase. - -Task-number: QTBUG-27122 -Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8 -Reviewed-by: Olivier Goffart <ogoffart@woboq.com> ---- - src/gui/itemviews/qsortfilterproxymodel.cpp | 28 +++++++--- - .../tst_qsortfilterproxymodel.cpp | 61 ++++++++++++++++++++++ - 2 files changed, 83 insertions(+), 6 deletions(-) - -diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp -index d937b63..9fe224e 100644 ---- a/src/gui/itemviews/qsortfilterproxymodel.cpp -+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp -@@ -1036,18 +1036,34 @@ void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_pare - Mapping *m = it.value(); - QSet<int> rows_removed = handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical); - QSet<int> columns_removed = handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal); -- QVector<QModelIndex> mappedChildren = m->mapped_children; -- QVector<QModelIndex>::iterator it2 = mappedChildren.end(); -- while (it2 != mappedChildren.begin()) { -- --it2; -- const QModelIndex source_child_index = *it2; -+ -+ // We need to iterate over a copy of m->mapped_children because otherwise it may be changed by other code, invalidating -+ // the iterator it2. -+ // The m->mapped_children vector can be appended to with indexes which are no longer filtered -+ // out (in create_mapping) when this function recurses for child indexes. -+ const QVector<QModelIndex> mappedChildren = m->mapped_children; -+ QVector<int> indexesToRemove; -+ for (int i = 0; i < mappedChildren.size(); ++i) { -+ const QModelIndex source_child_index = mappedChildren.at(i); - if (rows_removed.contains(source_child_index.row()) || columns_removed.contains(source_child_index.column())) { -- it2 = mappedChildren.erase(it2); -+ indexesToRemove.push_back(i); - remove_from_mapping(source_child_index); - } else { - filter_changed(source_child_index); - } - } -+ QVector<int>::const_iterator removeIt = indexesToRemove.constEnd(); -+ const QVector<int>::const_iterator removeBegin = indexesToRemove.constBegin(); -+ -+ // We can't just remove these items from mappedChildren while iterating above and then -+ // do something like m->mapped_children = mappedChildren, because mapped_children might -+ // be appended to in create_mapping, and we would lose those new items. -+ // Because they are always appended in create_mapping, we can still remove them by -+ // position here. -+ while (removeIt != removeBegin) { -+ --removeIt; -+ m->mapped_children.remove(*removeIt); -+ } - } - - /*! --- -1.8.0 - diff --git a/extra/qt/undo-fix-jit-crash-on-x86_64.patch b/extra/qt/undo-fix-jit-crash-on-x86_64.patch deleted file mode 100644 index ac86a846b..000000000 --- a/extra/qt/undo-fix-jit-crash-on-x86_64.patch +++ /dev/null @@ -1,280 +0,0 @@ -Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow) - . - Cherry-picked from webkit commit - a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 -Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e -Author: Kent Hansen <kent.hansen@nokia.com> -Forwarded: not-needed -Applied-Upstream: yes -Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> -Reviewed-by: Kent Hansen <kent.hansen@nokia.com> ---- - .../javascriptcore/JavaScriptCore/ChangeLog | 27 +++++++++++++++++ - .../JavaScriptCore/JavaScriptCore.pri | 1 + - .../JavaScriptCore/jit/ExecutableAllocator.cpp | 21 +++++++++++++ - .../jit/ExecutableAllocatorFixedVMPool.cpp | 31 +++++++++++++------- - .../jit/ExecutableAllocatorPosix.cpp | 29 ++---------------- - .../jit/ExecutableAllocatorSymbian.cpp | 2 +- - .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp | 2 +- - .../javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++++++ - 8 files changed, 84 insertions(+), 39 deletions(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog -index 9cbf0c1..5ab23e6 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog -@@ -1,3 +1,30 @@ -+2010-07-08 Gavin Barraclough <barraclough@apple.com> -+ -+ Reviewed by Sam Weinig. -+ -+ https://bugs.webkit.org/show_bug.cgi?id=41641 -+ -+ Update compile flags to allow use of ExecutableAllocatorFixedVMPool on platforms -+ other than x86-64 (this may be useful on 32-bit platforms, too). -+ -+ Simplify ifdefs by dividing into thwo broad allocation strategies -+ (ENABLE_EXECUTABLE_ALLOCATOR_FIXED & ENABLE_EXECUTABLE_ALLOCATOR_DEMAND). -+ -+ Rename constant used in the code to have names descriptive of their purpose, -+ rather than their specific value on a given platform. -+ -+ * jit/ExecutableAllocator.cpp: -+ (JSC::ExecutableAllocator::reprotectRegion): -+ (JSC::ExecutableAllocator::cacheFlush): -+ * jit/ExecutableAllocatorFixedVMPool.cpp: -+ (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator): -+ (JSC::FixedVMPoolAllocator::free): -+ (JSC::ExecutablePool::systemAlloc): -+ * jit/ExecutableAllocatorPosix.cpp: -+ * jit/ExecutableAllocatorSymbian.cpp: -+ * jit/ExecutableAllocatorWin.cpp: -+ * wtf/Platform.h: -+ - 2010-08-24 Oliver Hunt <oliver@apple.com> - - Reviewed by Geoff Garen. -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri -index b061321..847f69c 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri -@@ -100,6 +100,7 @@ SOURCES += \ - interpreter/CallFrame.cpp \ - interpreter/Interpreter.cpp \ - interpreter/RegisterFile.cpp \ -+ jit/ExecutableAllocatorFixedVMPool.cpp \ - jit/ExecutableAllocatorPosix.cpp \ - jit/ExecutableAllocatorSymbian.cpp \ - jit/ExecutableAllocatorWin.cpp \ -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp -index f6b27ec..f0ebbab 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp -@@ -33,6 +33,27 @@ namespace JSC { - - size_t ExecutableAllocator::pageSize = 0; - -+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) -+void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) -+{ -+ if (!pageSize) -+ intializePageSize(); -+ -+ // Calculate the start of the page containing this region, -+ // and account for this extra memory within size. -+ intptr_t startPtr = reinterpret_cast<intptr_t>(start); -+ intptr_t pageStartPtr = startPtr & ~(pageSize - 1); -+ void* pageStart = reinterpret_cast<void*>(pageStartPtr); -+ size += (startPtr - pageStartPtr); -+ -+ // Round size up -+ size += (pageSize - 1); -+ size &= ~(pageSize - 1); -+ -+ mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); -+} -+#endif -+ - } - - #endif // HAVE(ASSEMBLER) -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp -index dd1db4e..16d0fb1 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp -@@ -27,25 +27,33 @@ - - #include "ExecutableAllocator.h" - --#include <errno.h> -+#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) - --#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64) -+#include <errno.h> - - #include "TCSpinLock.h" --#include <mach/mach_init.h> --#include <mach/vm_map.h> - #include <sys/mman.h> - #include <unistd.h> - #include <wtf/AVLTree.h> - #include <wtf/VMTags.h> - -+#if CPU(X86_64) -+ // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range). -+ #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb -+ #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb -+#else -+ // These limits are hopefully sensible on embedded platforms. -+ #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb -+ #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb -+#endif -+ -+// ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size). -+#define VM_POOL_ASLR (OS(DARWIN) && CPU(X86_64)) -+ - using namespace WTF; - - namespace JSC { - --#define TWO_GB (2u * 1024u * 1024u * 1024u) --#define SIXTEEN_MB (16u * 1024u * 1024u) -- - // FreeListEntry describes a free chunk of memory, stored in the freeList. - struct FreeListEntry { - FreeListEntry(void* pointer, size_t size) -@@ -291,9 +299,12 @@ public: - // for now instead of 2^26 bits of ASLR lets stick with 25 bits of randomization plus - // 2^24, which should put up somewhere in the middle of usespace (in the address range - // 0x200000000000 .. 0x5fffffffffff). -- intptr_t randomLocation = arc4random() & ((1 << 25) - 1); -+ intptr_t randomLocation = 0; -+#if VM_POOL_ASLR -+ randomLocation = arc4random() & ((1 << 25) - 1); - randomLocation += (1 << 24); - randomLocation <<= 21; -+#endif - m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); - if (!m_base) - CRASH(); -@@ -387,7 +398,7 @@ public: - // 16MB of allocations have been freed, sweep m_freeList - // coalescing any neighboring fragments. - m_countFreedSinceLastCoalesce += size; -- if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) { -+ if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) { - m_countFreedSinceLastCoalesce = 0; - coalesceFreeSpace(); - } -@@ -429,7 +440,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size) - SpinLockHolder lock_holder(&spinlock); - - if (!allocator) -- allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB); -+ allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE); - ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size}; - return alloc; - } -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp -index 2eb0c87..b04049c 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp -@@ -27,7 +27,7 @@ - - #include "ExecutableAllocator.h" - --#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN) -+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN) - - #include <sys/mman.h> - #include <unistd.h> -@@ -35,8 +35,6 @@ - - namespace JSC { - --#if !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) -- - void ExecutableAllocator::intializePageSize() - { - ExecutableAllocator::pageSize = getpagesize(); -@@ -57,29 +55,6 @@ void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc) - ASSERT_UNUSED(result, !result); - } - --#endif // !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) -- --#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) --void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) --{ -- if (!pageSize) -- intializePageSize(); -- -- // Calculate the start of the page containing this region, -- // and account for this extra memory within size. -- intptr_t startPtr = reinterpret_cast<intptr_t>(start); -- intptr_t pageStartPtr = startPtr & ~(pageSize - 1); -- void* pageStart = reinterpret_cast<void*>(pageStartPtr); -- size += (startPtr - pageStartPtr); -- -- // Round size up -- size += (pageSize - 1); -- size &= ~(pageSize - 1); -- -- mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); --} --#endif -- - } - --#endif // HAVE(ASSEMBLER) -+#endif -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp -index e82975c..9028f50 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp -@@ -22,7 +22,7 @@ - - #include "ExecutableAllocator.h" - --#if ENABLE(ASSEMBLER) && OS(SYMBIAN) -+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN) - - #include <e32hal.h> - #include <e32std.h> -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp -index e38323c..72a1d5f 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp -@@ -27,7 +27,7 @@ - - #include "ExecutableAllocator.h" - --#if ENABLE(ASSEMBLER) && OS(WINDOWS) -+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS) - - #include "windows.h" - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 700977e..d930ed7 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -1016,6 +1016,16 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ - #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0 - #endif - -+/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. -+ On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ -+#if ENABLE(ASSEMBLER) -+#if CPU(X86_64) -+#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 -+#else -+#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 -+#endif -+#endif -+ - #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS) - #define ENABLE_PAN_SCROLLING 1 - #endif --- -1.7.10.4 - diff --git a/extra/qtwebkit/enable-accelerated-compositing.patch b/extra/qtwebkit/enable-accelerated-compositing.patch deleted file mode 100644 index 13474cd6a..000000000 --- a/extra/qtwebkit/enable-accelerated-compositing.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: trunk/Source/WebCore/html/HTMLCanvasElement.cpp
-===================================================================
---- trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139541)
-+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139742)
-@@ -190,5 +190,5 @@
- Settings* settings = document()->settings();
- if (settings && settings->webGLEnabled()
--#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL)
-+#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
- && settings->acceleratedCompositingEnabled()
- #endif
diff --git a/extra/qtwebkit/fix-build.patch b/extra/qtwebkit/fix-build.patch deleted file mode 100644 index 46313bbe9..000000000 --- a/extra/qtwebkit/fix-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror qtwebkit-2.2.2-source/Source/WebKit.pri ---- qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror 2012-05-22 09:30:37.000000000 -0500 -+++ qtwebkit-2.2.2-source/Source/WebKit.pri 2012-05-22 09:51:42.126610618 -0500 -@@ -102,7 +102,7 @@ CONFIG -= warn_on - - # Treat warnings as errors on x86/Linux/GCC - linux-g++* { -- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -+ #!CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror - - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { - -diff -up webkit-qtwebkit/Source/common.pri.me webkit-qtwebkit/Source/common.pri ---- webkit-qtwebkit/Source/common.pri.me 2012-01-24 14:51:49.000000000 +0100 -+++ webkit-qtwebkit/Source/common.pri 2012-01-24 14:52:01.000000000 +0100 -@@ -3,12 +3,12 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -+#linux-g++ { -+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -+# message(Using gold linker) -+# QMAKE_LFLAGS+=-fuse-ld=gold -+#} -+#} - - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824 -diff -up webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h.me webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h diff --git a/extra/qtwebkit/glibc.patch b/extra/qtwebkit/glibc.patch deleted file mode 100644 index bd7cb9416..000000000 --- a/extra/qtwebkit/glibc.patch +++ /dev/null @@ -1,339 +0,0 @@ -diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am ---- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am 2011-12-21 12:50:19.000000000 +0100 -@@ -438,7 +438,6 @@ javascriptcore_sources += \ - Source/JavaScriptCore/wtf/gobject/GRefPtr.h \ - Source/JavaScriptCore/wtf/gobject/GTypedefs.h \ - Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ -- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \ - Source/JavaScriptCore/wtf/HashCountedSet.h \ - Source/JavaScriptCore/wtf/HashFunctions.h \ - Source/JavaScriptCore/wtf/HashIterators.h \ -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp 2011-12-21 12:50:19.000000000 +0100 -@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr<GList>(GL - g_list_free(ptr); - } - --template <> void freeOwnedGPtr<GCond>(GCond* ptr) --{ -- if (ptr) -- g_cond_free(ptr); --} -- --template <> void freeOwnedGPtr<GMutex>(GMutex* ptr) --{ -- if (ptr) -- g_mutex_free(ptr); --} -- - template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr) - { - if (ptr) -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2011-12-21 12:50:19.000000000 +0100 -@@ -35,8 +35,6 @@ namespace WTF { - template <typename T> inline void freeOwnedGPtr(T* ptr); - template<> void freeOwnedGPtr<GError>(GError*); - template<> void freeOwnedGPtr<GList>(GList*); --template<> void freeOwnedGPtr<GCond>(GCond*); --template<> void freeOwnedGPtr<GMutex>(GMutex*); - template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*); - template<> void freeOwnedGPtr<GDir>(GDir*); - -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-12-21 12:50:19.000000000 +0100 -@@ -39,7 +39,6 @@ typedef void* gpointer; - typedef struct _GAsyncResult GAsyncResult; - typedef struct _GCancellable GCancellable; - typedef struct _GCharsetConverter GCharsetConverter; --typedef struct _GCond GCond; - typedef struct _GDir GDir; - typedef struct _GdkAtom* GdkAtom; - typedef struct _GdkCursor GdkCursor; -@@ -52,7 +51,6 @@ typedef struct _GFile GFile; - typedef struct _GHashTable GHashTable; - typedef struct _GInputStream GInputStream; - typedef struct _GList GList; --typedef struct _GMutex GMutex; - typedef struct _GPatternSpec GPatternSpec; - typedef struct _GPollableOutputStream GPollableOutputStream; - typedef struct _GSocketClient GSocketClient; -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 2011-12-21 12:52:25.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp 2011-12-21 12:52:28.000000000 +0100 -@@ -1,248 +0,0 @@ --/* -- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. 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. -- * 3. Neither the name of Apple Inc. ("Apple") nor the names of -- * its contributors may be used to endorse or promote products derived -- * from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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. -- */ -- --#include "config.h" --#include "Threading.h" -- --#if !USE(PTHREADS) -- --#include "CurrentTime.h" --#include "HashMap.h" --#include "MainThread.h" --#include "RandomNumberSeed.h" --#include <wtf/StdLibExtras.h> -- --#include <glib.h> --#include <limits.h> -- --namespace WTF { -- --typedef HashMap<ThreadIdentifier, GThread*> ThreadMap; -- --static Mutex* atomicallyInitializedStaticMutex; -- --static Mutex& threadMapMutex() --{ -- DEFINE_STATIC_LOCAL(Mutex, mutex, ()); -- return mutex; --} -- --void initializeThreading() --{ -- if (!g_thread_supported()) -- g_thread_init(NULL); -- ASSERT(g_thread_supported()); -- -- if (!atomicallyInitializedStaticMutex) { -- atomicallyInitializedStaticMutex = new Mutex; -- threadMapMutex(); -- initializeRandomNumberGenerator(); -- } --} -- --void lockAtomicallyInitializedStaticMutex() --{ -- ASSERT(atomicallyInitializedStaticMutex); -- atomicallyInitializedStaticMutex->lock(); --} -- --void unlockAtomicallyInitializedStaticMutex() --{ -- atomicallyInitializedStaticMutex->unlock(); --} -- --static ThreadMap& threadMap() --{ -- DEFINE_STATIC_LOCAL(ThreadMap, map, ()); -- return map; --} -- --static ThreadIdentifier identifierByGthreadHandle(GThread*& thread) --{ -- MutexLocker locker(threadMapMutex()); -- -- ThreadMap::iterator i = threadMap().begin(); -- for (; i != threadMap().end(); ++i) { -- if (i->second == thread) -- return i->first; -- } -- -- return 0; --} -- --static ThreadIdentifier establishIdentifierForThread(GThread*& thread) --{ -- ASSERT(!identifierByGthreadHandle(thread)); -- -- MutexLocker locker(threadMapMutex()); -- -- static ThreadIdentifier identifierCount = 1; -- -- threadMap().add(identifierCount, thread); -- -- return identifierCount++; --} -- --static GThread* threadForIdentifier(ThreadIdentifier id) --{ -- MutexLocker locker(threadMapMutex()); -- -- return threadMap().get(id); --} -- --static void clearThreadForIdentifier(ThreadIdentifier id) --{ -- MutexLocker locker(threadMapMutex()); -- -- ASSERT(threadMap().contains(id)); -- -- threadMap().remove(id); --} -- --ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*) --{ -- GThread* thread; -- if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) { -- LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data); -- return 0; -- } -- -- ThreadIdentifier threadID = establishIdentifierForThread(thread); -- return threadID; --} -- --void initializeCurrentThreadInternal(const char*) --{ --} -- --int waitForThreadCompletion(ThreadIdentifier threadID, void** result) --{ -- ASSERT(threadID); -- -- GThread* thread = threadForIdentifier(threadID); -- -- void* joinResult = g_thread_join(thread); -- if (result) -- *result = joinResult; -- -- clearThreadForIdentifier(threadID); -- return 0; --} -- --void detachThread(ThreadIdentifier) --{ --} -- --ThreadIdentifier currentThread() --{ -- GThread* currentThread = g_thread_self(); -- if (ThreadIdentifier id = identifierByGthreadHandle(currentThread)) -- return id; -- return establishIdentifierForThread(currentThread); --} -- --void yield() --{ -- g_thread_yield(); --} -- --Mutex::Mutex() -- : m_mutex(g_mutex_new()) --{ --} -- --Mutex::~Mutex() --{ --} -- --void Mutex::lock() --{ -- g_mutex_lock(m_mutex.get()); --} -- --bool Mutex::tryLock() --{ -- return g_mutex_trylock(m_mutex.get()); --} -- --void Mutex::unlock() --{ -- g_mutex_unlock(m_mutex.get()); --} -- --ThreadCondition::ThreadCondition() -- : m_condition(g_cond_new()) --{ --} -- --ThreadCondition::~ThreadCondition() --{ --} -- --void ThreadCondition::wait(Mutex& mutex) --{ -- g_cond_wait(m_condition.get(), mutex.impl().get()); --} -- --bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime) --{ -- // Time is in the past - return right away. -- if (absoluteTime < currentTime()) -- return false; -- -- // Time is too far in the future for g_cond_timed_wait - wait forever. -- if (absoluteTime > INT_MAX) { -- wait(mutex); -- return true; -- } -- -- int timeSeconds = static_cast<int>(absoluteTime); -- int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) * 1000000.0); -- -- GTimeVal targetTime; -- targetTime.tv_sec = timeSeconds; -- targetTime.tv_usec = timeMicroseconds; -- -- return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime); --} -- --void ThreadCondition::signal() --{ -- g_cond_signal(m_condition.get()); --} -- --void ThreadCondition::broadcast() --{ -- g_cond_broadcast(m_condition.get()); --} -- -- --} -- --#endif // !USE(PTHREADS) -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h 2011-12-21 12:50:19.000000000 +0100 -@@ -44,8 +44,6 @@ - - #if USE(PTHREADS) - #include <pthread.h> --#elif PLATFORM(GTK) --#include "GOwnPtr.h" - #endif - - #if PLATFORM(QT) -@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri - typedef void* PlatformReadWriteLock; - #endif - typedef pthread_cond_t PlatformCondition; --#elif PLATFORM(GTK) --typedef GOwnPtr<GMutex> PlatformMutex; --typedef void* PlatformReadWriteLock; // FIXME: Implement. --typedef GOwnPtr<GCond> PlatformCondition; - #elif PLATFORM(QT) - typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; - typedef void* PlatformReadWriteLock; // FIXME: Implement. diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD deleted file mode 100644 index 80140f70a..000000000 --- a/extra/quodlibet/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 164824 2012-08-06 21:35:32Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=quodlibet -pkgver=2.4.1 -pkgrel=1.1 -pkgdesc="An audio player written in pygtk" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://code.google.com/p/quodlibet/" -depends=('gstreamer0.10-python' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' - 'gstreamer0.10-ugly-plugins' 'mutagen' 'pygtk') -makedepends=('intltool') -optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' - 'gstreamer0.10-bad-plugins: for MPEG-4 (AAC) and Musepack support' - 'python2-dbus: for dbus support' - 'notification-daemon: for notification support' - 'libgpod: for ipod support' - 'python2-feedparser: for audio feeds (podcast) support' - 'udisks: for media devices support' - 'media-player-info: for media devices support') -options=('!makeflags') -source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('4db812f0b447805a27ae8f25517623205712b75e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#env python#env python2#' *.py quodlibet/util/fmps.py - sed -i 's#libudev.so.0#libudev.so.1#' quodlibet/devices/__init__.py - ./setup.py build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./setup.py install --prefix="${pkgdir}/usr" - install -D -m644 quodlibet/images/hicolor/64x64/apps/exfalso.png "${pkgdir}/usr/share/pixmaps/exfalso.png" - install -D -m644 quodlibet/images/hicolor/64x64/apps/quodlibet.png "${pkgdir}/usr/share/pixmaps/quodlibet.png" -} diff --git a/extra/quota-tools/LICENSE b/extra/quota-tools/LICENSE deleted file mode 100644 index 4bae71589..000000000 --- a/extra/quota-tools/LICENSE +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 1980, 1990 Regents of the University of California. All - * rights reserved. - * - * This code is derived from software contributed to Berkeley by Robert Elz at - * The University of Melbourne. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * 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. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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/extra/quota-tools/nulls.diff b/extra/quota-tools/nulls.diff deleted file mode 100644 index 97c5bc482..000000000 --- a/extra/quota-tools/nulls.diff +++ /dev/null @@ -1,20 +0,0 @@ -#Description: Avoid memory corruption of NULL address -#Author: Petr Pisar - ---- quota/quotasys.c 2010-02-18 09:44:11.000000000 +0100 -+++ quota-tools/quotasys.c 2010-05-05 08:02:53.000000000 +0200 -@@ -746,9 +746,12 @@ - kernel_qfmt_num = 0; - if (!stat("/proc/fs/xfs/stat", &st)) - kernel_qfmt[kernel_qfmt_num++] = QF_XFS; -- else -- if (!quotactl(QCMD(Q_XGETQSTAT, 0), NULL, 0, NULL) || (errno != EINVAL && errno != ENOSYS)) -+ else { -+ fs_quota_stat_t dummy; -+ -+ if (!quotactl(QCMD(Q_XGETQSTAT, 0), "/dev/root", 0, (void *)&dummy) || (errno != EINVAL && errno != ENOSYS)) - kernel_qfmt[kernel_qfmt_num++] = QF_XFS; -+ } - /* Detect new kernel interface; Assume generic interface unless we can prove there is not one... */ - if (!stat("/proc/sys/fs/quota", &st) || errno != ENOENT) { - kernel_iface = IFACE_GENERIC; diff --git a/extra/quota-tools/quotaon.diff b/extra/quota-tools/quotaon.diff deleted file mode 100644 index 6a43cee6c..000000000 --- a/extra/quota-tools/quotaon.diff +++ /dev/null @@ -1,216 +0,0 @@ -# Description: Fix quotaon to work with XFS and print all informational messages only in verbose mode -# Author: Jan Kara - -diff -u quota/quotaon.c quota-tools/quotaon.c ---- quota/quotaon.c 2010-07-28 11:14:02.000000000 +0200 -+++ quota-tools/quotaon.c 2010-06-15 10:11:30.000000000 +0200 -@@ -42,6 +42,7 @@ - #include <getopt.h> - #include <string.h> - #include <stdlib.h> -+#include <stdarg.h> - - #include "quotaon.h" - #include "quota.h" -@@ -145,6 +146,19 @@ - } - } - -+int pinfo(char *fmt, ...) -+{ -+ va_list arg; -+ int ret; -+ -+ if (!(flags & FL_VERBOSE)) -+ return 0; -+ va_start(arg, fmt); -+ ret = vprintf(fmt, arg); -+ va_end(arg); -+ return ret; -+} -+ - /* - * Enable/disable rsquash on given filesystem - */ -@@ -171,10 +185,10 @@ - errstr(_("set root_squash on %s: %s\n"), quotadev, strerror(errno)); - return 1; - } -- if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_OFF)) -- printf(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); -- else if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_ON)) -- printf(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); -+ if (flags & STATEFLAG_OFF) -+ pinfo(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); -+ else if (flags & STATEFLAG_ON) -+ pinfo(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); - #endif - return 0; - } -@@ -195,8 +209,7 @@ - errstr(_("quotactl on %s [%s]: %s\n"), quotadev, quotadir, strerror(errno)); - return 1; - } -- if (flags & STATEFLAG_VERBOSE) -- printf(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); -+ pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); - return 0; - } - if (kernel_iface == IFACE_GENERIC) { -@@ -218,8 +231,7 @@ - errstr(_("Quota format not supported in kernel.\n")); - return 1; - } -- if (flags & STATEFLAG_VERBOSE) -- printf(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); -+ pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); - return 0; - } - -@@ -268,8 +280,6 @@ - int sflags, ret = 0; - - sflags = flags & FL_OFF ? STATEFLAG_OFF : STATEFLAG_ON; -- if (flags & FL_VERBOSE) -- sflags |= STATEFLAG_VERBOSE; - if (flags & FL_ALL) - sflags |= STATEFLAG_ALL; - -@@ -281,10 +291,7 @@ - errstr(_("Cannot change state of XFS quota. It's not compiled in kernel.\n")); - return 1; - } -- if ((flags & FL_OFF && (kern_quota_on(mnt->mnt_fsname, USRQUOTA, QF_XFS) != -1 -- || kern_quota_on(mnt->mnt_fsname, GRPQUOTA, QF_XFS) != -1)) -- || (!(flags & FL_OFF) && kern_quota_on(mnt->mnt_fsname, type, QF_XFS) == -1)) -- ret = xfs_newstate(mnt, type, extra, sflags); -+ ret = xfs_newstate(mnt, type, extra, sflags); - } - else if (meta_qf_fstype(mnt->mnt_type)) { - if (!hasquota(mnt, type, 0)) -@@ -376,7 +383,7 @@ - while ((mnt = get_next_mount())) { - if (nfs_fstype(mnt->mnt_type)) { - if (!(flags & FL_ALL)) -- fprintf(stderr, "%s: Quota cannot be turned on on NFS filesystem\n", mnt->mnt_fsname); -+ errstr(_("%s: Quota cannot be turned on on NFS filesystem\n"), mnt->mnt_fsname); - continue; - } - -diff -u quota/quotaon.h quota-tools/quotaon.h ---- quota/quotaon.h 2010-02-18 09:44:11.000000000 +0100 -+++ quota-tools/quotaon.h 2010-06-12 12:06:08.000000000 +0200 -@@ -13,7 +13,7 @@ - #define STATEFLAG_ON 0x01 - #define STATEFLAG_OFF 0x02 - #define STATEFLAG_ALL 0x04 --#define STATEFLAG_VERBOSE 0x08 - - typedef int (newstate_t) (struct mntent * mnt, int type, char *file, int flags); - extern int xfs_newstate(struct mntent *mnt, int type, char *file, int flags); -+extern int pinfo(char *fmt, ...); -diff -u quota/quotaon_xfs.c quota-tools/quotaon_xfs.c ---- quota/quotaon_xfs.c 2010-07-26 18:48:24.000000000 +0200 -+++ quota-tools/quotaon_xfs.c 2010-06-15 10:11:30.000000000 +0200 -@@ -59,8 +59,8 @@ - return 1; - case Q_XFS_QUOTAON: - if (roothack) { -- printf(_("Enabling %s quota on root filesystem" -- " (reboot to take effect)\n"), type2name(type)); -+ pinfo(_("Enabling %s quota on root filesystem" -+ " (reboot to take effect)\n"), type2name(type)); - return 1; - } - errstr(_("Enable XFS %s quota accounting during mount\n"), -@@ -79,12 +79,12 @@ - return -1; - case Q_XFS_QUOTAON: - if (roothack) { -- printf(_("Enabling %s quota on root filesystem" -- " (reboot to take effect)\n"), type2name(type)); -+ pinfo(_("Enabling %s quota on root filesystem" -+ " (reboot to take effect)\n"), type2name(type)); - return 1; - } - if (xopts & XFS_QUOTA_UDQ_ENFD || xopts & XFS_QUOTA_GDQ_ENFD) { -- printf(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); -+ pinfo(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); - return 1; - } - errstr(_("Already accounting %s quota on %s\n"), -@@ -92,7 +92,7 @@ - return -1; - case Q_XFS_QUOTAOFF: - if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) { -- printf(_("Disabling %s quota accounting on %s\n"), -+ pinfo(_("Disabling %s quota accounting on %s\n"), - type2name(type), dev); - return 1; - } -@@ -121,9 +121,9 @@ - return -1; - } - if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) -- acctstr = _("and accounting "); -- printf(_("Disabling %s quota enforcement %son %s\n"), -- type2name(type), acctstr, dev); -+ acctstr = _("and accounting "); -+ pinfo(_("Disabling %s quota enforcement %son %s\n"), -+ type2name(type), acctstr, dev); - return 1; - } - break; -@@ -146,10 +146,10 @@ - errstr(_("quotactl on %s: %s\n"), dev, strerror(errno)); - return 1; - } -- if ((flags & STATEFLAG_VERBOSE) && qoff) -- printf(_("%s: %s quotas turned off\n"), dev, type2name(type)); -- else if ((flags & STATEFLAG_VERBOSE) && !qoff) -- printf(_("%s: %s quotas turned on\n"), dev, type2name(type)); -+ if (qoff) -+ pinfo(_("%s: %s quotas turned off\n"), dev, type2name(type)); -+ else -+ pinfo(_("%s: %s quotas turned on\n"), dev, type2name(type)); - return 0; - } - -@@ -168,8 +168,7 @@ - return 1; - } - -- if (flags & STATEFLAG_VERBOSE) -- printf(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); -+ pinfo(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); - return 0; - } - -@@ -208,16 +207,12 @@ - } - #endif /* XFS_ROOTHACK */ - -- if (xarg == NULL) { /* both acct & enfd on/off */ -- xopts |= (type == USRQUOTA) ? -- (XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_UDQ_ENFD) : -- (XFS_QUOTA_GDQ_ACCT | XFS_QUOTA_GDQ_ENFD); -+ if (xarg == NULL) { /* only enfd on/off */ -+ xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ENFD : -+ XFS_QUOTA_GDQ_ENFD; - err = xfs_onoff((char *)dev, type, flags, roothack, xopts); - } - else if (strcmp(xarg, "account") == 0) { -- /* only useful if we want root accounting only */ -- if (!roothack || !(flags & STATEFLAG_ON)) -- goto done; - xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ACCT : XFS_QUOTA_GDQ_ACCT; - err = xfs_onoff((char *)dev, type, flags, roothack, xopts); - } -@@ -231,7 +226,6 @@ - } - else - die(1, _("Invalid argument \"%s\"\n"), xarg); -- done: - free((char *)dev); - return err; - } diff --git a/extra/quota-tools/repquota.diff b/extra/quota-tools/repquota.diff deleted file mode 100644 index 3d79497d9..000000000 --- a/extra/quota-tools/repquota.diff +++ /dev/null @@ -1,91 +0,0 @@ -# Description: fix repquota to get latest quota info header -# Author: Jan Kara - -diff -u quota/quotaio.c quota-tools/quotaio.c ---- quota/quotaio.c 2010-07-28 11:14:02.000000000 +0200 -+++ quota-tools/quotaio.c 2010-05-28 09:05:21.000000000 +0200 -@@ -147,6 +147,15 @@ - } - } - if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) { /* Need to open file? */ -+ if (QIO_ENABLED(h)) { /* Kernel uses same file? */ -+ unsigned int cmd = -+ (kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC; -+ if (quotactl(QCMD(cmd, h->qh_type), h->qh_quotadev, -+ 0, NULL) < 0) { -+ die(4, _("Cannot sync quotas on device %s: %s\n"), -+ h->qh_quotadev, strerror(errno)); -+ } -+ } - /* We still need to open file for operations like 'repquota' */ - if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) { - errstr(_("Cannot open quotafile %s: %s\n"), -diff -u quota/quotaio_v1.c quota-tools/quotaio_v1.c ---- quota/quotaio_v1.c 2010-07-26 18:48:24.000000000 +0200 -+++ quota-tools/quotaio_v1.c 2010-05-28 09:05:23.000000000 +0200 -@@ -348,11 +348,6 @@ - struct dquot *dquot = get_empty_dquot(); - qid_t id = 0; - -- if (QIO_ENABLED(h)) /* Kernel uses same file? */ -- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), -- h->qh_quotadev, 0, NULL) < 0) -- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, -- strerror(errno)); - memset(dquot, 0, sizeof(*dquot)); - dquot->dq_h = h; - lseek(h->qh_fd, 0, SEEK_SET); -diff -u quota/quotaio_v2.c quota-tools/quotaio_v2.c ---- quota/quotaio_v2.c 2010-02-18 09:44:11.000000000 +0100 -+++ quota-tools/quotaio_v2.c 2010-05-28 09:05:23.000000000 +0200 -@@ -484,11 +484,6 @@ - - static int v2_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *, char *)) - { -- if (QIO_ENABLED(h)) /* Kernel uses same file? */ -- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), -- h->qh_quotadev, 0, NULL) < 0) -- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, -- strerror(errno)); - return qtree_scan_dquots(h, process_dquot); - } - -diff -u quota/quotasys.c quota-tools/quotasys.c ---- quota/quotasys.c 2010-07-28 11:14:02.000000000 +0200 -+++ quota-tools/quotasys.c 2010-06-15 10:11:30.000000000 +0200 -@@ -861,22 +861,23 @@ - if (kernel_iface == IFACE_GENERIC) { - int actfmt; - -- if (quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&actfmt) < 0) -- return -1; -- actfmt = kern2utilfmt(actfmt); -- if (actfmt < 0) -- return -1; -- return actfmt; -+ if (quotactl(QCMD(Q_GETFMT, type), dev, 0, -+ (void *)&actfmt) >= 0) { -+ actfmt = kern2utilfmt(actfmt); -+ if (actfmt >= 0) -+ return actfmt; -+ } -+ } else { -+ if ((fmt == -1 || fmt == QF_VFSV0) && -+ v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ -+ return QF_VFSV0; -+ if ((fmt == -1 || fmt == QF_VFSOLD) && -+ v1_kern_quota_on(dev, type)) /* Old quota format */ -+ return QF_VFSOLD; - } -- if ((fmt == -1 || fmt == QF_VFSV0) && -- v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ -- return QF_VFSV0; - if ((fmt == -1 || fmt == QF_XFS) && - xfs_kern_quota_on(dev, type)) /* XFS quota format */ - return QF_XFS; -- if ((fmt == -1 || fmt == QF_VFSOLD) && -- v1_kern_quota_on(dev, type)) /* Old quota format */ -- return QF_VFSOLD; - return -1; - } - diff --git a/extra/quota-tools/system_inodes.diff b/extra/quota-tools/system_inodes.diff deleted file mode 100644 index 94f4d66da..000000000 --- a/extra/quota-tools/system_inodes.diff +++ /dev/null @@ -1,18 +0,0 @@ -# Description: Do not count system inodes into quota for ext[234] -# Author: Jan Kara - ---- quota/quotacheck.c 2010-02-18 09:44:10.000000000 +0100 -+++ quota-tools//quotacheck.c 2010-05-22 16:47:53.000000000 +0200 -@@ -455,8 +455,10 @@ - return -1; - } - -- while ((long)i_num) { -- if (inode.i_links_count) { -+ while (i_num) { -+ if ((i_num == EXT2_ROOT_INO || -+ i_num >= EXT2_FIRST_INO(fs->super)) && -+ inode.i_links_count) { - debug(FL_DEBUG, _("Found i_num %ld, blocks %ld\n"), (long)i_num, (long)inode.i_blocks); - if (flags & FL_VERBOSE) - blit(NULL); diff --git a/extra/racket/drracket-normal.rkt b/extra/racket/drracket-normal.rkt deleted file mode 100644 index 5ed11c21c..000000000 --- a/extra/racket/drracket-normal.rkt +++ /dev/null @@ -1,199 +0,0 @@ -#lang racket/base - -(require mred - racket/class - racket/cmdline - racket/list - framework/private/bday - framework/splash - racket/runtime-path - racket/file - "frame-icon.rkt" - "eb.rkt") - -(define-runtime-path doc-icon.rkt "dock-icon.rkt") - -(define files-to-open (command-line #:args filenames filenames)) - -;; updates the command-line-arguments with only the files -;; to open. See also main.rkt. -(current-command-line-arguments (apply vector files-to-open)) - -(define (currently-the-weekend?) - (define date (seconds->date (current-seconds))) - (define dow (date-week-day date)) - (or (= dow 6) (= dow 0))) - -(define (valentines-day?) - (define date (seconds->date (current-seconds))) - (and (= 2 (date-month date)) - (= 14 (date-day date)))) - -(define (current-icon-state) - (cond - [(valentines-day?) 'valentines] - [(currently-the-weekend?) 'weekend] - [else 'normal])) - -(define-values (texas-independence-day? prince-kuhio-day? kamehameha-day? halloween?) - (let* ([date (seconds->date (current-seconds))] - [month (date-month date)] - [day (date-day date)] - [dow (date-week-day date)]) - (values (and (= 3 month) (= 2 day)) - #f - (and (= 6 month) (= 11 day)) - (and (= 10 month) (= 31 day))))) - - -(define special-state #f) - -(define (icons-bitmap name) - (make-object bitmap% (collection-file-path name "icons"))) - -(define-struct magic-image (chars filename [bitmap #:mutable])) - -(define (magic-img str img) - (make-magic-image (reverse (string->list str)) img #f)) - -;; magic strings and their associated images. There should not be a string -;; in this list that is a prefix of another. -(define magic-images - (list #;(magic-img "larval" "PLT-206-larval.png") - (magic-img "mars" "PLT-206-mars.jpg"))) - -(define (load-magic-images) - (set! load-magic-images void) ; run only once - (for-each (λ (magic-image) - (unless (magic-image-bitmap magic-image) - (set-magic-image-bitmap! - magic-image - (icons-bitmap (magic-image-filename magic-image))))) - magic-images)) - -(define longest-magic-string - (apply max (map (λ (s) (length (magic-image-chars s))) magic-images))) - -(define key-codes null) - -(define (find-magic-image) - (define (prefix? l1 l2) - (or (null? l1) - (and (pair? l2) - (eq? (car l1) (car l2)) - (prefix? (cdr l1) (cdr l2))))) - (ormap (λ (i) (and (prefix? (magic-image-chars i) key-codes) i)) - magic-images)) - -(define (add-key-code new-code) - (set! key-codes (cons new-code key-codes)) - (when ((length key-codes) . > . longest-magic-string) - (set! key-codes (take key-codes longest-magic-string)))) - -(define (drracket-splash-char-observer evt) - (let ([ch (send evt get-key-code)]) - (when (and (eq? ch #\q) - (send evt get-control-down)) - (exit)) - (when (char? ch) - ;; as soon as something is typed, load the bitmaps - (load-magic-images) - (add-key-code ch) - (let ([match (find-magic-image)]) - (when match - (set! key-codes null) - (set-splash-bitmap - (if (eq? special-state match) - (begin (set! special-state #f) the-splash-bitmap) - (begin (set! special-state match) - (magic-image-bitmap match)))) - (refresh-splash)))))) - -(when (eb-bday?) (install-eb)) - -(define weekend-bitmap-spec (collection-file-path "plt-logo-red-shiny.png" "icons")) -(define normal-bitmap-spec (collection-file-path "plt-logo-red-diffuse.png" "icons")) -(define valentines-days-spec (collection-file-path "heart.png" "icons")) - -(define the-bitmap-spec - (cond - [(valentines-day?) - valentines-days-spec] - [(or prince-kuhio-day? kamehameha-day?) - (set-splash-progress-bar?! #f) - (let ([size ((dynamic-require 'drracket/private/palaka 'palaka-pattern-size) 4)]) - (vector (dynamic-require 'drracket/private/honu-logo 'draw-honu) - size - size))] - [texas-independence-day? - (collection-file-path "texas-plt-bw.gif" "icons")] - [halloween? - (collection-file-path "PLT-pumpkin.png" "icons")] - [(currently-the-weekend?) - weekend-bitmap-spec] - [else normal-bitmap-spec])) -(define the-splash-bitmap (read-bitmap the-bitmap-spec)) -(set-splash-char-observer drracket-splash-char-observer) - -(when (eq? (system-type) 'macosx) - (define initial-state (current-icon-state)) - (define weekend-bitmap (if (equal? the-bitmap-spec weekend-bitmap-spec) - the-splash-bitmap - #f)) - (define weekday-bitmap (if (equal? the-bitmap-spec normal-bitmap-spec) - the-splash-bitmap - #f)) - (define valentines-bitmap (if (equal? the-bitmap-spec valentines-days-spec) - the-splash-bitmap - #f)) - (define set-doc-tile-bitmap (dynamic-require doc-icon.rkt 'set-dock-tile-bitmap)) - (define (set-icon state) - (case state - [(valentines) - (unless valentines-bitmap (set! valentines-bitmap (read-bitmap valentines-days-spec))) - (set-doc-tile-bitmap valentines-bitmap)] - [(weekend) - (unless weekend-bitmap (set! weekend-bitmap (read-bitmap weekend-bitmap-spec))) - (set-doc-tile-bitmap weekend-bitmap)] - [(normal) - (unless weekday-bitmap (set! weekday-bitmap (read-bitmap normal-bitmap-spec))) - (set-doc-tile-bitmap weekday-bitmap)])) - (set-icon initial-state) - (void - (thread - (λ () - (let loop ([last-state initial-state]) - (sleep 10) - (define next-state (current-icon-state)) - (unless (equal? last-state next-state) - (set-icon next-state)) - (loop next-state)))))) - -(start-splash the-splash-bitmap - "DrRacket" - 700 - #:allow-funny? #t - #:frame-icon todays-icon) - -(when (getenv "PLTDRBREAK") - (printf "PLTDRBREAK: creating break frame\n") (flush-output) - (let ([to-break (eventspace-handler-thread (current-eventspace))]) - (parameterize ([current-eventspace (make-eventspace)]) - (let* ([f (new frame% (label "Break DrRacket"))] - [b (new button% - (label "Break Main Thread") - (callback - (λ (x y) - (break-thread to-break))) - (parent f))] - [b (new button% - (label "Break All Threads") - (callback - (λ (x y) - ((dynamic-require 'drracket/private/key 'break-threads)))) - (parent f))]) - (send f show #t))))) - -(dynamic-require 'drracket/tool-lib #f) -(shutdown-splash) -(close-splash) diff --git a/extra/ratpoison/PKGBUILD b/extra/ratpoison/PKGBUILD deleted file mode 100644 index ddc2ad4bb..000000000 --- a/extra/ratpoison/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 150948 2012-02-24 09:50:09Z pierre $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: juergen <juergen@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=ratpoison -pkgver=1.4.5 -pkgrel=5 -pkgdesc="A simple keystroke-driven window manager" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('libxinerama' 'readline' 'bash' 'perl' 'libxtst' 'libxft' 'texinfo') -url="http://www.nongnu.org/ratpoison/" -install="${pkgname}.install" -source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "${pkgname}.desktop") -md5sums=('330a08dbed6be88cab54f6947e9f0b60' - '29c3cb9be59758e39d8471391231a74a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make CFLAGS="$CFLAGS -DHAVE_GETLINE" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # fix permissions - chmod a+x ${pkgdir}/usr/share/ratpoison/{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh} - - # Not useful outside the source tree. Kill it - rm ${pkgdir}/usr/share/ratpoison/genrpbindings - - cd contrib - ./genrpbindings - install -dm755 ${pkgdir}/usr/share/ratpoison/bindings - install -m644 {Ratpoison.pm,ratpoison-cmd.el,ratpoison.rb,ratpoison.lisp,ratpoison.py} \ - ${pkgdir}/usr/share/ratpoison/bindings/ - - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/etc/X11/sessions/${pkgname}.desktop - - install -Dm644 ${pkgdir}/usr/share/ratpoison/ratpoison.el \ - ${pkgdir}/usr/share/emacs/site-lisp/ratpoison.el -} diff --git a/extra/ratpoison/ratpoison.desktop b/extra/ratpoison/ratpoison.desktop deleted file mode 100644 index 9e29bd46a..000000000 --- a/extra/ratpoison/ratpoison.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Ratpoison -Comment=The ratpoison window manager -Exec=ratpoison -# no icon yet, only the top three are currently used -Icon= -Type=Application diff --git a/extra/ratpoison/ratpoison.install b/extra/ratpoison/ratpoison.install deleted file mode 100644 index 1eafd8f69..000000000 --- a/extra/ratpoison/ratpoison.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(ratpoison.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/extra/rox/PKGBUILD b/extra/rox/PKGBUILD deleted file mode 100644 index e852a9f96..000000000 --- a/extra/rox/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 153733 2012-03-19 00:48:00Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=rox -pkgver=2.11 -pkgrel=1 -pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://roscidus.com/desktop/" -depends=('sh' 'libsm' 'gtk2') -makedepends=('librsvg' 'python2') -source=("http://downloads.sourceforge.net/${pkgname}/rox-filer-${pkgver}.tar.bz2" - 'rox.desktop' 'rox.svg' 'rox.sh') -md5sums=('0eebf05a67f7932367750ebf9faf215d' - 'de05c906395abd4402b0470c1bc2ae6e' - '658c8648b51e215558e13e6afb2b5c76' - '31578a90b241f0a8d09c9f8587608d00') - -build() { - cd "${srcdir}/rox-filer-${pkgver}" - ./ROX-Filer/AppRun --compile LIBS="-ldl -lm" -# finally we render a png as fallback for svg unaware menu applications -# Attention: always make sure you check the dimensions of the source-svg, -# you can read the dimensions via inkscape's export function - rsvg-convert -w 48 -h 38 -f png -o "${srcdir}/rox.png" "${srcdir}/rox.svg" -} - -package() { - cd "${srcdir}/rox-filer-${pkgver}" - install -d "${pkgdir}/usr/share/Choices/MIME-types" - install -m755 Choices/MIME-types/* "${pkgdir}/usr/share/Choices/MIME-types/" - cp -rp ROX-Filer "${pkgdir}/usr/share/" - rm -fr "${pkgdir}"/usr/share/ROX-Filer/{src,build} - - install -D -m755 "${srcdir}/rox.sh" "${pkgdir}/usr/bin/rox" - install -D -m644 rox.1 "${pkgdir}/usr/share/man/man1/rox.1" - ln -sf rox.1 "${pkgdir}/usr/share/man/man1/ROX-Filer.1" - - install -D -m644 "${srcdir}/rox.desktop" "${pkgdir}/usr/share/applications/rox.desktop" - install -D -m644 "${srcdir}/rox.svg" "${pkgdir}/usr/share/pixmaps/rox.svg" - install -D -m644 "${srcdir}/rox.png" "${pkgdir}/usr/share/pixmaps/rox.png" -} diff --git a/extra/rox/rox.desktop b/extra/rox/rox.desktop deleted file mode 100644 index 93edfabcf..000000000 --- a/extra/rox/rox.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=ROX Filer -Exec=rox -Icon=rox -Terminal=false -Type=Application -Categories=System;Utility;Core;FileManager; diff --git a/extra/rox/rox.sh b/extra/rox/rox.sh deleted file mode 100644 index f2dc449d0..000000000 --- a/extra/rox/rox.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/share/ROX-Filer/AppRun "$@" diff --git a/extra/rox/rox.svg b/extra/rox/rox.svg deleted file mode 100644 index 4cbd7cc28..000000000 --- a/extra/rox/rox.svg +++ /dev/null @@ -1,493 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" -"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - id="svg1573" - sodipodi:version="0.32" - inkscape:version="0.39" - width="100.00000pt" - height="80.000000pt" - sodipodi:docbase="/home/keep/graphics/arch_candy/svg-icons" - sodipodi:docname="rox_filer.svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs - id="defs1575"> - <linearGradient - id="linearGradient2267"> - <stop - style="stop-color:#fdffc6;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2268" /> - <stop - style="stop-color:#ffbc00;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop2269" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2267" - id="linearGradient2270" - x1="0.17269076" - y1="0.14173229" - x2="0.97590363" - y2="0.72834647" /> - <linearGradient - id="linearGradient2263"> - <stop - style="stop-color:#b4b4b4;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2264" /> - <stop - style="stop-color:#e6e6e6;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop2265" /> - </linearGradient> - <linearGradient - id="linearGradient1589"> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop1590" /> - <stop - style="stop-color:#9a9a9a;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop1593" /> - </linearGradient> - <linearGradient - id="linearGradient2196"> - <stop - style="stop-color:#bee3ff;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2197" /> - <stop - style="stop-color:#7dd3ff;stop-opacity:1.0000000;" - offset="0.073038995" - id="stop2200" /> - <stop - style="stop-color:#2494d0;stop-opacity:1.0000000;" - offset="0.81849396" - id="stop2199" /> - <stop - style="stop-color:#465b72;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop2198" /> - </linearGradient> - <linearGradient - id="linearGradient1606"> - <stop - style="stop-color:#000000;stop-opacity:0.62745100;" - offset="0.0000000" - id="stop1607" /> - <stop - style="stop-color:#000000;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop1608" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="radialGradient1636" - cx="1.0000000" - cy="1.0000000" - r="0.99467027" - fx="1.0000000" - fy="1.0000000" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="linearGradient1638" - x1="0.50000000" - y1="1.0000000" - x2="0.50000000" - y2="0.0000000" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="radialGradient1643" - cx="0.0000000" - cy="1.0000000" - r="1.0000000" - fx="0.0000000" - fy="1.0000000" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="linearGradient1645" - x1="0.0000000" - y1="0.50000000" - x2="1.0000000" - y2="0.50000000" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="linearGradient1647" - x1="1.0000000" - y1="0.50000000" - x2="0.0000000" - y2="0.50000000" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="linearGradient1649" - x1="0.50000000" - y1="1.8735014e-14" - x2="0.50000000" - y2="1.0000000" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="radialGradient1651" - cx="1.0000000" - cy="0.0000000" - r="1.0000000" - fx="1.0000000" - fy="0.0000000" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient1606" - id="radialGradient1653" - cx="0.0000000" - cy="0.0000000" - r="1.0000000" - fx="0.0000000" - fy="0.0000000" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2196" - id="linearGradient2195" - x1="0.28313252" - y1="0.17968750" - x2="0.32777777" - y2="0.82031250" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2196" - id="linearGradient2202" - x1="0.67934781" - y1="0.96875000" - x2="0.63000000" - y2="-0.054687500" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2196" - id="linearGradient2207" - x1="0.34701493" - y1="0.58801496" - x2="0.71766168" - y2="1.0074906" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1589" - id="linearGradient1588" - x1="0.34029850" - y1="0.052631579" - x2="0.88955224" - y2="0.85964912" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2263" - id="radialGradient2272" - cx="0.65671641" - cy="0.34579438" - r="0.36985061" - fx="0.65671641" - fy="0.35046729" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="6.4980189" - inkscape:cx="45.259790" - inkscape:cy="38.198748" - inkscape:window-width="1018" - inkscape:window-height="744" - showgrid="true" - snaptogrid="false" - gridspacingy="10.000000pt" - gridspacingx="10.000000pt" - gridoriginy="0.0000000pt" - gridoriginx="0.0000000pt" - gridtolerance="2.0000000px" - inkscape:grid-bbox="false" - inkscape:grid-points="false" - inkscape:window-x="0" - inkscape:window-y="3" - showguides="true" - inkscape:guide-bbox="true" - inkscape:guide-points="true" - guidetolerance="3.0000000pt" /> - <metadata - id="metadata1576"> - <rdf:RDF - id="RDF1577"> - <cc:Work - rdf:about="" - id="Work1578"> - <dc:description - id="description1579">Created with Inkscape -http://www.inkscape.org/</dc:description> - <dc:format - id="format1581">image/svg+xml</dc:format> - <dc:type - id="type1583" - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title - id="title1606">Rox-Filer Icon for Archlinux -based on work found on the internet trying to match the original xpm</dc:title> - <dc:date - id="date1608">2004-07-14</dc:date> - <dc:creator - id="creator1610"> - <cc:Agent - id="Agent1611"> - <dc:title - id="title1612">Tobias Kieslich, Archlinux package maintainer</dc:title> - </cc:Agent> - </dc:creator> - <dc:coverage - id="coverage1614" /> - <cc:license - id="license1616" - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/" - id="License1624"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" - id="permits1625" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" - id="permits1626" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" - id="requires1627" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" - id="permits1628" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" - id="requires1629" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" - id="requires1630" /> - </cc:License> - </rdf:RDF> - </metadata> - <rect - style="fill:url(#radialGradient1636);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_up_left" - width="18.750000" - height="18.750000" - x="0.15625000" - y="0.15624750" /> - <rect - style="fill:url(#linearGradient1638);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_up_top" - width="87.500000" - height="18.750000" - x="18.906250" - y="-2.4999999e-06" /> - <rect - style="fill:url(#radialGradient1643);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_up_right" - width="18.750000" - height="18.750000" - x="106.40625" - y="0.15624750" /> - <rect - style="fill:url(#linearGradient1645);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_side_right" - width="18.750000" - height="62.500000" - x="106.40625" - y="18.906250" - ry="0.0000000" /> - <rect - style="fill:url(#radialGradient1653);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_lo_right" - width="18.750000" - height="18.750000" - x="106.40625" - y="81.406250" /> - <rect - style="fill:url(#linearGradient1649);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_lo_button" - width="87.500000" - height="18.750000" - x="18.906250" - y="81.406250" - ry="0.0000000" /> - <rect - style="fill:url(#radialGradient1651);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_lo_left" - width="18.750000" - height="18.750000" - x="0.15625000" - y="81.406250" - ry="0.0000000" /> - <rect - style="fill:url(#linearGradient1647);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;" - id="sh_side_left" - width="18.750000" - height="62.500000" - x="0.15625000" - y="18.906250" /> - <path - style="fill:url(#linearGradient2195);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#005ec6;stroke-width:0.37500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.76973683;" - d="M 10.000000,17.031250 C 15.781250,16.406250 12.187501,7.1874998 23.593751,7.4999998 C 45.937500,7.6562498 50.000000,5.4687498 55.937501,12.031250 C 73.437502,11.875000 95.781252,12.187500 106.25000,13.437500 C 111.09375,21.718750 109.03244,76.848192 111.25000,85.000000 C 105.93750,85.781250 31.718750,84.843750 17.187500,85.000000 C 19.687500,74.062500 13.593750,31.093750 10.000000,17.031250 z " - id="path2194" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:url(#linearGradient2202);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#003465;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.51315790;" - d="M 22.656253,20.937500 C 27.656253,18.125000 102.18751,22.656260 118.12500,20.781250 C 113.28125,46.875000 107.43528,64.689405 111.09375,85.156250 C 92.656250,89.531250 42.031253,85.000000 17.187502,85.000000 C 8.7500029,53.281250 17.656253,23.750000 22.656253,20.937500 z " - id="path2201" - sodipodi:nodetypes="ccccc" /> - <path - id="outline" - stroke="black" - stroke-width="1" - d="M 55.515353,11.233098 C 87.695353,13.593098 87.040232,46.022391 105.94188,47.608732 C 113.45000,47.428732 86.513146,58.158732 68.693146,56.338732 C 60.333146,56.338732 57.423146,56.698732 47.423146,57.608732 C 41.423146,58.518732 35.435573,58.989217 27.975573,57.179217 C 20.902855,58.670188 21.171750,57.406693 19.875646,46.904982 C 21.358146,46.737482 21.292460,46.313412 22.819854,48.554647 C 23.991544,50.273937 24.425353,46.595305 25.854085,48.756854 C 33.124085,44.026854 26.153146,23.978732 33.423146,21.428732 C 29.603146,15.978732 33.973146,9.4287317 36.693146,9.7887317 C 37.783146,7.2487317 37.221926,4.5924878 39.401926,5.5024878 C 43.194694,7.1884025 46.004695,3.4125365 48.214085,3.2643658 C 50.330329,3.9390609 49.603146,4.8787317 51.243146,5.4287317 C 57.063146,2.8787317 55.923427,9.3281222 55.515353,11.233098 z " - style="fill:url(#radialGradient2272);stroke:#000000;stroke-width:1.8000009;stroke-miterlimit:4.0000000;opacity:1.0000000;" - sodipodi:nodetypes="ccccccsccccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#8c8c8c;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 84.890446,38.997755 C 84.890446,38.997755 88.581336,37.807146 90.724434,37.092780 C 91.795983,40.069305 97.868097,47.689207 107.15485,48.046390 C 110.72668,47.808268 93.343775,48.522634 90.248190,49.475122 C 87.152604,50.427610 84.652324,41.140853 84.890446,38.997755 z " - id="path2244" - sodipodi:nodetypes="ccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 78.173843,39.831182 C 78.650087,44.117377 78.411965,55.904415 86.269989,56.142537 C 98.176087,55.904415 112.93964,49.237000 102.46229,48.284512 C 94.842380,47.689208 93.175526,50.427610 85.555623,38.759633 C 85.079379,32.330340 85.317501,38.759634 85.555623,38.759634 L 78.173843,39.831182 z " - id="path2243" - sodipodi:nodetypes="cccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 72.173840,40.069304 C 72.650084,44.355499 75.388487,56.142537 80.508108,55.904415 C 92.414206,55.666293 110.27335,48.046390 99.795987,48.284512 C 92.890450,48.998878 81.936840,51.261037 79.793742,39.593060 C 79.317498,33.163767 79.793742,39.593061 79.793742,39.593061 L 72.173840,40.069304 z " - id="path2242" - sodipodi:nodetypes="cccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 65.744547,40.188365 C 66.220791,44.474560 67.054218,56.142537 74.912242,56.380659 C 86.818339,56.142537 101.34378,49.594183 90.866413,49.832305 C 82.889327,49.832305 75.626608,51.261037 73.364449,39.950243 C 72.888205,33.520950 73.364449,39.950244 73.364449,39.950244 L 65.744547,40.188365 z " - id="path1620" - sodipodi:nodetypes="cccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 61.554493,41.021792 C 62.030737,45.307987 62.745103,55.309110 70.603127,55.547232 C 77.389603,57.095025 90.605372,50.903854 80.128005,51.141976 C 72.627163,50.308549 70.841249,47.689208 68.698151,40.783670 C 67.983785,30.782548 68.221907,39.593061 68.221907,39.593061 L 61.554493,41.021792 z " - id="path1619" - sodipodi:nodetypes="cccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#0e5ca4;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2207);stroke-width:2.8750000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 18.125000,83.750000 C 15.781250,74.687500 55.937499,78.593750 65.156250,78.593750 C 78.125000,78.906250 82.031249,57.656250 89.843750,57.500000 C 94.531250,57.656250 104.59597,56.966529 109.75222,56.966529 C 108.17076,66.501032 108.33487,74.284818 109.68750,84.218750 C 92.500002,87.968750 42.343750,83.593750 18.125000,83.750000 z " - id="path2206" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 30.241456,38.045267 C 29.288968,47.927329 28.336481,47.927329 26.431505,49.951366 C 25.479017,48.403573 24.407468,48.403573 23.097797,49.951366 C 21.669066,48.284512 21.779994,46.597620 20.172530,47.349456 C 21.072561,50.995102 20.280329,54.730317 22.014628,58.317134 C 28.786566,56.578346 35.306033,59.977218 53.934591,56.542597 C 58.339847,54.756683 47.386237,41.855219 46.314688,42.212402 C 45.243139,42.569585 33.337041,44.355500 30.241456,38.045267 z " - id="path2245" - sodipodi:nodetypes="cccccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 32.136364,51.487233 C 28.207348,51.844415 27.753870,54.946654 28.230114,57.565995 C 30.023765,56.968112 32.078234,57.581448 34.761364,57.362233 L 34.761364,51.987233 C 34.066700,51.633088 33.237515,51.349589 32.136364,51.487233 z " - id="path2261" - sodipodi:nodetypes="ccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 35.470071,51.606294 C 31.541055,51.963476 31.087577,55.065715 31.563821,57.685056 C 33.357472,57.087173 35.411941,57.700509 38.095071,57.481294 L 38.095071,52.106294 C 37.400407,51.752149 36.571222,51.468650 35.470071,51.606294 z " - id="path2260" - sodipodi:nodetypes="ccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 38.208474,51.606294 C 34.279458,51.963476 33.825980,56.018203 34.302224,58.637544 C 36.095875,58.039661 38.150344,57.700509 40.833474,57.481294 L 40.833474,52.106294 C 40.138810,51.752149 39.309625,51.468650 38.208474,51.606294 z " - id="path2259" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 41.184999,51.606294 C 37.255983,51.963476 36.802505,56.018203 37.278749,58.637544 C 39.072400,58.039661 41.126869,57.700509 43.809999,57.481294 L 43.809999,52.106294 C 43.115335,51.752149 42.286150,51.468650 41.184999,51.606294 z " - id="path2258" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 44.280584,51.487233 C 40.351568,51.844415 39.898090,55.899142 40.374334,58.518483 C 42.167985,57.920600 44.222454,57.581448 46.905584,57.362233 L 46.905584,51.987233 C 46.210920,51.633088 45.381735,51.349589 44.280584,51.487233 z " - id="path2249" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 61.911677,45.307988 C 61.375902,44.415030 61.765709,44.034840 61.733085,42.658881 C 58.268663,42.540664 58.280316,48.344042 58.697030,52.570707 C 56.077688,52.808829 55.363323,52.570707 54.291774,52.689768 C 53.220225,52.808829 52.029615,50.546671 49.172152,50.903854 C 45.243139,51.261036 44.766896,55.309110 45.243140,57.928451 C 49.172151,56.618781 53.577408,56.380658 65.721628,56.499719 C 56.672994,50.070426 60.721067,44.593622 61.911677,45.307988 z " - id="path2248" - sodipodi:nodetypes="cccccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 38.862811,5.8564233 C 40.714965,6.4457451 43.778156,8.4025157 47.566654,3.8563191 C 48.661109,3.2669973 49.839752,5.5400956 51.186773,5.7926621 C 48.745297,8.2341380 48.324354,12.527769 45.461933,12.527768 C 42.431136,13.032901 41.841814,10.423048 37.295617,10.423047 C 36.958861,9.9179145 36.673901,6.3615563 38.862811,5.8564233 z " - id="path2273" - sodipodi:nodetypes="cccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.45000023;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 37.884939,9.1602151 C 38.726827,8.5708933 41.168303,9.1602151 42.094380,9.9179146 C 43.020458,10.675614 47.314087,4.3614521 49.166242,4.8665850 C 50.850018,6.0452286 51.439340,5.5400956 50.765829,6.4661727 C 50.092319,7.3922498 47.903409,12.696146 45.798689,12.611957 C 43.693968,12.527768 38.474261,9.9179146 37.463995,10.338859 C 36.453729,10.759803 37.884939,9.1602151 37.884939,9.1602151 z " - id="path2274" - sodipodi:nodetypes="ccccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:url(#linearGradient2270);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.90000045;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 40.480700,28.282268 C 35.837322,26.139170 26.550566,13.399645 37.146993,10.304059 C 42.504737,10.423120 41.314127,13.042462 44.409712,12.447157 C 47.505298,11.851852 49.886518,4.3510105 53.339286,4.9463154 C 55.601444,7.0894130 55.958628,15.423681 53.101164,18.757389 C 50.005579,19.709877 46.195627,19.471755 40.480700,28.282268 z " - id="path2262" - sodipodi:nodetypes="cccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.2500006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 42.346947,9.9179146 C 41.926003,10.338859 41.505058,10.759803 41.589247,11.180747 C 42.431136,11.601691 43.273024,12.443579 44.788422,12.527769 C 45.967067,11.517503 46.135443,8.4867045 45.377745,8.3183268 C 44.367479,7.8973828 43.020457,9.0760263 42.346947,9.9179146 z " - id="path2275" - sodipodi:nodetypes="ccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 41.195066,29.115694 C 40.123518,29.472877 34.765774,29.591938 35.242017,36.140292 C 35.718261,42.688646 40.718822,50.427609 48.100603,50.903853 C 49.291213,51.022914 58.339847,48.165450 55.958627,36.973718 C 52.267738,26.734474 46.314688,28.520389 41.195066,29.115694 z " - id="path2276" - sodipodi:nodetypes="ccccc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 20.025215,48.192533 C 20.739581,49.025960 19.406907,55.190048 26.193383,50.189487" - id="path2278" - sodipodi:nodetypes="cc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 24.185500,48.718875 C 24.304561,49.552301 24.764651,51.141975 26.431505,49.832305" - id="path2279" - sodipodi:nodetypes="cc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 53.815530,22.448279 C 57.625482,22.686401 60.482945,27.925084 61.554494,41.736158" - id="path2280" - sodipodi:nodetypes="cc" - transform="translate(-4.687500,23.28125)" /> - <path - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M 36.908871,25.662926 C 35.480139,28.401329 33.932347,29.710999 35.122956,36.140292" - id="path2281" - sodipodi:nodetypes="cc" - transform="translate(-4.687500,23.28125)" /> -</svg> diff --git a/extra/samba/smbd.conf b/extra/samba/smbd.conf deleted file mode 100644 index b745bb85b..000000000 --- a/extra/samba/smbd.conf +++ /dev/null @@ -1 +0,0 @@ -D /var/run/samba 0755 root root - diff --git a/extra/scim-hangul/gcc43.patch b/extra/scim-hangul/gcc43.patch deleted file mode 100644 index 4d33471d9..000000000 --- a/extra/scim-hangul/gcc43.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp scim-hangul-0.3.2/src/scim_hangul_imengine.cpp ---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp 2008-03-26 09:33:43.000000000 +0100 -+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp 2008-03-26 09:34:41.000000000 +0100 -@@ -33,6 +33,7 @@ - #include <config.h> - #endif - -+#include <cstring> - #include <scim.h> - #include "scim_hangul_imengine.h" - -diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp ---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp 2008-03-26 09:33:43.000000000 +0100 -+++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp 2008-03-26 09:34:53.000000000 +0100 -@@ -34,6 +34,7 @@ - #include <config.h> - #endif - -+#include <cstring> - #include <scim.h> - #include <gtk/scimkeyselection.h> - diff --git a/extra/scim-pinyin/gcc43.patch b/extra/scim-pinyin/gcc43.patch deleted file mode 100644 index 91a948d5d..000000000 --- a/extra/scim-pinyin/gcc43.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp ---- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 2008-02-25 16:27:05.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_phrase.cpp 2008-02-25 16:26:41.000000000 +0800 -@@ -28,6 +28,7 @@ - #define SCIM_PHRASE_MAX_RELATION 1000 - - #include <scim.h> -+#include <cstring> - #include "scim_pinyin_private.h" - #include "scim_phrase.h" - -diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp ---- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 2008-02-25 16:27:55.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_special_table.cpp 2008-02-25 16:28:08.000000000 +0800 -@@ -22,6 +22,7 @@ - - #include <time.h> - #include <scim.h> -+#include <cstring> - #include "scim_pinyin_private.h" - #include "scim_special_table.h" - -diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp ---- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 2008-02-25 16:26:10.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp 2008-02-25 16:26:26.000000000 +0800 -@@ -29,6 +29,7 @@ - #define Uses_SCIM_LOOKUP_TABLE - - #include <scim.h> -+#include <cstring> - #include "scim_pinyin.h" - - // Internal functions -diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp ---- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 2008-02-25 16:27:15.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp 2008-02-25 16:27:28.000000000 +0800 -@@ -27,6 +27,7 @@ - #define Uses_SCIM_LOOKUP_TABLE - - #include <scim.h> -+#include <cstring> - #include "scim_pinyin_private.h" - #include "scim_phrase.h" - #include "scim_pinyin.h" diff --git a/extra/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch b/extra/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch deleted file mode 100644 index d142fd7b7..000000000 --- a/extra/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- scim-uim-0.2.0/src/scim_uim_imengine.cpp 2007-04-10 07:43:59.000000000 +0200 -+++ scim-uim-0.2.0/src/scim_uim_imengine.cpp.gcc43buildfixed 2008-03-23 10:53:23.000000000 +0100 -@@ -32,6 +32,7 @@ - #include <config.h> - #endif - -+#include <string.h> - #include <scim.h> - #include "scim_uim_imengine.h" - #include <uim/uim-compat-scm.h> diff --git a/extra/scrot/PKGBUILD b/extra/scrot/PKGBUILD deleted file mode 100644 index e65b2eec2..000000000 --- a/extra/scrot/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 143963 2011-11-30 22:40:01Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=scrot -pkgver=0.8 -pkgrel=5.1 -pkgdesc="A simple command-line screenshot utility for X" -arch=('i686' 'x86_64' 'mips64el') -url="http://scrot.sourcearchive.com/" -license=('MIT') -depends=('giblib') -source=("ftp://ftp.archlinux.org/other/scrot/${pkgname}-${pkgver}.tar.bz2") -md5sums=('6a02df0e3bb26ec578dfeb8f56a7b30d') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir docsdir=/usr/share/doc/scrot install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD deleted file mode 100644 index cfa5262bb..000000000 --- a/extra/sdl/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 166673 2012-09-15 09:41:06Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=sdl -pkgver=1.2.15 -pkgrel=3 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" -arch=('i686' 'x86_64') -url="http://www.libsdl.org" -license=('LGPL') -depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'mesa' 'libpulse') -optdepends=('alsa-lib: ALSA audio driver' - 'libpulse: PulseAudio audio driver') -options=('!libtool') -source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-disable-mmx.patch - fix_joystick_misc_axes.diff - libsdl-1.2.15-resizing.patch) -md5sums=('9d96df8417572a2afb781a7c4c811a85' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'e5c16b7611f62c7cb25f0534eff68852' - '687586a108b597a2a6b73070c1d37e51' - '3dd50347d8856160a9cbd7f80383a1f8') - -build() { - cd SDL-$pkgver - patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch - patch -Np1 -i ../fix_joystick_misc_axes.diff - patch -Np1 -i ../libsdl-1.2.15-resizing.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa \ - --with-x --disable-rpath --disable-static - make -} - -package() { - cd SDL-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/extra/sdl/fix_joystick_misc_axes.diff b/extra/sdl/fix_joystick_misc_axes.diff deleted file mode 100644 index 75e3755c9..000000000 --- a/extra/sdl/fix_joystick_misc_axes.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c -index ee43974..80e46e4 100644 ---- a/src/joystick/linux/SDL_sysjoystick.c -+++ b/src/joystick/linux/SDL_sysjoystick.c -@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) - ++joystick->nbuttons; - } - } -- for ( i=0; i<ABS_MISC; ++i ) { -+ for ( i=0; i<ABS_MAX; ++i ) { - /* Skip hats */ - if ( i == ABS_HAT0X ) { - i = ABS_HAT3Y; diff --git a/extra/sdl/libsdl-1.2.15-resizing.patch b/extra/sdl/libsdl-1.2.15-resizing.patch deleted file mode 100644 index 0655a13e1..000000000 --- a/extra/sdl/libsdl-1.2.15-resizing.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Revert change that breaks window corner resizing - http://bugzilla.libsdl.org/show_bug.cgi?id=1430 -Author: Andrew Caudwell <acaudwell@gmail.com> -Last-Update: 2012-04-10 -Bug-Debian: http://bugs.debian.org/665779 - -diff -r c787fb1b5699 src/video/x11/SDL_x11events.c ---- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 -@@ -57,12 +57,6 @@ - static SDLKey MISC_keymap[256]; - SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); - --/* -- Pending resize target for ConfigureNotify (so outdated events don't -- cause inappropriate resize events) --*/ --int X11_PendingConfigureNotifyWidth = -1; --int X11_PendingConfigureNotifyHeight = -1; - - #ifdef X_HAVE_UTF8_STRING - Uint32 Utf8ToUcs4(const Uint8 *utf8) -@@ -825,16 +819,6 @@ - #ifdef DEBUG_XEVENTS - printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); - #endif -- if ((X11_PendingConfigureNotifyWidth != -1) && -- (X11_PendingConfigureNotifyHeight != -1)) { -- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && -- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { -- /* Event is from before the resize, so ignore. */ -- break; -- } -- X11_PendingConfigureNotifyWidth = -1; -- X11_PendingConfigureNotifyHeight = -1; -- } - if ( SDL_VideoSurface ) { - if ((xevent.xconfigure.width != SDL_VideoSurface->w) || - (xevent.xconfigure.height != SDL_VideoSurface->h)) { -diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h ---- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 -@@ -27,8 +27,3 @@ - extern void X11_InitOSKeymap(_THIS); - extern void X11_PumpEvents(_THIS); - extern void X11_SetKeyboardState(Display *display, const char *key_vec); -- --/* Variables to be exported */ --extern int X11_PendingConfigureNotifyWidth; --extern int X11_PendingConfigureNotifyHeight; -- -diff -r c787fb1b5699 src/video/x11/SDL_x11video.c ---- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 -@@ -1182,8 +1182,6 @@ - current = NULL; - goto done; - } -- X11_PendingConfigureNotifyWidth = width; -- X11_PendingConfigureNotifyHeight = height; - } else { - if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { - current = NULL; diff --git a/extra/sdl/sdl-1.2.14-disable-mmx.patch b/extra/sdl/sdl-1.2.14-disable-mmx.patch deleted file mode 100644 index 1bb6e0e47..000000000 --- a/extra/sdl/sdl-1.2.14-disable-mmx.patch +++ /dev/null @@ -1,13 +0,0 @@ -# and another one from FS#26020 - ---- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 -+++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 -@@ -89,6 +89,8 @@ - #include "SDL_yuvfuncs.h" - #include "SDL_yuv_sw_c.h" - -+#undef __OPTIMIZE__ -+ - /* The functions used to manipulate software video overlays */ - static struct private_yuvhwfuncs sw_yuvfuncs = { - SDL_LockYUV_SW, diff --git a/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch b/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch deleted file mode 100644 index 7d3e5acfc..000000000 --- a/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - diff --git a/extra/slim/fix-array-overflow.patch b/extra/slim/fix-array-overflow.patch deleted file mode 100644 index b035f8a78..000000000 --- a/extra/slim/fix-array-overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: app.cpp -=================================================================== ---- app.cpp (revision 223) -+++ app.cpp (working copy) -@@ -593,7 +593,7 @@ - - n++; - -- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); -+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1))); - memcpy(child_env, old_env, sizeof(char*)*n); - child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); - child_env[n] = NULL; diff --git a/extra/slim/fix-glibc-segfault-1.3.4.patch b/extra/slim/fix-glibc-segfault-1.3.4.patch deleted file mode 100644 index b035f8a78..000000000 --- a/extra/slim/fix-glibc-segfault-1.3.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: app.cpp -=================================================================== ---- app.cpp (revision 223) -+++ app.cpp (working copy) -@@ -593,7 +593,7 @@ - - n++; - -- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); -+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1))); - memcpy(child_env, old_env, sizeof(char*)*n); - child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); - child_env[n] = NULL; diff --git a/extra/slim/fix-numlock-1.3.3.patch b/extra/slim/fix-numlock-1.3.3.patch deleted file mode 100644 index 179fffcbf..000000000 --- a/extra/slim/fix-numlock-1.3.3.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- trunk/app.cpp 2012/02/21 23:57:28 211 -+++ trunk/app.cpp 2012/04/16 23:28:34 212 -@@ -332,6 +332,15 @@ - Login(); - } - } -+ -+ // Set NumLock -+ string numlock = cfg->getOption("numlock"); -+ if (numlock == "on") { -+ NumLock::setOn(Dpy); -+ } else if (numlock == "off") { -+ NumLock::setOff(Dpy); -+ } -+ - // Start looping - int panelclosed = 1; - Panel::ActionType Action; -@@ -971,13 +980,6 @@ - break; - } - -- string numlock = cfg->getOption("numlock"); -- if (numlock == "on") { -- NumLock::setOn(Dpy); -- } else if (numlock == "off") { -- NumLock::setOff(Dpy); -- } -- - delete args; - - serverStarted = true; ---- trunk/numlock.cpp 2012/02/21 23:57:28 211 -+++ trunk/numlock.cpp 2012/04/16 23:28:34 212 -@@ -68,9 +68,9 @@ - return; - - if( flag == true ) -- XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0); -- else - XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask); -+ else -+ XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0); - } - - void NumLock::setOn(Display *dpy) { diff --git a/extra/slim/install b/extra/slim/install deleted file mode 100644 index 65aa77d72..000000000 --- a/extra/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/extra/slim/libpng-1.4+-support.patch b/extra/slim/libpng-1.4+-support.patch deleted file mode 100644 index 57b39272b..000000000 --- a/extra/slim/libpng-1.4+-support.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/image.cpp 2012-06-26 04:20:14.000000000 -0400 -+++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400 -@@ -781,7 +781,11 @@ - (png_infopp) NULL); - } - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((png_ptr)))) { -+#else - if (setjmp(png_ptr->jmpbuf)) { -+#endif - goto png_destroy; - } - diff --git a/extra/slim/logrotate b/extra/slim/logrotate deleted file mode 100644 index 26ec3b0f4..000000000 --- a/extra/slim/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/extra/slim/pam.d b/extra/slim/pam.d deleted file mode 100644 index 59db5a8c5..000000000 --- a/extra/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_systemd.so diff --git a/extra/slim/ptr_pam.patch b/extra/slim/ptr_pam.patch deleted file mode 100644 index 3a3fbcdb7..000000000 --- a/extra/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/extra/slim/rc.d b/extra/slim/rc.d deleted file mode 100755 index b0be7ffc5..000000000 --- a/extra/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/extra/slim/session-name.patch b/extra/slim/session-name.patch deleted file mode 100644 index 8211c4f72..000000000 --- a/extra/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/extra/slim/slim.service b/extra/slim/slim.service deleted file mode 100644 index b894085a0..000000000 --- a/extra/slim/slim.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SLiM Simple Login Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/slim -nodaemon - -[Install] -Alias=display-manager.service diff --git a/extra/slim/tty-slowness.patch b/extra/slim/tty-slowness.patch deleted file mode 100644 index c590fbed8..000000000 --- a/extra/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/extra/smartmontools/smartd.rc b/extra/smartmontools/smartd.rc deleted file mode 100755 index 16920db12..000000000 --- a/extra/smartmontools/smartd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# source application-specific settings -SMARTD_ARGS= -[ -f /etc/conf.d/smartd ] && . /etc/conf.d/smartd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - - start) - stat_busy "Starting smartd" - /usr/sbin/smartd ${SMARTD_ARGS} &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon smartd - stat_done - fi - ;; - - stop) - stat_busy "Stopping smartd" - kill -9 `pidof /usr/sbin/smartd` &>/dev/null - rm_daemon smartd - stat_done - ;; - - restart) - stat_busy "Restarting smartd ..." - $0 stop - $0 start - stat_done - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/sonata/ChangeLog b/extra/sonata/ChangeLog deleted file mode 100644 index 8311a287c..000000000 --- a/extra/sonata/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -2011-07-26 Angel Velasquez <angvp@archlinux.org> - * sonata 1.6.2.1-7: - Applied patch to pull lyrics FS#25036 - -2009-03-30 Alexander Fehr <pizzapunk gmail com> - - * sonata-1.6-1: - New upstream release. - -2008-09-15 Alexander Fehr <pizzapunk gmail com> - - * sonata-1.5.3-1: - New upstream release. - New maintainer. - Replaced install file with optdepends. - Added ChangeLog. diff --git a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch deleted file mode 100644 index 562e38e97..000000000 --- a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up soundtouch/source/SoundTouch/Makefile.am~ soundtouch/source/SoundTouch/Makefile.am ---- soundtouch/source/SoundTouch/Makefile.am~ 2009-02-15 11:21:36.000000000 +0100 -+++ soundtouch/source/SoundTouch/Makefile.am 2009-02-15 11:23:30.000000000 +0100 -@@ -36,7 +36,9 @@ - # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can
- # fix this script to automatically check for CPU architecture, please submit a patch
- # to me.
--AM_CXXFLAGS=-O3 -msse2 -fcheck-new -I../../include
-+AM_CXXFLAGS = -fcheck-new -I../../include
-+mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
-+sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include
-
-
- # other linking flags to add
diff --git a/extra/soundtouch/soundtouch-1.4.0-x86_64-asm-broken.patch b/extra/soundtouch/soundtouch-1.4.0-x86_64-asm-broken.patch deleted file mode 100644 index 4c777d60e..000000000 --- a/extra/soundtouch/soundtouch-1.4.0-x86_64-asm-broken.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up soundtouch/include/STTypes.h~ soundtouch/include/STTypes.h ---- soundtouch/include/STTypes.h~ 2009-01-25 17:32:53.000000000 +0100 -+++ soundtouch/include/STTypes.h 2009-02-14 22:22:37.000000000 +0100 -@@ -87,7 +87,7 @@ namespace soundtouch
-
- #endif
-
-- #if (WIN32 || __i386__ || __x86_64__)
-+ #if (WIN32 || __i386__)
- /// Define this to allow X86-specific assembler/intrinsic optimizations.
- /// Notice that library contains also usual C++ versions of each of these
- /// these routines, so if you're having difficulties getting the optimized
diff --git a/extra/speedtouch/PKGBUILD b/extra/speedtouch/PKGBUILD deleted file mode 100644 index 658d0f7e7..000000000 --- a/extra/speedtouch/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 143969 2011-11-30 23:13:25Z giovanni $ -# Maintainer: dorphell <dorphell@archlinux.org> -# Contributor: Aurelien Foret <orelien@chez.com> - -pkgname=speedtouch -pkgver=1.3.1 -pkgrel=4 -pkgdesc="Driver for the ADSL Speed Touch USB modem" -arch=('i686' 'x86_64') -url="http://speedtouch.sourceforge.net/" -license=('GPL') -depends=('bash') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'speedtouch-1.3.1-gcc4.patch') -md5sums=('0848a120ae0eeab6c8ab378e11dc4fa2' - '4191035925db745944c75e26937c42a3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i ${srcdir}/speedtouch-1.3.1-gcc4.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make prefix=${pkgdir}/usr sysconfdir=${pkgdir}/etc mandir=${pkgdir}/usr/share/man install -} diff --git a/extra/speedtouch/speedtouch-1.3.1-gcc4.patch b/extra/speedtouch/speedtouch-1.3.1-gcc4.patch deleted file mode 100644 index bdd323c50..000000000 --- a/extra/speedtouch/speedtouch-1.3.1-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- speedtouch-1.3.1/src/modem.h 2004-09-29 21:56:31.000000000 +0100 -+++ speedtouch-1.3.1-gcc4/src/modem.h 2005-07-21 07:15:03.000000000 +0100 -@@ -38,7 +38,4 @@ - #define EP_CODE_IN 0x85 - #define EP_CODE_OUT 0x05 - --/* Global Variables */ --extern int verbose; -- - #endif -
\ No newline at end of file diff --git a/extra/stardict/NetDictRequests.patch b/extra/stardict/NetDictRequests.patch deleted file mode 100644 index 4d6fe145a..000000000 --- a/extra/stardict/NetDictRequests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp ---- old/dict/src/lib/compositelookup.cpp 2011-07-02 23:58:40.000000000 -0700 -+++ new/dict/src/lib/compositelookup.cpp 2011-07-18 07:40:01.795710505 -0700 -@@ -50,7 +50,7 @@ - void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) - { - NetDictRequest request(dict_id, key); -- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); -+ std::find(NetDictRequests.begin(), NetDictRequests.end(), request); - NetDictRequests.push_back(request); - } - diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD deleted file mode 100644 index e17f9eb91..000000000 --- a/extra/stardict/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 163464 2012-07-12 12:42:33Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Neil Lin <neil@vip.url.com.tw> - -pkgname=stardict -pkgver=3.0.3 -pkgrel=2 -pkgdesc='International dictionary software' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.stardict.org/' -license=('GPL') -depends=('enchant' 'gtk2' 'libsigc++' 'libsm') -makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient') -options=('!libtool' '!emptydirs') -source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2" - 'crash-empty-dict.patch' - 'gcc46.patch' - 'glib2.patch' - 'zlib.patch') -sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f' - '97af8fdb73c8f04674234b629c6867254e9bd043' - '6605a9cdfc4abc2a0ab4462d1228233d34806f0a' - '467880bca5e89aa25cb4a57a9e1caba9a8841822' - '024ac5eb75a11c96569e31021a4bd65463b3cf5b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../crash-empty-dict.patch - patch -p1 -i ../gcc46.patch - patch -p1 -i ../glib2.patch - patch -p1 -i ../zlib.patch - ./autogen.sh # gnome-autogen.sh requires gnome-common - - ./configure \ - PKG_CONFIG=/usr/bin/pkg-config \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --disable-gnome-support \ - --disable-schemas-install \ - --disable-espeak \ - --disable-gucharmap \ - --disable-festival \ - --disable-updateinfo \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/stardict/crash-empty-dict.patch b/extra/stardict/crash-empty-dict.patch deleted file mode 100644 index 4d6fe145a..000000000 --- a/extra/stardict/crash-empty-dict.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp ---- old/dict/src/lib/compositelookup.cpp 2011-07-02 23:58:40.000000000 -0700 -+++ new/dict/src/lib/compositelookup.cpp 2011-07-18 07:40:01.795710505 -0700 -@@ -50,7 +50,7 @@ - void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) - { - NetDictRequest request(dict_id, key); -- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); -+ std::find(NetDictRequests.begin(), NetDictRequests.end(), request); - NetDictRequests.push_back(request); - } - diff --git a/extra/stardict/gcc46.patch b/extra/stardict/gcc46.patch deleted file mode 100644 index 944b9635c..000000000 --- a/extra/stardict/gcc46.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h ---- old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h 2011-07-18 06:58:58.519404744 -0700 -+++ new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h 2011-07-18 07:01:10.739734313 -0700 -@@ -26,6 +26,7 @@ - #ifndef __TYPES_H__ - #define __TYPES_H__ - -+#include <cstddef> - #include <math.h> - - typedef float single; diff --git a/extra/stardict/glib2.patch b/extra/stardict/glib2.patch deleted file mode 100644 index 6296dab0d..000000000 --- a/extra/stardict/glib2.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur old/dict/configure.ac new/dict/configure.ac ---- old/dict/configure.ac 2011-07-03 16:58:40.000000000 +1000 -+++ new/dict/configure.ac 2012-07-12 22:31:52.875176842 +1000 -@@ -266,6 +266,9 @@ - fi - AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR) - -+GMODULE2_LIBS=`pkg-config --libs gmodule-2.0` -+AC_SUBST([GMODULE2_LIBS]) -+ - dnl ================================================================ - dnl main program checks. - dnl ================================================================ -diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am ---- old/dict/src/Makefile.am 2011-07-03 16:58:40.000000000 +1000 -+++ new/dict/src/Makefile.am 2012-07-12 22:29:53.714870692 +1000 -@@ -33,7 +33,7 @@ - stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE) - stardict_LDFLAGS = - ## place libstardict.la before any system library, otherwise build with --as-needed linker option may fail --stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) -+stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) $(GMODULE2_LIBS) - - if !GNOME_SUPPORT - if MAEMO_SUPPORT -diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h ---- old/dict/src/tomboykeybinder.h 2011-07-03 16:58:40.000000000 +1000 -+++ new/dict/src/tomboykeybinder.h 2012-07-12 22:28:04.337920391 +1000 -@@ -21,7 +21,6 @@ - #ifndef __TOMBOY_KEY_BINDER_H__ - #define __TOMBOY_KEY_BINDER_H__ - --#include <glib/gtypes.h> - - G_BEGIN_DECLS - diff --git a/extra/stardict/zlib.patch b/extra/stardict/zlib.patch deleted file mode 100644 index eb5a9a12a..000000000 --- a/extra/stardict/zlib.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur old/lib/src/libcommon.cpp new/lib/src/libcommon.cpp ---- old/lib/src/libcommon.cpp 2012-07-12 11:33:30.343333334 +0000 -+++ new/lib/src/libcommon.cpp 2012-07-12 11:34:05.006568754 +0000 -@@ -614,7 +614,7 @@ - return EXIT_FAILURE; - } - while(true) { -- len = gzread(get_impl(in), buf, buffer_size); -+ len = gzread((gzFile)get_impl(in), buf, buffer_size); - if(len < 0) { - g_critical(read_file_err, arch_file_name, ""); - return EXIT_FAILURE; -@@ -871,3 +871,8 @@ - return res; - } - } -+ -+int gzclose_compat(void * file) -+{ -+ return gzclose ((gzFile)file); -+} -diff -Naur old/lib/src/libcommon.h new/lib/src/libcommon.h ---- old/lib/src/libcommon.h 2012-07-12 11:33:30.343333334 +0000 -+++ new/lib/src/libcommon.h 2012-07-12 11:34:05.006568754 +0000 -@@ -187,8 +187,9 @@ - typedef ResourceWrapper<FILE, FILE*, int, fclose> File; - } - -+extern int gzclose_compat(void * file); - namespace zip { --typedef ResourceWrapper<void, void*, int, gzclose> gzFile; -+typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile; - } - - /* Create a new temporary file. Return file name in file name encoding. diff --git a/extra/strigi/gcc47.patch b/extra/strigi/gcc47.patch deleted file mode 100644 index d99582563..000000000 --- a/extra/strigi/gcc47.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Rex Dieter <rdieter@fedoraproject.org> -Date: Mon, 09 Jan 2012 17:13:25 +0000 -Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep' -X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&a=commitdiff&h=a8e97f672325557b3fbc84b987299350ec5ac10b ---- -gcc47 fix, unistd.h header required unconditionally for 'sleep' ---- - - ---- a/bin/daemon/eventlistener/eventlistenerqueue.cpp -+++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp -@@ -27,9 +27,7 @@ - #include <iostream> - #include <stdio.h> - --#if defined(__SUNPRO_CC) - #include <unistd.h> --#endif - - using namespace std; - - diff --git a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch deleted file mode 100644 index a571c3c3c..000000000 --- a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp ---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 -+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 -@@ -60,6 +60,9 @@ - /* KWallet simple provider, puts passwords in KWallet */ - /*-----------------------------------------------------------------------*/ - -+static int q_argc = 1; -+static char q_argv0[] = "svn"; // Build non-const char * from string constant -+static char *q_argv[] = { q_argv0 }; - - static const char * - get_application_name(apr_hash_t *parameters, -@@ -175,6 +178,10 @@ - "kwallet-initialized", - APR_HASH_KEY_STRING, - NULL); -+ apr_hash_set(parameters, -+ "kwallet-wallet", -+ APR_HASH_KEY_STRING, -+ NULL); - } - return APR_SUCCESS; - } -@@ -203,12 +210,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), -@@ -273,12 +279,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), diff --git a/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch deleted file mode 100644 index a571c3c3c..000000000 --- a/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp ---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 -+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 -@@ -60,6 +60,9 @@ - /* KWallet simple provider, puts passwords in KWallet */ - /*-----------------------------------------------------------------------*/ - -+static int q_argc = 1; -+static char q_argv0[] = "svn"; // Build non-const char * from string constant -+static char *q_argv[] = { q_argv0 }; - - static const char * - get_application_name(apr_hash_t *parameters, -@@ -175,6 +178,10 @@ - "kwallet-initialized", - APR_HASH_KEY_STRING, - NULL); -+ apr_hash_set(parameters, -+ "kwallet-wallet", -+ APR_HASH_KEY_STRING, -+ NULL); - } - return APR_SUCCESS; - } -@@ -203,12 +210,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), -@@ -273,12 +279,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), diff --git a/extra/swig/pyint_fromsize_t.diff b/extra/swig/pyint_fromsize_t.diff deleted file mode 100644 index 1c7727ae2..000000000 --- a/extra/swig/pyint_fromsize_t.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: Py3k: Map PyInt_FromSize_t to PyLong_FromSize_t - The latest SWIG version introduced a usage of PyInt_FromSize_t, but - does not define a compatibility macro for Python 3k as for the other - PyInt_... functions. This patch adds that macro. - -Author: Torsten Landschoff <torsten@debian.org> - - ---- swig2.0-2.0.7.orig/Lib/python/pyhead.swg -+++ swig2.0-2.0.7/Lib/python/pyhead.swg -@@ -5,6 +5,7 @@ - #define PyInt_Check(x) PyLong_Check(x) - #define PyInt_AsLong(x) PyLong_AsLong(x) - #define PyInt_FromLong(x) PyLong_FromLong(x) -+#define PyInt_FromSize_t(x) PyLong_FromSize_t(x) - #define PyString_Check(name) PyBytes_Check(name) - #define PyString_FromString(x) PyUnicode_FromString(x) - #define PyString_Format(fmt, args) PyUnicode_Format(fmt, args) diff --git a/extra/swig/upstream_r13128.diff b/extra/swig/upstream_r13128.diff deleted file mode 100644 index d7d74d7e5..000000000 --- a/extra/swig/upstream_r13128.diff +++ /dev/null @@ -1,73 +0,0 @@ -From: Klaus Kämpf <kkaempf@suse.de> -Subject: Fix call to Swig_name_decl (upstream ID 3530078) - -Origin: upstream, http://swig.svn.sourceforge.net/viewvc/swig?view=revision&revision=13128 -Bug: http://sourceforge.net/tracker/?func=detail&aid=3530078&group_id=1645&atid=101645 -Bug-Debian: http://bugs.debian.org/675196 ---- - Examples/test-suite/errors/expected.log | 26 +++++++++++++------------- - Source/Modules/lang.cxx | 4 ++-- - 2 files changed, 15 insertions(+), 15 deletions(-) - ---- a/Source/Modules/lang.cxx -+++ b/Source/Modules/lang.cxx -@@ -2623,7 +2623,7 @@ int Language::constructorDeclaration(Nod - Delete(expected_name_resolved); - } - if (illegal_name) { -- Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name)); -+ Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n)); - Swig_restore(n); - return SWIG_NOWRAP; - } -@@ -2760,7 +2760,7 @@ int Language::destructorDeclaration(Node - } - - if (illegal_name) { -- Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name)); -+ Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n)); - Swig_restore(n); - Delete(expected_name); - return SWIG_NOWRAP; ---- a/Examples/test-suite/errors/expected.log -+++ b/Examples/test-suite/errors/expected.log -@@ -227,17 +227,17 @@ cpp_extend_destructors.i:87: Warning 302 - cpp_extend_destructors.i:85: Warning 302: previous definition of '~JStruct'. - cpp_extend_destructors.i:100: Warning 302: Identifier '~LStruct' redefined (ignored), - cpp_extend_destructors.i:98: Warning 302: previous definition of '~LStruct'. --cpp_extend_destructors.i:24: Warning 521: Illegal destructor name ~NOT_CStruct. Ignored. --cpp_extend_destructors.i:30: Warning 521: Illegal destructor name ~NOT_DStruct. Ignored. --cpp_extend_destructors.i:44: Warning 521: Illegal destructor name ~NOT_EStruct. Ignored. --cpp_extend_destructors.i:50: Warning 521: Illegal destructor name ~NOT_FStruct. Ignored. --cpp_extend_destructors.i:65: Warning 521: Illegal destructor name ~NOT_GStruct. Ignored. --cpp_extend_destructors.i:72: Warning 521: Illegal destructor name ~NOT_HStruct. Ignored. --cpp_extend_destructors.i:81: Warning 521: Illegal destructor name ~NOT_IStruct. Ignored. --cpp_extend_destructors.i:86: Warning 521: Illegal destructor name ~NOT_JStruct. Ignored. --cpp_extend_destructors.i:92: Warning 521: Illegal destructor name ~NOT_KStruct. Ignored. --cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< int >. Ignored. --cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< short >. Ignored. -+cpp_extend_destructors.i:24: Warning 521: Illegal destructor name CStruct::~NOT_CStruct(). Ignored. -+cpp_extend_destructors.i:30: Warning 521: Illegal destructor name DStruct::~NOT_DStruct(). Ignored. -+cpp_extend_destructors.i:44: Warning 521: Illegal destructor name EStruct::~NOT_EStruct(). Ignored. -+cpp_extend_destructors.i:50: Warning 521: Illegal destructor name FStruct::~NOT_FStruct(). Ignored. -+cpp_extend_destructors.i:65: Warning 521: Illegal destructor name GStruct::~NOT_GStruct(). Ignored. -+cpp_extend_destructors.i:72: Warning 521: Illegal destructor name HStruct::~NOT_HStruct(). Ignored. -+cpp_extend_destructors.i:81: Warning 521: Illegal destructor name IStruct::~NOT_IStruct(). Ignored. -+cpp_extend_destructors.i:86: Warning 521: Illegal destructor name JStruct::~NOT_JStruct(). Ignored. -+cpp_extend_destructors.i:92: Warning 521: Illegal destructor name KStruct::~NOT_KStruct(). Ignored. -+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< int >::~NOT_LStruct(). Ignored. -+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< short >::~NOT_LStruct(). Ignored. - - :::::::::::::::::::::::::::::::: cpp_extend_redefine.i ::::::::::::::::::::::::::::::::::: - cpp_extend_redefine.i:9: Warning 302: Identifier 'bar' redefined by %extend (ignored), -@@ -312,8 +312,8 @@ cpp_nested.i:12: Warning 325: Nested cla - cpp_no_access.i:3: Warning 319: No access specifier given for base class 'foo' (ignored). - - :::::::::::::::::::::::::::::::: cpp_no_return_type.i ::::::::::::::::::::::::::::::::::: --cpp_no_return_type.i:6: Warning 504: Function R must have a return type. Ignored. --cpp_no_return_type.i:10: Warning 504: Function UU must have a return type. Ignored. -+cpp_no_return_type.i:6: Warning 504: Function S::R() must have a return type. Ignored. -+cpp_no_return_type.i:10: Warning 504: Function U::UU() must have a return type. Ignored. - - :::::::::::::::::::::::::::::::: cpp_nobase.i ::::::::::::::::::::::::::::::::::: - cpp_nobase.i:3: Warning 401: Nothing known about base class 'Bar'. Ignored. diff --git a/extra/taglib/ape-idev2.patch b/extra/taglib/ape-idev2.patch deleted file mode 100644 index 9c58da420..000000000 --- a/extra/taglib/ape-idev2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur taglib-1.7.orig/taglib/ape/apeproperties.cpp taglib-1.7/taglib/ape/apeproperties.cpp ---- taglib-1.7.orig/taglib/ape/apeproperties.cpp 2011-03-12 00:15:38.000000000 +1100 -+++ taglib-1.7/taglib/ape/apeproperties.cpp 2011-07-29 21:19:45.984345060 +1000 -@@ -137,7 +137,7 @@ - long ID3v2OriginalSize = 0; - bool hasID3v2 = false; - if(ID3v2Location >= 0) { -- ID3v2::Tag tag(d->file, ID3v2Location, 0); -+ ID3v2::Tag tag(d->file, ID3v2Location); - ID3v2OriginalSize = tag.header()->completeTagSize(); - if(tag.header()->tagSize() > 0) - hasID3v2 = true; diff --git a/extra/telepathy-qt/gcc47.patch b/extra/telepathy-qt/gcc47.patch deleted file mode 100644 index ac6ae67fb..000000000 --- a/extra/telepathy-qt/gcc47.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp ---- telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp 2012-04-01 17:44:00.013466055 +0000 -+++ telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp 2012-04-01 17:51:00.233486476 +0000 -@@ -39,6 +39,8 @@ - #include <TelepathyQt/MethodInvocationContext> - #include <TelepathyQt/PendingComposite> - #include <TelepathyQt/PendingReady> -+ -+#include <stdint.h> - - namespace Tp - { -diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp ---- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:44:00.006799442 +0000 -+++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:51:00.233486476 +0000 -@@ -38,6 +38,8 @@ - #include <QAbstractSocket> - #include <QHash> - -+#include <stdint.h> -+ - namespace Tp - { - -diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp ---- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:44:00.003466134 +0000 -+++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:51:00.233486476 +0000 -@@ -38,6 +38,8 @@ - #include <TelepathyQt/OutgoingStreamTubeChannel> - #include <TelepathyQt/StreamTubeChannel> - -+#include <stdint.h> -+ - namespace Tp - { - diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD deleted file mode 100644 index edef8f505..000000000 --- a/extra/terminal/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 157827 2012-04-30 04:19:45Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: tobias <tobias funnychar archlinux.org> -# Contributor: Aurelien Foret <orelien@chez.com> - -pkgname=terminal -pkgver=0.4.8 -pkgrel=2 -pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.xfce.org/projects/terminal/" -license=('GPL2') -groups=('xfce4') -depends=('exo' 'vte' 'dbus-glib' 'startup-notification' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool') -options=('!libtool') -install=$pkgname.install -source=(http://archive.xfce.org/src/apps/$pkgname/0.4/Terminal-$pkgver.tar.bz2) -sha256sums=('fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d') - -build() { - cd "$srcdir/Terminal-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd "$srcdir/Terminal-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/terminal/terminal.install b/extra/terminal/terminal.install deleted file mode 100644 index e4f8fd06c..000000000 --- a/extra/terminal/terminal.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/extra/texlive-bin/09-texlive-fonts.conf b/extra/texlive-bin/09-texlive-fonts.conf deleted file mode 100644 index f870fbd7a..000000000 --- a/extra/texlive-bin/09-texlive-fonts.conf +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <dir>/usr/share/texmf-dist/fonts/opentype</dir> - <dir>/usr/share/texmf-dist/fonts/truetype</dir> - <dir>/usr/local/share/texmf/fonts/opentype</dir> - <dir>/usr/local/share/texmf/fonts/truetype</dir> -</fontconfig> - diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD deleted file mode 100644 index a3278aa7f..000000000 --- a/extra/texlive-bin/PKGBUILD +++ /dev/null @@ -1,311 +0,0 @@ -# $Id: PKGBUILD 169389 2012-10-20 09:31:50Z andyrtr $ -# Maintainer: RĂ©my Oudompheng <remy@archlinux.org> -# Contributor: francois <francois.archlinux.org> - -pkgname=texlive-bin -pkgver=2012.0 -pkgrel=5 -pkgdesc="TeX Live binaries" -license=('GPL') -arch=('i686' 'x86_64') -depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') -makedepends=('perl' 'clisp' 'ffcall') -optdepends=('ed: for texconfig') -provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam') -conflicts=('pdfjam') -options=('!libtool' '!strip') -url='http://tug.org/texlive/' -install="texlive.install" -source=('texmf.cnf' - 'fix-fontforge-encoding.patch' - '09-texlive-fonts.conf' - 'poppler-0.20.patch' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz' - 'luatex-r4449-radical-rule-thickness.patch' -) -backup=(etc/texmf/web2c/texmf.cnf \ - etc/texmf/chktex/chktexrc \ - etc/texmf/dvipdfm/config/config \ - etc/texmf/dvipdfmx/dvipdfmx.cfg \ - etc/texmf/dvips/config/config.ps \ - etc/texmf/tex/generic/config/language.dat \ - etc/texmf/tex/generic/config/language.def \ - etc/texmf/tex/generic/config/pdftexconfig.tex \ - etc/texmf/ttf2pk/ttf2pk.cfg \ - etc/texmf/web2c/fmtutil.cnf \ - etc/texmf/web2c/mktex.cnf \ - etc/texmf/xdvi/XDvi) - -md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' - 'bfb9716aa00c86c08cd31e5b32edeb98' - '393a4bf67adc7ca5df2b386759d1a637' - 'e3a664d5a7f0923f35060fe9d25d2573' - 'ac2c3c3aa765581f8504e21a5edbfb9f' - 'f315a860158cfc952c82a6d759961024' - '5190f3295eb9a604c5f17f5bd607299b') - -build() { - if [ "${CARCH}" = "x86_64" ]; then - export CFLAGS="${CFLAGS} -fPIC" - export CXXFLAGS="${CXXFLAGS} -fPIC" - fi - - cd "$srcdir" - # this patch removes spurious error message with locale "xx_YY.utf8" - patch -Np0 -i fix-fontforge-encoding.patch - # fix build with poppler >= 0.20 - patch -Np0 -i poppler-0.20.patch - # fix radical rule thickness regression in Luatex - # http://tex.stackexchange.com/q/61952/729 - patch -Np0 -i luatex-r4449-radical-rule-thickness.patch - # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) - sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c - ############################################################# - ### configure - cd source - ## prevent compiling Xdvi with libXp - sed -i~ 's|-lXp ||' texk/xdvik/configure - test ! -d Work && mkdir Work - cd Work - echo "--> Initial configuration..." - # we use temporary prefix to avoid messing the existing - # $pkgdir/usr/share/texmf tree - # system zlib is disabled due to issues with zlib 1.2.6 (FS#28221) - ../configure --prefix=/usr -C \ - --sysconfdir=/etc \ - --datarootdir=/usr/share \ - --datadir=/usr/share \ - --mandir=/usr/share/man \ - --disable-native-texlive-build \ - --with-banner-add="/Arch Linux" \ - --disable-multiplatform \ - --disable-dialog \ - --disable-psutils \ - --disable-t1utils \ - --disable-bibtexu \ - --disable-xz \ - --with-system-zlib \ - --with-system-zziplib \ - --with-system-pnglib \ - --with-system-ncurses \ - --with-system-t1lib \ - --with-system-gd \ - --with-system-poppler \ - --with-system-xpdf \ - --with-system-freetype2 \ - --without-system-graphite \ - --with-freetype2-libdir=/usr/lib \ - --with-freetype2-include=/usr/include/freetype2 \ - --with-xdvi-x-toolkit=xaw \ - --disable-dump-share \ - --disable-aleph \ - --enable-luatex \ - --with-clisp-runtime=default \ - --enable-xindy --disable-xindy-rules --disable-xindy-docs - ############################################################# - ### make - echo "-------------------------------------------------------" - echo "--> Building the whole beast ..." - echo "-------------------------------------------------------" - make -} - -package() { - cd "$srcdir" - ############################################################# - ### install texmf tree - echo "-------------------------------------------------------" - echo "--> installing the texmf tree" - echo "-------------------------------------------------------" - install -m755 -d "$pkgdir"/usr/share - cp -r texmf "$pkgdir"/usr/share/ - install -d -m755 "$pkgdir"/etc/texmf/web2c - install -d -m755 "$pkgdir"/etc/texmf/chktex - install -d -m755 "$pkgdir"/etc/texmf/dvips/config - install -d -m755 "$pkgdir"/etc/texmf/dvipdfm/config - install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx - install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config - install -d -m755 "$pkgdir"/etc/texmf/ttf2pk - install -d -m755 "$pkgdir"/etc/texmf/xdvi - install -d -m755 "$pkgdir"/etc/fonts/conf.avail - install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/ - # move man files to /usr/share/man - for i in 1 5; do - install -d -m755 "$pkgdir"/usr/share/man/man$i - mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/ - done - # move info files to /usr/share/info - install -d -m755 "$pkgdir"/usr/share/info - mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/ - rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info} - # copy config files to $TEXMFCONFIG tree - cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \ - "$pkgdir"/etc/texmf/chktex/ - cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \ - "$pkgdir"/etc/texmf/web2c/ - cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \ - "$pkgdir"/etc/texmf/web2c/ - cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \ - "$pkgdir"/etc/texmf/web2c/ - cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \ - "$pkgdir"/etc/texmf/dvips/config/ - cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \ - "$pkgdir"/etc/texmf/dvipdfm/config/ - cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \ - "$pkgdir"/etc/texmf/dvipdfmx/ - cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \ - "$pkgdir"/etc/texmf/tex/generic/config/ - cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \ - "$pkgdir"/etc/texmf/tex/generic/config/ - cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \ - "$pkgdir"/etc/texmf/tex/generic/config/ - cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \ - "$pkgdir"/etc/texmf/ttf2pk/ - cp -a "$pkgdir"/usr/share/texmf/xdvi/XDvi \ - "$pkgdir"/etc/texmf/xdvi/ - # remove TL specific warnings in the language.{dat,def} files: - sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.* - # clean updmap.cfg - sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg - sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg - - ############################################################# - ### install - cd source - # fixes for xindy - find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \; - - echo "-------------------------------------------------------" - echo "--> Proceeding with make install ..." - echo "-------------------------------------------------------" - cd Work - make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install - rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist} - - # replace upstream texmf.cnf with ours - rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf - install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf - # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c - # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter - ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf - # fix location of TEXMFCACHE for luatools - sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua - ## remove aleph from fmtutil.cnf - sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf - - ## install Perl libraries - mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive - install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive - - # create symlinks for formats - echo "--> Create symlinks for TeX formats ..." - PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/ - ############################################################# - # remove dangling symlinks - _bibtexextra_scripts=" -bibexport -listbib -urlbst -" - _core_scripts=" -afm2afm -arlatex -autoinst -bundledoc -checkcites -cmap2enc -ctanify -ctanupload -de-macro -dosepsbin -dviasm -epstopdf -findhyph -font2afm -fragmaster -installfont-tl -latex2man -latexdiff -latexdiff-vc -latexfileversion -latexmk -latexrevise -listings-ext.sh -match_parens -mf2pt1 -mkjobtexmf -mkluatexfontdb -mkt1font -mptopdf -ot2kpx -pdf180 -pdf270 -pdf90 -pdfatfi -pdfbook -pdfcrop -pdfflip -pdfjam -pdfjam-pocketmod -pdfjam-slides3up -pdfjam-slides6up -pdfjoin -pdfnup -pdfpun -pfm2kpx -pkfix -pkfix-helper -purifyeps -repstopdf -rpdfcrop -showglyphs -sty2dtx -texcount -texdef -texdiff -texdirflatten -texliveonfly -texloganalyser -typeoutfileinfo -thumbpdf -vpl2ovp -vpl2vpl -" - _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" - _langcjk_scripts="convbkmk updmap-setup-kanji" - _langextra_scripts="ebong" - _langgreek_scripts="mkgrkindex" - _latexextra_scripts=" -authorindex -exceltex -makeglossaries -pdfannotextractor -perltex -ppower4 -ps4pdf -splitindex -svn-multi -vpe" - _music_scripts="m-tx musixtex musixflx pmx2pdf" - _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic" - _pstricks_scripts="pedigree pst2pdf" - _science_scripts="ulqda" - for s in \ - ${_bibtexextra_scripts} \ - ${_core_scripts} \ - ${_htmlxml_scripts} \ - ${_langcjk_scripts} \ - ${_langextra_scripts} \ - ${_langgreek_scripts} \ - ${_latexextra_scripts} \ - ${_music_scripts} \ - ${_pictures_scripts} \ - ${_pstricks_scripts} \ - ${_science_scripts} \ - tlmgr; do - rm -f "$pkgdir"/usr/bin/$s - done - ################################################################### -} - diff --git a/extra/texlive-bin/fix-fontforge-encoding.patch b/extra/texlive-bin/fix-fontforge-encoding.patch deleted file mode 100644 index 8104b3289..000000000 --- a/extra/texlive-bin/fix-fontforge-encoding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig 2009-09-30 19:27:00.935039526 +0200 -+++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c 2009-09-30 19:28:04.908364646 +0200 -@@ -495,6 +495,9 @@ - { "Big5HKSCS", e_big5hkscs }, - { "Big5-HKSCS", e_big5hkscs }, - { "UTF-8", e_utf8 }, -+ { "utf-8", e_utf8 }, -+ { "UTF8", e_utf8 }, -+ { "utf8", e_utf8 }, - { "ISO-10646/UTF-8", e_utf8 }, - { "ISO_10646/UTF-8", e_utf8 }, - { "UCS2", e_unicode }, diff --git a/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch b/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch deleted file mode 100644 index f925a1a93..000000000 --- a/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: source/texk/web2c/luatexdir/tex/mlist.w -=================================================================== ---- source/texk/web2c/luatexdir/tex/mlist.w (revision 4448) -+++ source/texk/web2c/luatexdir/tex/mlist.w (revision 4449) -@@ -1798,7 +1798,17 @@ - theta = fraction_rule(cur_style); - y = var_delimiter(left_delimiter(q), cur_size, - height(x) + depth(x) + clr + theta, NULL, cur_style); -- theta = height(y); -+ /* If |y| is a composite then set |theta| to the height of its top -+ character, else set it to the height of |y|. */ -+ if (list_ptr(y) != null -+ && type(list_ptr(y)) == hlist_node -+ && list_ptr(list_ptr(y)) != null -+ && type(list_ptr(list_ptr(y))) == glyph_node) { /* and it should be */ -+ theta = char_height(font(list_ptr(list_ptr(y))), -+ character(list_ptr(list_ptr(y)))); -+ } else { -+ theta = height(y); -+ } - } else { - y = var_delimiter(left_delimiter(q), cur_size, - height(x) + depth(x) + clr + theta, NULL, cur_style); diff --git a/extra/texlive-bin/poppler-0.20.patch b/extra/texlive-bin/poppler-0.20.patch deleted file mode 100644 index 3bd8183ab..000000000 --- a/extra/texlive-bin/poppler-0.20.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-10-06 06:14:20.000000000 +0000 -+++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-17 11:30:26.327236883 +0000 -@@ -1433,7 +1433,7 @@ - - static int m_Object_getTypeName(lua_State * L) - { -- char *s; -+ const char *s; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_Object); - if (uin->pd != NULL && uin->pd->pc != uin->pc) ---- source/texk/web2c/pdftexdir/pdftosrc.cc.orig 2012-06-24 17:12:34.376329435 +0200 -+++ source/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-24 17:12:25.490003152 +0200 -@@ -134,7 +134,7 @@ - exit(1); - } - if (extract_xref_table) { -- int size = xref->getSize(); -+ int size = xref->getNumObjects(); - int i; - for (i = 0; i < size; i++) { - if (xref->getEntry(i)->offset == 0xffffffff) diff --git a/extra/texlive-bin/texlive.install b/extra/texlive-bin/texlive.install deleted file mode 100644 index 06a40a3b3..000000000 --- a/extra/texlive-bin/texlive.install +++ /dev/null @@ -1,43 +0,0 @@ -infodir=usr/share/info -filelist=(dvipng.info dvips.info eplain.info epspdf.info fontname.info kpathsea.info latex2e-es.info latex2e.info latex2man.info mf2pt1.info tds.info texdraw.info web2c.info) - -post_install() { - echo ">>> texlive: updating the filename database..." - usr/bin/mktexlsr - echo -n "creating all formats..." - usr/bin/fmtutil-sys --all 1>/dev/null - echo " done." - echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" - - [[ -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() { - local corename corever _pacout - echo ">>> texlive: updating the filename database..." - usr/bin/mktexlsr - _pacout=$(pacman -Q texlive-core 2>/dev/null) - read corename corever <<< ${_pacout} - if [[ ${corever} == 2012* ]]; then - echo -n "recreating all formats..." - usr/bin/fmtutil-sys --all 1>/dev/null - echo " done." - echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" - else - echo "WARNING: not recreating formats since texlive-core has version '$corever'" - fi - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} diff --git a/extra/texlive-bin/texmf.cnf b/extra/texlive-bin/texmf.cnf deleted file mode 100644 index 76975ee5c..000000000 --- a/extra/texlive-bin/texmf.cnf +++ /dev/null @@ -1,724 +0,0 @@ -% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea. -% Public domain. -% -% If you modify this original file, YOUR CHANGES WILL BE LOST when it is -% updated. Instead, put your changes -- and only your changes, not an -% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. -% -% What follows is a super-summary of what this .cnf file can -% contain. Please read the Kpathsea manual for more information. -% -% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned. -% The `=' (and surrounding spaces) is optional. -% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo. -% Long lines can be continued with a \. -% -% Earlier entries (in the same or another file) override later ones, and -% an environment variable foo overrides any texmf.cnf definition of foo. -% -% All definitions are read before anything is expanded, so you can use -% variables before they are defined. -% -% If a variable assignment is qualified with `.PROGRAM', it is ignored -% unless the current executable (last filename component of argv[0]) is -% named PROGRAM. This foo.PROGRAM construct is not recognized on the -% right-hand side. For environment variables, use FOO_PROGRAM. -% -% Which file formats use which paths for searches is described in the -% various programs' and the Kpathsea documentation (http://tug.org/kpathsea). -% -% // means to search subdirectories (recursively). -% A leading !! means to look only in the ls-R db, never on the disk. -% In this file, either ; or : can be used to separate path components. -% A leading/trailing/doubled path separator in the paths will be -% expanded into the compile-time default. Probably not what you want. -% -% Brace notation is supported, for example: /usr/local/{mytex,othertex} -% expands to /usr/local/mytex:/usr/local/othertex. We make extensive -% use of this. - - -% Part 1: Search paths and directories. - -% This is the parent directory of our several trees, i.e., -% /usr/local/texlive/YYYY in the original TeX Live distribution. -% -% All trees must be organized according to the TeX Directory Structure -% (http://tug.org/tds), or files may not be found. -% -% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. -TEXMFROOT = $SELFAUTODIR/share - -% The tree containing runtime files related to the specific -% distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf - -% The main tree of packages, distribution-agnostic: -TEXMFDIST = $TEXMFROOT/texmf-dist - -% Local additions to the distribution trees. -TEXMFLOCAL = /usr/local/share/texmf - -% TEXMFSYSVAR, where *-sys store cached runtime data. -TEXMFSYSVAR = /var/lib/texmf - -% TEXMFSYSCONFIG, where *-sys store configuration data. -TEXMFSYSCONFIG = /etc/texmf - -% Per-user texmf tree(s) -- organized per the TDS, as usual. To define -% more than one per-user tree, set this to a list of directories in -% braces, as described above. (This used to be HOMETEXMF.) ~ expands -% to %USERPROFILE% on Windows, $HOME otherwise. -TEXMFHOME = ~/texmf - -% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive/texmf-var - -% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive/texmf-config - -% List all the texmf trees. -% -% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named -% explicitly and before all other trees. -% -% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the -% files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as configuration files. Overriding them would -% be more likely to cause trouble than help. On the other hand, the -% bulk of packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those -- although it is generally -% a source of confusion to have different versions of a package -% installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} - -% Where to look for ls-R files. There need not be an ls-R in the -% directories in this path, but if there is one, Kpathsea will use it. -% By default, this is only the !! elements of TEXMF, so that mktexlsr -% does not create ls-R files in the non-!! elements -- because if an -% ls-R is present, it will be used, and the disk will not be searched. -% This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} - -% The system trees. These are the trees that are shared by all users. -% If a tree appears in this list, the mktex* scripts will use -% VARTEXFONTS for generated files, if the original tree isn't writable; -% otherwise the current working directory is used. -SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST - -% Where generated fonts may be written. This tree is used when the sources -% were found in a system tree and either that tree wasn't writable, or the -% varfonts feature was enabled in MT_FEATURES in mktex.cnf. -VARTEXFONTS = $TEXMFVAR/fonts - -% On some systems, there will be a system tree which contains all the font -% files that may be created as well as the formats. For example -% TEXMFVAR = /var/lib/texmf -% is used in many distros. In this case, set VARTEXFONTS like this -%VARTEXFONTS = $TEXMFVAR/fonts -% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). -% -% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below -% one of the TEXMF directories (avoids overlapping ls-R files). - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Usually you will not need to edit any of the following variables. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% WEB2C is for Web2C specific files. The current directory may not be -% a good place to look for them. -WEB2C = $TEXMF/web2c - -% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input -% or \openin, including .sty, .eps, etc. We specify paths for all known -% formats, past or present. Not all of them are built these days. - -% Plain TeX. Have the command tex check all directories as a last -% resort, we may have plain-compatible stuff anywhere. -TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// - -% Fontinst needs to read afm files. -TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}// - -% Other plain-based formats. -TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// -TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}// -TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}// -TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}// -TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// - -% LaTeX 2e specific macros are stored in latex/, macros that can only be -% used with 2.09 in latex209/. In addition, we look in the directory -% latex209, useful for macros that were written for 2.09 and do not -% mention 2e at all, but can be used with 2e. -TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// -TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// -TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}// - -% MLTeX. -TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}// -TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}// -TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}// - -% e-TeX. -TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// - -% pdfTeX. -TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// -TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// -TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// -TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// -TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// - -% pdfeTeX. -TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// - -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - -% LuaTeX. -TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// -TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// - -% XeTeX. -TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// -TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}// -TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}// - -% Omega / Aleph. -TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// -TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// -TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// -TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// - -% p(La)TeX. -TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// -TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// - -% epTeX. -TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// - -% pBibTeX bibliographies and style files. -BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// -BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// - -% ConTeXt. -TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// - -% jadetex. -TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// -TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// - -% XMLTeX. -TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// -TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// - -% Miscellany, no longer built. -TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// -TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// -TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// -TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// - -% Earlier entries override later ones, so put this generic one last. -TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// - -% ttf2tfm. -TTF2TFMINPUTS = .;$TEXMF/ttf2pk// - -% Metafont, MetaPost inputs. -MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// -MPINPUTS = .;$TEXMF/metapost// - -% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. -% We want to find the engine-specific file, e.g., cont-en.fmt can -% exist under both pdftex/ and xetex/. But just in case some formats -% end up without an engine directory, look directly in web2c/ too. -% We repeat the same definition three times because of the way fmtutil -% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats -% will not be found. -TEXFORMATS = .;$TEXMF/web2c{/$engine,} -MFBASES = .;$TEXMF/web2c{/$engine,} -MPMEMS = .;$TEXMF/web2c{/$engine,} -% -% As of 2008, pool files don't exist any more (the strings are compiled -% into the binaries), but just in case something expects to find these: -TEXPOOL = .;$TEXMF/web2c -MFPOOL = ${TEXPOOL} -MPPOOL = ${TEXPOOL} - -% support the original xdvi. Must come before the generic settings. -PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// -VFFONTS.XDvi = .;$TEXMF/%s -PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}// -TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}// - -% Device-independent font metric files. -VFFONTS = .;$TEXMF/fonts/vf// -TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm// - -% The $MAKETEX_MODE below means the drivers will not use a cx font when -% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init -% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual. -% The modeless part guarantees that bitmaps for PostScript fonts are found. -PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// - -% Similarly for the GF format, which only remains in existence because -% Metafont outputs it (and MF isn't going to change). -GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE// - -% A backup for PKFONTS and GFFONTS. Not used for anything. -GLYPHFONTS = .;$TEXMF/fonts - -% A place to puth everything that doesn't fit the other font categories. -MISCFONTS = .;$TEXMF/fonts/misc// - -% font name map files. This isn't just fonts/map// because ConTeXt -% wants support for having files with the same name in the different -% subdirs. Maybe if the programs ever get unified to accepting the same -% map file syntax the definition can be simplified again. -TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}// - -% BibTeX bibliographies and style files. bibtex8 also uses these. -BIBINPUTS = .;$TEXMF/bibtex/bib// -BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// - -% MlBibTeX. -MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// -MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// - -% .ris and .bltxml bibliography formats. -RISINPUTS = .;$TEXMF/bibtex/ris// -BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// - -% MFT style files. -MFTINPUTS = .;$TEXMF/mft// - -% PostScript headers and prologues (.pro); unfortunately, some programs -% also use this for acessing font files (enc, type1, truetype) -TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}// -TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}// - -% OSFONTDIR is to provide a convenient hook for allowing TeX to find -% fonts installed on the system (outside of TeX). An empty default -% value would add "//" to the search paths, so we give it a dummy value. -% OSFONTDIR = /usr/share/fonts - -% PostScript Type 1 outline fonts. -T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR// - -% PostScript AFM metric files. -AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// - -% TrueType outline fonts. -TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR// - -% OpenType outline fonts. -OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR// - -% Type 42 outline fonts. -T42FONTS = .;$TEXMF/fonts/type42// - -% Ligature definition files. -LIGFONTS = .;$TEXMF/fonts/lig// - -% Dvips' config.* files (this name should not start with `TEX'!). -TEXCONFIG = $TEXMF/dvips// - -% Makeindex style (.ist) files. -INDEXSTYLE = .;$TEXMF/makeindex// - -% Font encoding files (.enc). -ENCFONTS = .;$TEXMF/fonts/enc// - -% CMap files. -CMAPFONTS = .;$TEXMF/fonts/cmap// - -% Subfont definition files. -SFDFONTS = .;$TEXMF/fonts/sfd// - -% OpenType feature files (.fea). -FONTFEATURES=.;$TEXMF/fonts/fea// - -% .cid and .cidmap -FONTCIDMAPS=.;$TEXMF/fonts/cid// - -% pdftex config files: -PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// - -% Used by DMP (ditroff-to-mpx), called by makempx -troff. -TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps -MPSUPPORT = .;$TEXMF/metapost/support - -% For xdvi to find mime.types and .mailcap, if they do not exist in -% ~. These are single directories, not paths. -% (But the default mime.types, at least, may well suffice.) -MIMELIBDIR = /etc -MAILCAPLIBDIR = /etc - -% Default settings for the fontconfig library as used by the Windows -% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores -% this. ConTeXT MkIV (all platforms) also use these values. -% -FONTCONFIG_FILE = fonts.conf -FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf -FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache - -% TeX documentation and source files, for use with texdoc and kpsewhich. -TEXDOCS = $TEXMF/doc// -TEXSOURCES = .;$TEXMF/source// - -% Web and CWeb input paths. -WEBINPUTS = .;$TEXMF/web// -CWEBINPUTS = .;$TEXMF/cweb// - -% Omega-related fonts and other files. -OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// -OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl// -OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// -OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp// -OTPINPUTS = .;$TEXMF/omega/otp// -OCPINPUTS = .;$TEXMF/omega/ocp// - -% Some additional input variables for several programs. If you add -% a program that uses the `other text files' or `other binary files' -% search formats, you'll want to add their variables here as well. -T4HTINPUTS = .;$TEXMF/tex4ht// - -%% t4ht utility, sharing files with TeX4ht -TEX4HTFONTSET=alias,iso8859,unicode -TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}// - -% TeXworks editor configuration and settings -TW_LIBPATH = $TEXMFCONFIG/texworks -TW_INIPATH = $TW_LIBPATH - -% For security, do not look in . for dvipdfmx.cfg, since the D option -% would allow command execution. -DVIPDFMXINPUTS = $TEXMF/dvipdfmx - -% Lua needs to look in TEXINPUTS for lua scripts distributed with packages. -% -% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in -% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended -% default expansion of TEXINPUTS will not happen and .lua files under -% the /tex/ will not be found. -% -% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. -% The default LUAINPUTS sufficess for luatex and dviluatex. -% -LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// - -% Lua needs to look for binary lua libraries distributed with packages. -CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// - -% Architecture independent executables. -TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}// - -% Other languages. -JAVAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/java// -PERLINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/perl// -PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python// -RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// - - -%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment. -% KPSE_DOT = . - -% This definition isn't used from this .cnf file itself (that would be -% paradoxical), but the compile-time default in paths.h is built from it. -% The SELFAUTO* variables are set automatically from the location of -% argv[0], in kpse_set_program_name. -% -% This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. -% Since this file is subject to future updates, the TeX Live installer -% or human administrator may also create a file -% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. -% -% For security reasons, it is better not to include . in this path. -% -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} - -% kpathsea 3.5.3 and later sets these at runtime. To avoid empty -% expansions from binaries linked against an earlier version of the -% library, we set $progname and $engine to something non-empty: -progname = unsetprogname -engine = unsetengine - - -% Part 2: Options. - -% If this option is set to true, `tex a.b' will look first for a.b.tex -% (within each path element), and then for a.b, i.e., we try standard -% extensions first. If this is false, we first look for a.b and then -% a.b.tex, i.e., we try the name as-is first. -% -% Both names are always tried; the difference is the order in which they -% are tried. The setting applies to all searches, not just .tex. -% -% This setting only affects names being looked up which *already* have -% an extension. A name without an extension (e.g., `tex story') will -% always have an extension added first. -% -% The default is true, because we already avoid adding the standard -% extension(s) in the usual cases. E.g., babel.sty will only look for -% babel.sty, not babel.sty.tex, regardless of this setting. -try_std_extension_first = t - -% Enable system commands via \write18{...}. When enabled fully (set to -% t), obviously insecure. When enabled partially (set to p), only the -% commands listed in shell_escape_commands are allowed. Although this -% is not fully secure either, it is much better, and so useful that we -% enable it for everything but bare tex. -shell_escape = p - -% No spaces in this command list. -% -% The programs listed here are as safe as any we know: they either do -% not write any output files, respect openout_any, or have hard-coded -% restrictions similar or higher to openout_any=p. They also have no -% features to invoke arbitrary other programs, and no known exploitable -% bugs. All to the best of our knowledge. They also have practical use -% for being called from TeX. -% -shell_escape_commands = \ -bibtex,bibtex8,\ -kpsewhich,\ -makeindex,\ -repstopdf,\ - -% we'd like to allow: -% dvips - but external commands can be executed, need at least -R1. -% epspdf, ps2pdf, pstopdf - need to respect openout_any, -% and gs -dSAFER must be used and check for shell injection with filenames. -% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides, -% without Unix convert it hardly seems worth it, and Windows convert -% is something completely different that destroys filesystems, so skip. -% pygmentize - but is the filter feature insecure? -% ps4pdf - but it calls an unrestricted latex. -% rpdfcrop - maybe ok, but let's get experience with repstopdf first. -% texindy,xindy - but is the module feature insecure? -% ulqda - but requires optional SHA1.pm, so why bother. -% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any. - -% plain TeX should remain unenhanced. -shell_escape.tex = f -shell_escape.initex = f - -% This is used by the Windows script wrapper for restricting searching -% for the purportedly safe shell_escape_commands above to system -% directories. -TEXMF_RESTRICTED_SCRIPTS = \ - {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// - -% Allow TeX \openin, \openout, or \input on filenames starting with `.' -% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? -% a (any) : any file can be opened. -% r (restricted) : disallow opening "dotfiles". -% p (paranoid) : as `r' and disallow going to parent directories, and -% restrict absolute paths to be under $TEXMFOUTPUT. -openout_any = p -openin_any = a - -% Write .log/.dvi/etc. files here, if the current directory is unwritable. -%TEXMFOUTPUT = /tmp - -% If a dynamic file creation fails, log the command to this file, in -% either the current directory or TEXMFOUTPUT. Set to the -% empty string or 0 to avoid logging. -MISSFONT_LOG = missfont.log - -% Set to a colon-separated list of words specifying warnings to suppress. -% To suppress everything, use TEX_HUSH = all; this is currently equivalent to -% TEX_HUSH = checksum:lostchar:readable:special -% To suppress nothing, use TEX_HUSH = none or do not set the variable at all. -TEX_HUSH = none - -% Allow TeX, and MF to parse the first line of an input file for -% the %&format construct. -parse_first_line = t - -% But don't parse the first line if invoked as "tex", since we want that -% to remain Knuth-compatible. The src_specials and -% file_line_error_style settings, as well as the options -enctex, -% -mltex, -8bit, etc., also affect this, but they are all off by default. -parse_first_line.tex = f -parse_first_line.initex = f - -% Control file:line:error style messages. -file_line_error_style = f - -% Enable the mktex... scripts by default? These must be set to 0 or 1. -% Particular programs can and do override these settings, for example -% dvips's -M option. Your first chance to specify whether the scripts -% are invoked by default is at configure time. -% -% These values are ignored if the script names are changed; e.g., if you -% set DVIPSMAKEPK to `foo', what counts is the value of the environment -% variable/config value `FOO', not the `MKTEXPK' value. -% -%MKTEXTEX = 0 -%MKTEXPK = 0 -%MKTEXMF = 0 -%MKTEXTFM = 0 -%MKTEXFMT = 0 -%MKOCP = 0 -%MKOFM = 0 - -% Used by makempx to run TeX. We use "etex" because MetaPost is -% expecting DVI, and not "tex" because we want first line parsing. -TEX = etex - -% These variables specify the external program called for the -% interactive `e' option. %d is replaced by the line number and %s by -% the current filename. The default is specified at compile-time, and -% we let that stay in place since different platforms like different values. -%TEXEDIT = vi +%d '%s' % default for Unix -%TEXEDIT = texworks --position=+%d "%s" % default for Windows -%MFEDIT = ${TEXEDIT} -%MPEDIT = ${TEXEDIT} - -% The default `codepage and sort order' file for BibTeX8, when none is -% given as command line option or environment variable. -BIBTEX_CSFILE = 88591lat.csf - -% This variable is specific to Windows. It must be set to 0 or 1. The -% default is 0. Setting it to 1 tells the Windows script wrappers to -% use an already installed Perl interpreter if one is found on the -% search path, in preference to the Perl shipped with TeX Live. Thus, -% it may be useful if you both (a) installed a full Perl distribution -% for general use, and (b) need to run Perl programs from TL that use -% additional modules we don't provide. The TL Perl does provide all the -% standard Perl modules. -% -%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 - - -% Part 3: Array and other sizes for TeX (and Metafont). -% -% If you want to change some of these sizes only for a certain TeX -% variant, the usual dot notation works, e.g., -% main_memory.hugetex = 20000000 -% -% If a change here appears to be ignored, try redumping the format file. - -% Memory. Must be less than 8,000,000 total. -% -% main_memory is relevant only to initex, extra_mem_* only to non-ini. -% Thus, have to redump the .fmt file after changing main_memory; to add -% to existing fmt files, increase extra_mem_*. (To get an idea of how -% much, try \tracingstats=2 in your TeX source file; -% web2c/tests/memtest.tex might also be interesting.) -% -% To increase space for boxes (as might be needed by, e.g., PiCTeX), -% increase extra_mem_bot. -% -% For some xy-pic samples, you may need as much as 700000 words of memory. -% For the vast majority of documents, 60000 or less will do. -% -main_memory = 3000000 % words of inimemory available; also applies to inimf&mp -extra_mem_top = 0 % extra high memory for chars, tokens, etc. -extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. - -% ConTeXt needs lots of memory. -extra_mem_top.context = 2000000 -extra_mem_bot.context = 4000000 - -% Words of font info for TeX (total size of all TFM files, approximately). -% Must be >= 20000 and <= 147483647 (without tex.ch changes). -font_mem_size = 3000000 - -% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). -font_max = 9000 - -% Extra space for the hash table of control sequences. -hash_extra = 200000 - -% Max number of characters in all strings, including all error messages, -% help texts, font names, control sequences. These values apply to TeX. -pool_size = 3250000 -% Minimum pool space after TeX's own strings; must be at least -% 25000 less than pool_size, but doesn't need to be nearly that large. -string_vacancies = 90000 -% Maximum number of strings. -max_strings = 500000 -% min pool space left after loading .fmt -pool_free = 47500 - -% Buffer size. TeX uses the buffer to contain input lines, but macro -% expansion works by writing material into the buffer and reparsing the -% line. As a consequence, certain constructs require the buffer to be -% very large, even though most documents can be handled with a small value. -buf_size = 200000 - -% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in -% the sources), but we don't need that much. The value here suffices -% for all known free hyphenation patterns to be loaded simultaneously -% (as TeX Live does). -% -trie_size = 1000000 - -hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. - % http://primes.utm.edu/curios/page.php/8191.html -nest_size = 500 % simultaneous semantic levels (e.g., groups) -max_in_open = 15 % simultaneous input files and error insertions, - % also applies to MetaPost -param_size = 10000 % simultaneous macro parameters, also applies to MP -save_size = 50000 % for saving values outside current group -stack_size = 5000 % simultaneous input sources - -% These are Omega-specific. -ocp_buf_size = 500000 % character buffers for ocp filters. -ocp_stack_size = 10000 % stacks for ocp computations. -ocp_list_size = 1000 % control for multiple ocps. - -% These work best if they are the same as the I/O buffer size, but it -% doesn't matter much. Must be a multiple of 8. -dvi_buf_size = 16384 % TeX -gf_buf_size = 16384 % MF - -% It's probably inadvisable to change these. At any rate, we must have: -% 45 < error_line < 255; -% 30 < half_error_line < error_line - 15; -% 60 <= max_print_line; -% These apply to TeX, Metafont, and MetaPost. -error_line = 79 -half_error_line = 50 -max_print_line = 79 - -% Metafont only. -screen_width.mf = 1664 -screen_depth.mf = 1200 - -% BibTeX only (max_strings also determines hash_size and hash_prime). -ent_str_size = 250 -glob_str_size = 5000 -max_strings.bibtex = 35307 -max_strings.bibtex8 = 35307 -max_strings.bibtexu = 35307 -max_strings.pbibtex = 35307 - -% GFtype only. -line_length.gftype = 500 -max_rows.gftype = 8191 -max_cols.gftype = 8191 diff --git a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch deleted file mode 100644 index ee8636392..000000000 --- a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c ---- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c 2012-11-03 07:42:39.000000000 +0200 -+++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c 2012-11-03 08:13:25.000000000 +0200 -@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo - GVolume *volume, - ThunarShortcutsModel *model) - { -+ GList *lp; -+ gint idx; -+ - _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); - _thunar_return_if_fail (model->volume_monitor == volume_monitor); - _thunar_return_if_fail (G_IS_VOLUME (volume)); - _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model)); - -+ /* check that the volume is not in the internal list already */ -+ if (g_list_find (model->hidden_volumes, volume) != NULL) -+ return; -+ -+ /* nor in the list of visible volumes */ -+ for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next) -+ { -+ if (THUNAR_SHORTCUT (lp->data)->volume == volume) -+ return; -+ } -+ - /* place the volume on the hidden list */ - model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); - -diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c ---- Thunar-1.4.0.orig/thunar/thunar-tree-model.c 2012-11-03 07:42:39.000000000 +0200 -+++ Thunar-1.4.0/thunar/thunar-tree-model.c 2012-11-03 08:09:36.000000000 +0200 -@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM - GVolume *volume, - ThunarTreeModel *model) - { -+ ThunarTreeModelItem *item = NULL; -+ GNode *node; -+ - _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); - _thunar_return_if_fail (model->volume_monitor == volume_monitor); - _thunar_return_if_fail (G_IS_VOLUME (volume)); - _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model)); - -+ /* check that the volume is not in the internal list already */ -+ if (g_list_find (model->hidden_volumes, volume) != NULL) -+ return; -+ -+ /* nor in the list of visible volumes */ -+ for (node = model->root->children; node != NULL; node = node->next) -+ { -+ item = THUNAR_TREE_MODEL_ITEM (node->data); -+ if (item->volume == volume) -+ return; -+ } -+ - /* place the volume on the hidden list */ - model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); - diff --git a/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch b/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch deleted file mode 100644 index 95bbc6665..000000000 --- a/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c ---- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 2012-05-26 07:03:39.000000000 +0300 -+++ Thunar-1.4.0/thunar/thunar-gio-extensions.c 2012-05-26 07:05:06.000000000 +0300 -@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol - has_media = g_drive_has_media (drive); - g_object_unref (drive); - } -+ else -+ { -+ /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */ -+ has_media = g_volume_can_mount (volume); -+ } - - mount = g_volume_get_mount (volume); - if (mount != NULL) diff --git a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch deleted file mode 100644 index d054180b5..000000000 --- a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001 -From: Nick Schermer <nick@xfce.org> -Date: Wed, 05 Dec 2012 17:34:38 +0000 -Subject: Show NoDisplay=true applications (bug #9595). - -See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html ---- -diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c -index f7ae355..f2993b8 100644 ---- a/thunar/thunar-chooser-button.c -+++ b/thunar/thunar-chooser-button.c -@@ -453,7 +453,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button, - /* add all possible applications */ - for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i) - { -- /* skip infos that have NoDisplay or OnlyShowIn set */ - if (thunar_g_app_info_should_show (lp->data)) - { - /* insert the item into the store */ -diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c -index d77f72a..1b9026a 100644 ---- a/thunar/thunar-gio-extensions.c -+++ b/thunar/thunar-gio-extensions.c -@@ -569,26 +569,17 @@ gboolean - thunar_g_app_info_should_show (GAppInfo *info) - { - #ifdef HAVE_GIO_UNIX -- const gchar *filename; -- - _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE); - -- /* check if NoDesktop is set or OnlyShowIn is set but -- * does not contain XFCE */ -- if (g_app_info_should_show (info)) -- return TRUE; -- - if (G_IS_DESKTOP_APP_INFO (info)) - { -- /* show custom command from the user directory, this to not -- * exclude custom commands */ -- filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); -- if (filename != NULL -- && g_str_has_prefix (filename, g_get_user_data_dir ())) -- return TRUE; -+ /* NoDisplay=true files should be visible in the interface, -+ * because this key is intent to hide mime-helpers from the -+ * application menu. Hidden=true is never returned by GIO. */ -+ return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL); - } - -- return FALSE; -+ return TRUE; - #else - /* we cannot exclude custom actions, so show everything */ - return TRUE; --- -cgit v0.9.0.3 diff --git a/extra/thunderbird/PKGBUILD b/extra/thunderbird/PKGBUILD deleted file mode 100644 index 6d3c71623..000000000 --- a/extra/thunderbird/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 171672 2012-11-21 02:02:06Z foutrelis $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Anders Bostrom <anders.bostrom@home.se> - -pkgname=thunderbird -pkgver=17.0 -pkgrel=1 -pkgdesc="Standalone Mail/News reader" -arch=('i686' 'x86_64') -license=('MPL' 'GPL') -url="http://www.mozilla.org/thunderbird/" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') -optdepends=('libcanberra: for sound support') -install=thunderbird.install -source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 - mozconfig - thunderbird.desktop - thunderbird-install-dir.patch - vendor.js) -options=(!emptydirs) -md5sums=('f3690660044337273efb52f79cb15b0e' - '41511a6bcdd04cf56706218e4670e631' - 'af3e5b344d2edf1c7d61bb0a5a96de9a' - '1c6f47b315a5d7830f8e901b1f723cfc' - '5a53179d14ae9631b7afe5e4d0fc0b25') - -build() { - cd comm-release - patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - - cp "$srcdir/mozconfig" .mozconfig - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd comm-release - make -j1 -f client.mk DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" - - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ - "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" - done - - install -Dm644 "$srcdir/thunderbird.desktop" \ - "$pkgdir/usr/share/applications/thunderbird.desktop" - - rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} -} diff --git a/extra/thunderbird/mozconfig b/extra/thunderbird/mozconfig deleted file mode 100644 index 8950db703..000000000 --- a/extra/thunderbird/mozconfig +++ /dev/null @@ -1,40 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -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-official-branding -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/extra/thunderbird/thunderbird-install-dir.patch b/extra/thunderbird/thunderbird-install-dir.patch deleted file mode 100644 index 871b7bc47..000000000 --- a/extra/thunderbird/thunderbird-install-dir.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk ---- comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 -+++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist -diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk ---- comm-release.orig/mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 -+++ comm-release/mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk ---- comm-release.orig/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 -+++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 -@@ -1,7 +1,7 @@ - INCLUDED_AUTOCONF_MK = 1 - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - ifneq (,$(filter /%,$(TOP_DIST))) - DIST = $(TOP_DIST) diff --git a/extra/thunderbird/thunderbird.desktop b/extra/thunderbird/thunderbird.desktop deleted file mode 100644 index a626e52ba..000000000 --- a/extra/thunderbird/thunderbird.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Thunderbird -Comment=Mail & News Reader -GenericName=Mail Client & News Reader -Exec=thunderbird %u -TryExec=thunderbird -Icon=thunderbird -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true diff --git a/extra/thunderbird/thunderbird.install b/extra/thunderbird/thunderbird.install deleted file mode 100644 index 4d4a283db..000000000 --- a/extra/thunderbird/thunderbird.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/extra/thunderbird/vendor.js b/extra/thunderbird/vendor.js deleted file mode 100644 index 170b505a8..000000000 --- a/extra/thunderbird/vendor.js +++ /dev/null @@ -1,9 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default mailer checking. -pref("mail.shell.checkDefaultMail", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); diff --git a/extra/timidity++/2.13.2-gcc4.patch b/extra/timidity++/2.13.2-gcc4.patch deleted file mode 100644 index af0b5f8f7..000000000 --- a/extra/timidity++/2.13.2-gcc4.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur TiMidity++-2.13.2-orig/interface/xaw_i.c TiMidity++-2.13.2/interface/xaw_i.c ---- TiMidity++-2.13.2-orig/interface/xaw_i.c 2005-06-25 21:55:19.000000000 -0400 -+++ TiMidity++-2.13.2/interface/xaw_i.c 2005-06-25 21:56:01.000000000 -0400 -@@ -261,7 +261,7 @@ - String bitmapdir = XAW_BITMAP_DIR; - Boolean arrangetitle,savelist; - static char **current_flist = NULL; --static int voices = 0, last_voice = 0, voices_num_width; -+static int xaw_i_voices = 0, last_voice = 0, voices_num_width; - static int maxentry_on_a_menu = 0,submenu_n = 0; - #define OPTIONS_WINDOW 1 - #define FLIST_WINDOW 2 -@@ -1329,7 +1329,7 @@ - c= *(local_buf+1); - n= atoi(local_buf+2); - if(c == 'L') -- voices = n; -+ xaw_i_voices = n; - else - last_voice = n; - if(IsTracePlaying()) drawVoices(); -@@ -2070,7 +2070,7 @@ - XSetForeground(disp, gct, tracecolor); - XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4, - MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT); -- sprintf(local_buf, "%3d/%d", last_voice, voices); -+ sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices); - XSetForeground(disp, gct, capcolor); - XDrawString(disp, XtWindow(trace),gct,voices_num_width+6, - MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf)); diff --git a/extra/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch b/extra/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch deleted file mode 100644 index 200d011a3..000000000 --- a/extra/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch +++ /dev/null @@ -1,349 +0,0 @@ -diff -urN TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in ---- TiMidity++-2.13.2.orig/configure.in 2004-10-03 15:39:52 +0300 -+++ TiMidity++-2.13.2/configure.in 2007-02-19 13:06:42 +0200 -@@ -1216,11 +1216,39 @@ - EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS) - LIBS="$LIBS $LIBFLAC_LIBS" - ]) -- AM_PATH_LIBOGGFLAC([ -- EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" -- EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) -- LIBS="$LIBS $LIBOGGFLAC_LIBS" -- ]) -+ # in FLAC-1.1.3, libOggFLAC was merged into libFLAC -+ # FLAC_API_VERSION_CURRENT first appears in FLAC-1.1.3 -+ AC_MSG_CHECKING(for legacy libFLAC (<1.1.13)) -+ ac_save_LIBS="$LIBS" -+ LIBS= -+ AC_TRY_RUN([ -+ #include <FLAC/export.h> -+ int main () { return FLAC_API_VERSION_CURRENT<8; } -+ ],legacy_flac=no,legacy_flac=yes,legacy_flac=no) -+ AC_MSG_RESULT($legacy_flac) -+ LIBS="$ac_save_LIBS" -+ if test "x$legacy_flac" = xyes; then -+ AM_PATH_LIBOGGFLAC([ -+ EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" -+ EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) -+ LIBS="$LIBS $LIBOGGFLAC_LIBS" -+ ]) -+ else -+ -+ AC_MSG_CHECKING(for Ogg support in libFLAC ) -+ ac_save_LIBS="$LIBS" -+ LIBS="-lFLAC -lm -logg" -+ AC_TRY_RUN([ -+ #include <FLAC/export.h> -+ int main () { return !FLAC_API_SUPPORTS_OGG_FLAC; } -+ ],ogg_flac=yes,ogg_flac=yes,ogg_flac=no) -+ AC_MSG_RESULT($ogg_flac) -+ LIBS="$ac_save_LIBS" -+ if test "x$ogg_flac" = xyes; then -+ LIBS="$LIBS -logg" -+ CFLAGS="$CFLAGS -DAU_OGGFLAC" -+ fi -+ fi - else - AC_MSG_RESULT(no) - fi -diff -urN TiMidity++-2.13.2.orig/timidity/flac_a.c TiMidity++-2.13.2/timidity/flac_a.c ---- TiMidity++-2.13.2.orig/timidity/flac_a.c 2004-05-23 07:35:44 +0300 -+++ TiMidity++-2.13.2/timidity/flac_a.c 2007-02-19 13:06:55 +0200 -@@ -38,14 +38,22 @@ - - #if defined(AU_FLAC_DLL) || defined(AU_OGGFLAC_DLL) - #include <windows.h> --#define FLAC__EXPORT_H /* don't include "OggFLAC/export.h" */ --#define FLAC_API --#define OggFLAC__EXPORT_H /* don't include "FLAC/export.h" */ --#define OggFLAC_API -+#include <FLAC/export.h> /* need export.h to figure out API version from FLAC_API_VERSION_CURRENT */ -+#undef FLAC_API -+#undef OggFLAC_API - #endif - - #include <FLAC/all.h> --#ifdef AU_OGGFLAC -+ -+/* by LEGACY_FLAC we mean before FLAC 1.1.3 */ -+/* in FLAC 1.1.3, libOggFLAC is merged into libFLAC and all encoding layers are merged into the stream encoder */ -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ -+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC) - #include <OggFLAC/stream_encoder.h> - #endif - -@@ -100,17 +108,21 @@ - unsigned long out_bytes; - union { - FLAC__StreamEncoderState flac; -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamEncoderState s_flac; - #ifdef AU_OGGFLAC - OggFLAC__StreamEncoderState ogg; - #endif -+#endif - } state; - union { - union { - FLAC__StreamEncoder *stream; -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamEncoder *s_stream; -+#endif - } flac; --#ifdef AU_OGGFLAC -+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC) - union { - OggFLAC__StreamEncoder *stream; - } ogg; -@@ -158,7 +170,7 @@ - static long serial_number = 0; - FLAC_ctx *flac_ctx = NULL; - --#ifdef AU_OGGFLAC -+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC) - static FLAC__StreamEncoderWriteStatus - ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, - const FLAC__byte buffer[], -@@ -168,8 +180,13 @@ - static FLAC__StreamEncoderWriteStatus - flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, - const FLAC__byte buffer[], -+#ifdef LEGACY_FLAC - unsigned bytes, unsigned samples, -+#else -+ size_t bytes, unsigned samples, -+#endif - unsigned current_frame, void *client_data); -+#ifdef LEGACY_FLAC - static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data); -@@ -181,6 +198,7 @@ - static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data); -+#endif - - /* preset */ - void flac_set_compression_level(int compression_level) -@@ -281,7 +299,11 @@ - #ifdef AU_OGGFLAC - void flac_set_option_oggflac(int isogg) - { -+#ifdef LEGACY_FLAC - flac_options.isogg = isogg; -+#else -+ flac_options.isogg = (FLAC_API_SUPPORTS_OGG_FLAC && isogg); -+#endif - } - #endif - -@@ -295,6 +317,7 @@ - dpm.fd = -1; - - if (ctx != NULL) { -+#ifdef LEGACY_FLAC - #ifdef AU_OGGFLAC - if (flac_options.isogg) { - if (ctx->encoder.ogg.stream) { -@@ -317,6 +340,12 @@ - FLAC__stream_encoder_delete(ctx->encoder.flac.stream); - } - } -+#else -+ if (ctx->encoder.flac.stream) { -+ FLAC__stream_encoder_finish(ctx->encoder.flac.stream); -+ FLAC__stream_encoder_delete(ctx->encoder.flac.stream); -+ } -+#endif - free(ctx); - flac_ctx = NULL; - } -@@ -329,6 +358,9 @@ - FLAC__StreamMetadata padding; - FLAC__StreamMetadata *metadata[4]; - int num_metadata = 0; -+#ifndef LEGACY_FLAC -+ FLAC__StreamEncoderInitStatus init_status; -+#endif - - FLAC_ctx *ctx; - -@@ -371,6 +403,7 @@ - metadata[num_metadata++] = &padding; - } - -+#ifdef LEGACY_FLAC - #ifdef AU_OGGFLAC - if (flac_options.isogg) { - if ((ctx->encoder.ogg.stream = OggFLAC__stream_encoder_new()) == NULL) { -@@ -542,6 +575,67 @@ - return -1; - } - } -+#else /* !LEGACY_FLAC */ -+ if ((ctx->encoder.flac.stream = FLAC__stream_encoder_new()) == NULL) { -+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream"); -+ flac_session_close(); -+ return -1; -+ } -+ -+#ifdef AU_OGGFLAC -+ if (flac_options.isogg) { -+ /* set sequential number for serial */ -+ serial_number++; -+ if (serial_number == 1) { -+ srand(time(NULL)); -+ serial_number = rand(); -+ } -+ FLAC__stream_encoder_set_ogg_serial_number(ctx->encoder.flac.stream, serial_number); -+ } -+#endif /* AU_OGGFLAC */ -+ FLAC__stream_encoder_set_channels(ctx->encoder.flac.stream, nch); -+ /* 16bps only */ -+ FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.stream, 16); -+ -+ FLAC__stream_encoder_set_verify(ctx->encoder.flac.stream, flac_options.verify); -+ -+ if (!FLAC__format_sample_rate_is_valid(dpm.rate)) { -+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", dpm.rate); -+ flac_session_close(); -+ return -1; -+ } -+ FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.stream, dpm.rate); -+ -+ FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.stream, flac_options.qlp_coeff_precision); -+ /* expensive! */ -+ FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.stream, flac_options.qlp_coeff_precision_search); -+ -+ if (nch == 2) { -+ FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.stream, flac_options.mid_side); -+ FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.stream, flac_options.adaptive_mid_side); -+ } -+ -+ FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.stream, flac_options.max_lpc_order); -+ FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.stream, flac_options.min_residual_partition_order); -+ FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order); -+ -+ FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize); -+ -+ if (0 < num_metadata) -+ FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata); -+ -+#ifdef AU_OGGFLAC -+ if (flac_options.isogg) -+ init_status = FLAC__stream_encoder_init_ogg_stream(ctx->encoder.flac.stream, NULL, flac_stream_encoder_write_callback, NULL, NULL, NULL, ctx); -+ else -+#endif -+ init_status = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, flac_stream_encoder_write_callback, NULL, NULL, NULL, ctx); -+ if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) { -+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC encoder (init status: %s)", FLAC__StreamEncoderInitStatusString[init_status]); -+ flac_session_close(); -+ return -1; -+ } -+#endif - - return 0; - } -@@ -638,7 +732,7 @@ - return 0; - } - --#ifdef AU_OGGFLAC -+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC) - static FLAC__StreamEncoderWriteStatus - ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, - const FLAC__byte buffer[], -@@ -658,7 +752,11 @@ - static FLAC__StreamEncoderWriteStatus - flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, - const FLAC__byte buffer[], -+#ifdef LEGACY_FLAC - unsigned bytes, unsigned samples, -+#else -+ size_t bytes, unsigned samples, -+#endif - unsigned current_frame, void *client_data) - { - FLAC_ctx *ctx = (FLAC_ctx *)client_data; -@@ -670,6 +768,7 @@ - else - return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; - } -+#ifdef LEGACY_FLAC - static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data) -@@ -695,6 +794,7 @@ - void *client_data) - { - } -+#endif - - static int output_data(char *buf, int32 nbytes) - { -@@ -723,6 +823,7 @@ - oggbuf[i] = *s++; - } - -+#ifdef LEGACY_FLAC - #ifdef AU_OGGFLAC - if (flac_options.isogg) { - ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream); -@@ -793,6 +894,29 @@ - return -1; - } - } -+#else /* !LEGACY_FLAC */ -+ ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream); -+ if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) { -+ if (ctx->state.flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR | -+ FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) { -+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", -+ FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.stream)]); -+ } -+ else { -+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)", -+ FLAC__StreamEncoderStateString[ctx->state.flac]); -+ } -+ flac_session_close(); -+ return -1; -+ } -+ -+ if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.stream, oggbuf, -+ nbytes / nch / 2 )) { -+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream"); -+ flac_session_close(); -+ return -1; -+ } -+#endif - ctx->in_bytes += nbytes; - - free(oggbuf); -@@ -813,6 +937,7 @@ - return; - } - -+#ifdef LEGACY_FLAC - if (flac_options.isogg) { - #ifdef AU_OGGFLAC - if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) { -@@ -838,6 +963,13 @@ - /* fall through */ - } - } -+#else /* !LEGACY_FLAC */ -+ if ((ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream)) != FLAC__STREAM_ENCODER_OK) { -+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)", -+ FLAC__StreamEncoderStateString[ctx->state.flac]); -+ /* fall through */ -+ } -+#endif - - ctl->cmsg(CMSG_INFO, VERB_NORMAL, "Wrote %lu/%lu bytes(%g%% compressed)", - ctx->out_bytes, ctx->in_bytes, ((double)ctx->out_bytes / (double)ctx->in_bytes) * 100.); diff --git a/extra/timidity++/timidity++-2.13.2-exiterror.patch b/extra/timidity++/timidity++-2.13.2-exiterror.patch deleted file mode 100644 index 01a83fead..000000000 --- a/extra/timidity++/timidity++-2.13.2-exiterror.patch +++ /dev/null @@ -1,695 +0,0 @@ -diff -ur TiMidity++-2.13.2/interface/alsaseq_c.c TiMidity++-2.13.2-new/interface/alsaseq_c.c ---- TiMidity++-2.13.2/interface/alsaseq_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/alsaseq_c.c 2005-01-02 03:39:15.968158520 +0100 -@@ -177,7 +177,7 @@ - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); - static void ctl_event(CtlEvent *e); --static void ctl_pass_playing_list(int n, char *args[]); -+static int ctl_pass_playing_list(int n, char *args[]); - - /**********************************/ - /* export the interface functions */ -@@ -308,7 +308,7 @@ - return 0; - } - --static void ctl_pass_playing_list(int n, char *args[]) -+static int ctl_pass_playing_list(int n, char *args[]) - { - double btime; - int i, j; -@@ -323,7 +323,7 @@ - - if (alsa_seq_open(&alsactx.handle) < 0) { - fprintf(stderr, "error in snd_seq_open\n"); -- return; -+ return 1; - } - alsactx.queue = -1; - alsactx.client = snd_seq_client_id(alsactx.handle); -@@ -342,7 +342,7 @@ - int port; - port = alsa_create_port(alsactx.handle, i); - if (port < 0) -- return; -+ return 1; - alsactx.port[i] = port; - alsa_set_timestamping(&alsactx, port); - printf(" %d:%d", alsactx.client, alsactx.port[i]); -@@ -411,6 +411,7 @@ - server_reset(); - doit(&alsactx); - } -+ return 0; - } - - /* -diff -ur TiMidity++-2.13.2/interface/emacs_c.c TiMidity++-2.13.2-new/interface/emacs_c.c ---- TiMidity++-2.13.2/interface/emacs_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/emacs_c.c 2005-01-02 03:02:02.000000000 +0100 -@@ -78,7 +78,7 @@ - static void ctl_close(void); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static void ctl_event(CtlEvent *e); - static int read_ready(void); - static int emacs_type = 0; /* 0:emacs, 1:mule, 2:?? -@@ -249,7 +249,7 @@ - return s; - } - --static void ctl_pass_playing_list(int argc, char *argv[]) -+static int ctl_pass_playing_list(int argc, char *argv[]) - { - int i; - char cmd[BUFSIZ]; -@@ -274,7 +274,7 @@ - { - for(i = 1; i < argc; i++) - play_midi_file(argv[i]); -- return; -+ return 0; - } - - /* Main Loop */ -@@ -296,11 +296,11 @@ - ctl_refresh(); - break; - case RC_QUIT: -- return; -+ return 0; - } /* skipping others command */ - } - else if(!strncmp(cmd, "QUIT", 4)) -- return; -+ return 0; - else - continue; /* skipping unknown command */ - } -diff -ur TiMidity++-2.13.2/interface/gtk_c.c TiMidity++-2.13.2-new/interface/gtk_c.c ---- TiMidity++-2.13.2/interface/gtk_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/gtk_c.c 2005-01-02 03:35:53.447946272 +0100 -@@ -57,7 +57,7 @@ - - static int ctl_open(int using_stdin, int using_stdout); - static void ctl_close(void); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); - static void ctl_event(CtlEvent *e); -@@ -528,7 +528,7 @@ - #endif - } - --static void -+static int - ctl_pass_playing_list(int number_of_files, char *list_of_files[]) - { - int i=0; -@@ -558,7 +558,7 @@ - } - else { - if (command==RC_QUIT) -- return; -+ return 0; - if (command==RC_ERROR) - command=RC_TUNE_END; /* Launch next file */ - -@@ -580,6 +580,7 @@ - command = ctl_blocking_read(&val); - } - } -+ return 0; - } - - /* -diff -ur TiMidity++-2.13.2/interface/mac_c.c TiMidity++-2.13.2-new/interface/mac_c.c ---- TiMidity++-2.13.2/interface/mac_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/mac_c.c 2005-01-02 03:04:13.000000000 +0100 -@@ -71,7 +71,7 @@ - static void ctl_pitch_bend(int channel, int val); - static void ctl_reset(void); - static int ctl_open(int using_stdin, int using_stdout); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static void ctl_close(void); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); -@@ -955,7 +955,7 @@ - } - - --static void ctl_pass_playing_list(int init_number_of_files, -+static int ctl_pass_playing_list(int init_number_of_files, - char * /*init_list_of_files*/ []) - { - EventRecord event; -@@ -983,6 +983,7 @@ - mac_HandleEvent(&event); - } - Do_Quit(); -+ return 0; - } - - static Boolean UserWantsControl() -diff -ur TiMidity++-2.13.2/interface/motif_c.c TiMidity++-2.13.2-new/interface/motif_c.c ---- TiMidity++-2.13.2/interface/motif_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/motif_c.c 2005-01-02 03:05:04.000000000 +0100 -@@ -60,7 +60,7 @@ - static void ctl_close(void); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static void ctl_event(CtlEvent *e); - - static int motif_ready = 0; -@@ -346,12 +346,13 @@ - return(ctl_blocking_read(valp)); - } - --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) - { - int i=0; - char file_to_play[1000]; - int command; - int32 val; -+ int retval; - - motif_ready = 1; - -@@ -381,12 +382,13 @@ - else - { - if (command==RC_QUIT) -- return; -+ return 0; - - switch(command) - { - case RC_ERROR: - m_pipe_int_write(ERROR_MESSAGE); -+ retval=1; - break; - case RC_NONE: - break; -@@ -411,6 +413,7 @@ - command = ctl_blocking_read(&val); - } - } -+ return retval; - } - - /* -diff -ur TiMidity++-2.13.2/interface/ncurs_c.c TiMidity++-2.13.2-new/interface/ncurs_c.c ---- TiMidity++-2.13.2/interface/ncurs_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/ncurs_c.c 2005-01-02 03:05:48.000000000 +0100 -@@ -174,7 +174,7 @@ - - static int ctl_open(int using_stdin, int using_stdout); - static void ctl_close(void); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); - static void ctl_event(CtlEvent *e); -@@ -3100,7 +3100,7 @@ - reuse_mblock(&tmpbuffer); - } - --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) - { - int i; - int act_number_of_files; -@@ -3128,7 +3128,7 @@ - - if (file_list.number<0) { - cmsg(CMSG_FATAL, VERB_NORMAL, "No MIDI file to play!"); -- return; -+ return 1; - } - - ctl_listmode_max=1; -@@ -3169,7 +3169,7 @@ - if(!(ctl.flags & CTLF_LIST_LOOP) || stdin_check) - { - aq_flush(0); -- return; -+ return 0; - } - i = 0; - if(rc == RC_TUNE_END) -@@ -3187,7 +3187,7 @@ - - /* else fall through */ - case RC_QUIT: -- return; -+ return 0; - } - ctl_reset(); - } -diff -ur TiMidity++-2.13.2/interface/portmidisyn_c.c TiMidity++-2.13.2-new/interface/portmidisyn_c.c ---- TiMidity++-2.13.2/interface/portmidisyn_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/portmidisyn_c.c 2005-01-02 03:13:05.000000000 +0100 -@@ -96,7 +96,7 @@ - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); - static void ctl_event(CtlEvent *e); --static void ctl_pass_playing_list(int n, char *args[]); -+static int ctl_pass_playing_list(int n, char *args[]); - - #ifndef __W32__ - static void init_keybord(void); -@@ -215,17 +215,17 @@ - - #ifdef IA_W32G_SYN - extern void w32g_syn_doit(void); --extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]); -+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]); - - --static void ctl_pass_playing_list(int n, char *args[]) -+static int ctl_pass_playing_list(int n, char *args[]) - { -- w32g_syn_ctl_pass_playing_list ( n, args ); -+ return w32g_syn_ctl_pass_playing_list ( n, args ); - } - #endif - - #ifndef IA_W32G_SYN --static void ctl_pass_playing_list(int n, char *args[]) -+static int ctl_pass_playing_list(int n, char *args[]) - #else - // 0: OK, 2: Require to reset. - int ctl_pass_playing_list2(int n, char *args[]) -@@ -241,7 +241,7 @@ - #ifndef IA_W32G_SYN - if(n > MAX_PORT ){ - printf( "Usage: timidity -iW [Midi interface No s]\n"); -- return; -+ return 1; - } - #endif - -@@ -347,11 +347,7 @@ - #endif /* USE_GTK_GUI */ - rtsyn_close(); - --#ifdef IA_W32G_SYN - return 0; --#else -- return; --#endif - } - - -diff -ur TiMidity++-2.13.2/interface/server_c.c TiMidity++-2.13.2-new/interface/server_c.c ---- TiMidity++-2.13.2/interface/server_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/server_c.c 2005-01-02 03:07:38.000000000 +0100 -@@ -176,7 +176,7 @@ - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); - static void ctl_event(CtlEvent *e); --static void ctl_pass_playing_list(int n, char *args[]); -+static int ctl_pass_playing_list(int n, char *args[]); - - /**********************************/ - /* export the interface functions */ -@@ -356,14 +356,14 @@ - static void compute_sample_increment(void); - static void server_reset(void); - --static void ctl_pass_playing_list(int n, char *args[]) -+static int ctl_pass_playing_list(int n, char *args[]) - { - int sock; - - if(n != 2 && n != 1) - { - fprintf(stderr, "Usage: timidity -ir control-port [data-port]\n"); -- return; -+ return 1; - } - - #ifdef SIGPIPE -@@ -379,7 +379,7 @@ - if (control_port) { - sock = pasv_open(&control_port); - if(sock == -1) -- return; -+ return 1; - } - opt_realtime_playing = 1; /* Enable loading patch while playing */ - allocate_cache_size = 0; /* Don't use pre-calclated samples */ -@@ -404,7 +404,7 @@ - continue; - perror("accept"); - close(sock); -- return; -+ return 1; - } - } - else control_fd = 0; -@@ -446,6 +446,7 @@ - if (!control_port) - break; - } -+ return 0; - } - - #define MAX_GETCMD_PARAMS 8 -diff -ur TiMidity++-2.13.2/interface/tk_c.c TiMidity++-2.13.2-new/interface/tk_c.c ---- TiMidity++-2.13.2/interface/tk_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/tk_c.c 2005-01-02 03:08:48.000000000 +0100 -@@ -86,7 +86,7 @@ - static void ctl_close(void); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static int ctl_blocking_read(int32 *valp); - static void ctl_note(int status, int ch, int note, int vel); - static void ctl_event(CtlEvent *e); -@@ -587,7 +587,7 @@ - return(ctl_blocking_read(valp)); - } - --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) - { - int i=0; - char local[1000]; -@@ -618,7 +618,7 @@ - /* if really QUIT */ - k_pipe_gets(local, sizeof(local)-1); - if (*local == 'Z') -- return; -+ return 0; - /* only stop playing..*/ - } - if (command==RC_CHANGE_VOLUME) /* init volume */ -@@ -646,6 +646,7 @@ - command = ctl_blocking_read(&val); - } - } -+ return 0; - } - - -diff -ur TiMidity++-2.13.2/interface/w32g_c.c TiMidity++-2.13.2-new/interface/w32g_c.c ---- TiMidity++-2.13.2/interface/w32g_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/w32g_c.c 2005-01-02 03:10:03.000000000 +0100 -@@ -86,7 +86,7 @@ - - static int ctl_open(int using_stdin, int using_stdout); - static void ctl_close(void); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static void ctl_event(CtlEvent *e); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); -@@ -662,7 +662,7 @@ - } - - extern BOOL SetWrdWndActive(void); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) - { - static int init_flag = 1; - int rc; -@@ -779,7 +779,7 @@ - if(ctl.flags & CTLF_AUTOEXIT) { - if(play_mode->fd != -1) - aq_flush(0); -- return; -+ return 0; - } - break; - } -@@ -803,7 +803,7 @@ - if(ctl.flags & CTLF_AUTOEXIT){ - if(play_mode->fd != -1) - aq_flush(0); -- return; -+ return 0; - } - if((ctl.flags & CTLF_LIST_LOOP) && w32g_nvalid_playlist()) - { -@@ -839,7 +839,7 @@ - case RC_QUIT: - if(play_mode->fd != -1) - aq_flush(1); -- return; -+ return 0; - - case RC_CHANGE_VOLUME: - amplification += value; -@@ -868,6 +868,7 @@ - PrefSettingApplyReally(); - rc = RC_NONE; - } -+ return 0; - } - - static void ctl_lcd_mark(int flag, int x, int y) -diff -ur TiMidity++-2.13.2/interface/w32g_syn.c TiMidity++-2.13.2-new/interface/w32g_syn.c ---- TiMidity++-2.13.2/interface/w32g_syn.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/w32g_syn.c 2005-01-02 03:10:49.000000000 +0100 -@@ -281,7 +281,7 @@ - static int wait_for_termination_of_syn_thread ( void ); - int w32g_message_set ( int cmd ); - int w32g_message_get ( w32g_syn_message_t *msg ); --void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] ); -+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] ); - int w32g_syn_do_before_pref_apply ( void ); - int w32g_syn_do_after_pref_apply ( void ); - -@@ -1403,7 +1403,7 @@ - } - } - --void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] ) -+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] ) - { - int i; - #ifndef TWSYNSRV -@@ -1471,6 +1471,7 @@ - } - #endif - if ( w32g_syn.quit_state < 2 ) w32g_syn.quit_state = 2; -+ return 0; - } - - int w32g_syn_do_before_pref_apply ( void ) -diff -ur TiMidity++-2.13.2/interface/winsyn_c.c TiMidity++-2.13.2-new/interface/winsyn_c.c ---- TiMidity++-2.13.2/interface/winsyn_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/winsyn_c.c 2005-01-02 03:11:36.000000000 +0100 -@@ -88,7 +88,7 @@ - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); - static void ctl_event(CtlEvent *e); --static void ctl_pass_playing_list(int n, char *args[]); -+static int ctl_pass_playing_list(int n, char *args[]); - - #ifndef __W32__ - static void init_keybord(void); -@@ -207,17 +207,17 @@ - - #ifdef IA_W32G_SYN - extern void w32g_syn_doit(void); --extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]); -+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]); - - --static void ctl_pass_playing_list(int n, char *args[]) -+static int ctl_pass_playing_list(int n, char *args[]) - { -- w32g_syn_ctl_pass_playing_list ( n, args ); -+ return w32g_syn_ctl_pass_playing_list ( n, args ); - } - #endif - - #ifndef IA_W32G_SYN --static void ctl_pass_playing_list(int n, char *args[]) -+static int ctl_pass_playing_list(int n, char *args[]) - #else - // 0: OK, 2: Require to reset. - int ctl_pass_playing_list2(int n, char *args[]) -@@ -233,7 +233,7 @@ - #ifndef IA_W32G_SYN - if(n > MAX_PORT ){ - printf( "Usage: timidity -iW [Midi interface No s]\n"); -- return; -+ return 1; - } - #endif - -@@ -339,11 +339,7 @@ - #endif /* USE_GTK_GUI */ - rtsyn_close(); - --#ifdef IA_W32G_SYN - return 0; --#else -- return; --#endif - } - - -diff -ur TiMidity++-2.13.2/interface/xaw_c.c TiMidity++-2.13.2-new/interface/xaw_c.c ---- TiMidity++-2.13.2/interface/xaw_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/xaw_c.c 2005-01-02 03:11:57.000000000 +0100 -@@ -55,7 +55,7 @@ - static void ctl_close(void); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static void ctl_event(CtlEvent *e); - - static void a_pipe_open(void); -@@ -463,7 +463,7 @@ - } - } - --static void ctl_pass_playing_list(int init_number_of_files, -+static int ctl_pass_playing_list(int init_number_of_files, - char *init_list_of_files[]) { - int current_no,command=RC_NONE,i,j; - int32 val; -diff -ur TiMidity++-2.13.2/interface/xskin_c.c TiMidity++-2.13.2-new/interface/xskin_c.c ---- TiMidity++-2.13.2/interface/xskin_c.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/interface/xskin_c.c 2005-01-02 03:12:31.000000000 +0100 -@@ -55,7 +55,7 @@ - static void ctl_close(void); - static int ctl_read(int32 *valp); - static int cmsg(int type, int verbosity_level, char *fmt, ...); --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]); -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]); - static void ctl_event(CtlEvent *e); - static void ctl_speana_data(double *val, int size); - static void initialize_exp_hz_table( void ); -@@ -342,7 +342,7 @@ - } - } - --static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) { -+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) { - - int current_no,command,i; - int32 val; -@@ -403,7 +403,7 @@ - command=play_midi_file(list_of_files[file_table[current_no]]); - } else { - /* Quit timidity*/ -- if (exitflag) return; -+ if (exitflag) return 0; - /* Stop playing */ - if (command==RC_QUIT) { - sprintf(local_buf,"T 00:00"); -@@ -461,6 +461,7 @@ - command=ctl_blocking_read(&val); - } - } -+ return 0; - } - - /* ------ Pipe handlers ----- */ -diff -ur TiMidity++-2.13.2/timidity/controls.h TiMidity++-2.13.2-new/timidity/controls.h ---- TiMidity++-2.13.2/timidity/controls.h 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/timidity/controls.h 2005-01-02 02:59:37.000000000 +0100 -@@ -147,7 +147,7 @@ - - int (*open)(int using_stdin, int using_stdout); - void (*close)(void); -- void (*pass_playing_list)(int number_of_files, char *list_of_files[]); -+ int (*pass_playing_list)(int number_of_files, char *list_of_files[]); - int (*read)(int32 *valp); - int (*cmsg)(int type, int verbosity_level, char *fmt, ...); - void (*event)(CtlEvent *ev); /* Control events */ -diff -ur TiMidity++-2.13.2/timidity/playmidi.c TiMidity++-2.13.2-new/timidity/playmidi.c ---- TiMidity++-2.13.2/timidity/playmidi.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/timidity/playmidi.c 2005-01-02 03:15:55.000000000 +0100 -@@ -8562,7 +8562,7 @@ - return rc; - } - --void dumb_pass_playing_list(int number_of_files, char *list_of_files[]) -+int dumb_pass_playing_list(int number_of_files, char *list_of_files[]) - { - #ifndef CFG_FOR_SF - int i = 0; -@@ -8586,12 +8586,12 @@ - aq_flush(0); - - if(!(ctl->flags & CTLF_LIST_LOOP)) -- return; -+ return 0; - i = 0; - break; - - case RC_QUIT: -- return; -+ return 0; - } - } - #endif -diff -ur TiMidity++-2.13.2/timidity/playmidi.h TiMidity++-2.13.2-new/timidity/playmidi.h ---- TiMidity++-2.13.2/timidity/playmidi.h 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/timidity/playmidi.h 2005-01-02 03:16:07.000000000 +0100 -@@ -577,7 +577,7 @@ - extern int opt_pan_delay; - - extern int play_midi_file(char *fn); --extern void dumb_pass_playing_list(int number_of_files, char *list_of_files[]); -+extern int dumb_pass_playing_list(int number_of_files, char *list_of_files[]); - extern void default_ctl_lyric(int lyricid); - extern int check_apply_control(void); - extern void recompute_freq(int v); -diff -ur TiMidity++-2.13.2/timidity/sndfont.c TiMidity++-2.13.2-new/timidity/sndfont.c ---- TiMidity++-2.13.2/timidity/sndfont.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/timidity/sndfont.c 2005-01-02 03:15:27.000000000 +0100 -@@ -1893,7 +1893,7 @@ - - #if CFG_FOR_SF_SUPPORT_FFT - int check_apply_control(void) { return 0; } // not pass --void dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {} -+int dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {return 0;} - void recompute_freq(int v) {} // not pass - int32 control_ratio = 0; - int reduce_quality_flag = 0; -diff -ur TiMidity++-2.13.2/timidity/timidity.c TiMidity++-2.13.2-new/timidity/timidity.c ---- TiMidity++-2.13.2/timidity/timidity.c 2005-01-02 02:53:01.000000000 +0100 -+++ TiMidity++-2.13.2-new/timidity/timidity.c 2005-01-02 02:59:29.000000000 +0100 -@@ -5291,6 +5291,7 @@ - int need_stdin = 0, need_stdout = 0; - int i; - int output_fail = 0; -+ int retval; - - if(nfiles == 0 && !strchr(INTERACTIVE_INTERFACE_IDS, ctl->id_character)) - return 0; -@@ -5410,7 +5411,7 @@ - ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY, - "pass_playing_list() nfiles=%d", nfiles); - -- ctl->pass_playing_list(nfiles, files); -+ retval=ctl->pass_playing_list(nfiles, files); - - if(intr) - aq_flush(1); -@@ -5451,7 +5452,7 @@ - url_news_connection_cache(URL_NEWS_CLOSE_CACHE); - #endif /* SUPPORT_SOCKET */ - -- return 0; -+ return retval; - } - - #ifdef IA_W32GUI diff --git a/extra/timidity++/timidity++-2.13.2-gtk26.patch b/extra/timidity++/timidity++-2.13.2-gtk26.patch deleted file mode 100644 index 73dc8de6c..000000000 --- a/extra/timidity++/timidity++-2.13.2-gtk26.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- interface/gtk_i.c 2004/12/21 16:59:33 1.1 -+++ interface/gtk_i.c 2004/12/21 16:59:41 -@@ -365,6 +365,7 @@ void - Launch_Gtk_Process(int pipe_number) - { - int argc = 0; -+ gchar **argv = NULL; - GtkWidget *button, *mbar, *swin; - GtkWidget *table, *align, *handlebox; - GtkWidget *vbox, *hbox, *vbox2, *scrolled_win; -@@ -373,7 +374,7 @@ Launch_Gtk_Process(int pipe_number) - /* enable locale */ - gtk_set_locale (); - -- gtk_init (&argc, NULL); -+ gtk_init (&argc, &argv); - - ttip = create_yellow_tooltips(); - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); diff --git a/extra/timidity++/timidity++-2.13.2-polling.patch b/extra/timidity++/timidity++-2.13.2-polling.patch deleted file mode 100644 index a9638dba1..000000000 --- a/extra/timidity++/timidity++-2.13.2-polling.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- interface/alsaseq_c.c 2006/12/13 23:22:53 1.28 -+++ interface/alsaseq_c.c 2008/04/16 00:14:45 1.29 -@@ -501,6 +501,8 @@ - - static void doit(struct seq_context *ctxp) - { -+ fd_set rfds; -+ struct timeval timeout; - for (;;) { - while (snd_seq_event_input_pending(ctxp->handle, 1)) { - if (do_sequencer(ctxp)) -@@ -528,15 +530,17 @@ - play_event(&ev); - aq_fill_nonblocking(); - } -- if (! ctxp->active || ! IS_STREAM_TRACE) { -- fd_set rfds; -- struct timeval timeout; -- FD_ZERO(&rfds); -- FD_SET(ctxp->fd, &rfds); -+ -+ FD_ZERO(&rfds); -+ FD_SET(ctxp->fd, &rfds); -+ if (ctxp->active) { - timeout.tv_sec = 0; - timeout.tv_usec = 10000; /* 10ms */ - if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0) - goto __done; -+ } else { -+ if (select(ctxp->fd + 1, &rfds, NULL, NULL, NULL) < 0) -+ goto __done; - } - } - diff --git a/extra/transcode/ffmpeg-0.10.patch b/extra/transcode/ffmpeg-0.10.patch deleted file mode 100644 index 5965c180c..000000000 --- a/extra/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/extra/unrar/PKGBUILD b/extra/unrar/PKGBUILD deleted file mode 100644 index f4ef1a125..000000000 --- a/extra/unrar/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 161802 2012-06-14 17:00:58Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: dorphell <dorphell@gmx.net> - -pkgbase=unrar -pkgname=('unrar' 'libunrar') -pkgver=4.2.4 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.rarlab.com/rar_add.htm" -license=('custom') -makedepends=('gcc-libs') -source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz" - 'unrar-4.2.1-soname.patch') -md5sums=('8ea9d1b4139474b282d76e627a2de3e4' - 'b9ec767da9a36f5ac38034c974e77758') - -build() { - cd "${srcdir}/${pkgbase}" - - patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch" - - cp -a ${srcdir}/unrar ${srcdir}/libunrar - make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}" - make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true" -} - -package_unrar() { - pkgdesc="The RAR uncompression program" - depends=('gcc-libs') - cd "${srcdir}/${pkgbase}" - - install -Dm755 unrar "${pkgdir}/usr/bin/unrar" - # install license - install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_libunrar() { - pkgdesc="Library and header file for applications that use libunrar" - depends=('gcc-libs') - cd "${srcdir}/libunrar" - - install -Dm755 libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.${pkgver}" - install -Dm644 dll.hpp "${pkgdir}/usr/include/unrar/dll.hpp" - ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.4" - ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so" - # install license - install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/unrar/unrar-4.2.1-soname.patch b/extra/unrar/unrar-4.2.1-soname.patch deleted file mode 100644 index 83ebe9611..000000000 --- a/extra/unrar/unrar-4.2.1-soname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- makefile.unix 2012-02-23 10:23:14.000000000 +0100 -+++ makefile.unix 2012-05-05 12:58:13.000000000 +0200 -@@ -131,7 +131,7 @@ - lib: CXXFLAGS+=$(LIBFLAGS) - lib: clean $(OBJECTS) $(LIB_OBJ) - @rm -f libunrar.so -- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) -+ $(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) - - install-unrar: - install -D unrar $(DESTDIR)/bin/unrar diff --git a/extra/unzip/PKGBUILD b/extra/unzip/PKGBUILD deleted file mode 100644 index 7c2d71367..000000000 --- a/extra/unzip/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 150453 2012-02-17 23:22:29Z allan $ -# Maintainer: -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Robson Peixoto - -pkgname=unzip -pkgver=6.0 -pkgrel=6 -pkgdesc="Unpacks .zip archives such as those made by PKZIP" -arch=('i686' 'x86_64') -url="http://www.info-zip.org/" -license=('custom') -depends=('bzip2' 'bash') -source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz') -md5sums=('62b490407489521db863b523a7f86375') - -build() { - cd ${srcdir}/${pkgname}${pkgver/./} - - # set CFLAGS -- from Debian - export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ - -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ - -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ - -DUSE_BZIP2 -DNATIVE" - - sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile - - # make -- from Debian - make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ - D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips -} - -package() { - cd ${srcdir}/${pkgname}${pkgver/./} - - # install -- from Debian - make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install - - # install the license file - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE -} - diff --git a/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch deleted file mode 100644 index 2694334c8..000000000 --- a/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sun, 2 Sep 2012 04:36:13 +0200 -Subject: [PATCH] Send resume signal when built with systemd and using - pm-utils suspend - -This case was apparently overlooked when adding systemd support. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/linux/up-backend.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c -index ddd4472..52b430e 100644 ---- a/src/linux/up-backend.c -+++ b/src/linux/up-backend.c -@@ -603,10 +603,11 @@ gboolean - up_backend_emits_resuming (UpBackend *backend) - { - #ifdef HAVE_SYSTEMD -- return TRUE; --#else -- return FALSE; -+ if (sd_booted ()) -+ return TRUE; -+ else - #endif -+ return FALSE; - } - - /** --- -1.7.12 - diff --git a/extra/usbmuxd/usbmuxd-udevuser.patch b/extra/usbmuxd/usbmuxd-udevuser.patch deleted file mode 100644 index 51c8f3d3a..000000000 --- a/extra/usbmuxd/usbmuxd-udevuser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in ---- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in 2011-08-04 15:28:32.751579507 +0000 -+++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in 2011-08-04 15:36:20.139265124 +0000 -@@ -1,7 +1,7 @@ - # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) - - # Forces iDevices to the last USB configuration and runs usbmuxd --ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" -+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" - - # Exit usbmuxd when the last device is removed - ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD deleted file mode 100644 index dcbe9e51f..000000000 --- a/extra/usbview/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 169543 2012-10-23 11:13:44Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=usbview -pkgver=2.0 -pkgrel=2 -pkgdesc="Display the topology of devices on the USB bus" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.kroah.com/linux/usb/" -license=('GPL') -depends=('gtk3' 'desktop-file-utils') -makedepends=('pkg-config' 'gendesk') -install=${pkgname}.install -source=("http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz") -md5sums=('565f2e79f3924d14ab5b4d8aced557e5') - -build() { - cd "${srcdir}" - gendesk -n - sed -i "s:Application;:Application;System:g" "${srcdir}"/${pkgname}.desktop - - cd "${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" \ - sysconfdir="${pkgdir}/etc" \ - localstatedir="${pkgdir}/var" install - - install -Dm0644 "${srcdir}"/${pkgname}.desktop \ - "${pkgdir}"/usr/share/applications/${pkgname}.desktop - - install -Dm0644 "${srcdir}"/${pkgname}-${pkgver}/usb_icon.xpm \ - "${pkgdir}"/usr/share/pixmaps/${pkgname}.xpm -} diff --git a/extra/usbview/usbview-1.1-gtk3-port.patch b/extra/usbview/usbview-1.1-gtk3-port.patch deleted file mode 100644 index 9462dcf43..000000000 --- a/extra/usbview/usbview-1.1-gtk3-port.patch +++ /dev/null @@ -1,802 +0,0 @@ ---- a/Makefile.am 2009-03-11 03:25:46.000000000 +0100 -+++ b/Makefile.am 2012-06-14 20:33:10.641639573 +0200 -@@ -16,10 +16,8 @@ - interface.c \ - callbacks.c \ - usbtree.c usbtree.h \ -- showmessage.c \ - usbparse.c usbparse.h \ - configure-dialog.c \ -- about-dialog.c \ - usbview_logo.xpm \ - usbview_logo.xcf \ - usb_icon.xpm \ ---- a/callbacks.c 2008-06-25 23:03:13.000000000 +0200 -+++ b/callbacks.c 2012-06-14 21:06:05.000523489 +0200 -@@ -23,13 +23,13 @@ - #endif - - #include <gtk/gtk.h> -- - #include "usbtree.h" -+#include "usbview_logo.xpm" /* logo */ - - - void on_buttonClose_clicked (GtkButton *button, gpointer user_data) - { -- gtk_exit(0); -+ gtk_main_quit(); - } - - -@@ -55,7 +55,21 @@ - - void on_buttonAbout_clicked (GtkButton *button, gpointer user_data) - { -- about_dialog (); -+ GdkPixbuf *logo; -+ gchar *authors[] = { "Greg Kroah-Hartman <greg@kroah.com>", NULL }; -+ -+ logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm); -+ gtk_show_about_dialog (GTK_WINDOW (windowMain), -+ "logo", logo, -+ "program-name", "usbview", -+ "version", VERSION, -+ "comments", "Display information on USB devices", -+ "website-label", "http://www.kroah.com/linux-usb/", -+ "website", "http://www.kroah.com/linux-usb/", -+ "copyright", "Copyright © 1999-2012", -+ "authors", authors, -+ NULL); -+ g_object_unref (logo); - } - - ---- a/configure-dialog.c 2009-03-11 02:40:28.000000000 +0100 -+++ b/configure-dialog.c 2012-06-14 21:06:05.000523489 +0200 -@@ -24,264 +24,78 @@ - #endif - - #include <gtk/gtk.h> --#include <stdio.h> --#include <stdlib.h> - #include <string.h> --#include <ctype.h> -- - #include "usbtree.h" - #include "usbparse.h" - -- -- -- - static GtkWidget *fileEntry; --static GtkWidget *filew; --static char *sFilename; -- --/* -- * Get the selected filename and print it to the console -- */ --static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs) --{ -- const char *sTempFile; -- -- /* --- Get the name --- */ -- sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs)); -- -- /* --- Allocate space and save it. --- */ -- sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1)); -- strcpy (sFilename, sTempFile); -- -- /* --- Destroy the file selection --- */ -- gtk_widget_destroy (filew); --} -- -- --static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs) --{ -- /* --- Destroy the file selection --- */ -- gtk_widget_destroy (filew); --} -- -- --/* -- * DestroyDialog -- * -- * Destroy the dialog (obvious, eh?) but also remove the -- * grab and close the modal. -- */ --static int DestroyDialog (GtkWidget *widget, gpointer *data) --{ -- gtk_grab_remove (widget); -- gtk_main_quit (); -- return(FALSE); --} -- -- --/* -- * GetFilename -- */ --static char *GetFilename (char *sTitle, char *initialFilename) --{ -- sFilename = NULL; -- -- /* --- Create a new file selection widget --- */ -- filew = gtk_file_selection_new (sTitle); -- -- /* --- If it's destroyed --- */ -- gtk_signal_connect (GTK_OBJECT (filew), "destroy", (GtkSignalFunc) DestroyDialog, &filew); -- -- /* --- Connect the ok_button to file_ok_sel function --- */ -- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->ok_button), "clicked", (GtkSignalFunc) file_ok_sel, filew ); -- -- /* --- Connect the cancel_button to destroy the widget --- */ -- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button), "clicked", (GtkSignalFunc) file_cancel_sel, filew); -- -- /* --- Lets set the filename --- */ -- gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), initialFilename); -- -- /* --- Turn off the file operation buttons --- */ -- gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION(filew)); -- -- /* --- Of course, we show it --- */ -- gtk_widget_show (filew); -- -- /* --- Make sure we keep the focus --- */ -- gtk_grab_add (filew); -- -- gtk_main (); -- -- return(sFilename); --} -- -- --static void ClearShowMessage (GtkWidget *widget, gpointer data) --{ -- gtk_grab_remove (widget); --} -- --static void CancelConfigureDialog (GtkWidget *widget, gpointer data) --{ -- GtkWidget *dialogWidget = (GtkWidget *) data; -- -- gtk_grab_remove (dialogWidget); -- -- /* --- Close the widget --- */ -- gtk_widget_destroy (dialogWidget); --} -- --static void OkConfigureDialog (GtkWidget *widget, gpointer data) --{ -- GtkWidget *dialogWidget = (GtkWidget *) data; -- gchar *editString; -- -- editString = gtk_editable_get_chars (GTK_EDITABLE (fileEntry), 0, -1); -- -- gtk_grab_remove (dialogWidget); -- -- /* --- Close the widget --- */ -- gtk_widget_destroy (dialogWidget); -- -- strcpy (devicesFile, editString); -- g_free (editString); -- LoadUSBTree(0); --} -- - - static void fileSelectButtonClick (GtkWidget *widget, gpointer data) - { -- gchar *newFilename; -+ GtkWidget *dialog; -+ gchar *filename; - -- newFilename = GetFilename ("locate usbdevfs devices file", devicesFile); -- -- if (newFilename != NULL) { -- gtk_entry_set_text (GTK_ENTRY (fileEntry), newFilename); -- gtk_widget_show (fileEntry); -- g_free (newFilename); -+ dialog = gtk_file_chooser_dialog_new ( -+ "locate usbdevfs devices file", -+ GTK_WINDOW (windowMain), -+ GTK_FILE_CHOOSER_ACTION_OPEN, -+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, -+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, -+ NULL); -+ -+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) -+ { -+ filename = gtk_file_chooser_get_filename( -+ GTK_FILE_CHOOSER (dialog)); -+ gtk_entry_set_text (GTK_ENTRY (fileEntry), filename); -+ g_free (filename); - } -+ -+ gtk_widget_destroy (dialog); - } - -- - void configure_dialog (void) - { -- GtkWidget *configDialog; -- GtkWidget *dialog_vbox2; -+ GtkWidget *dialog, *content_area; - GtkWidget *hbox1; - GtkWidget *label1; -- GtkWidget *label41; -- GtkWidget *label42; -- GtkWidget *label43; -- GtkWidget *vbox1; -- GtkWidget *dialog_action_area2; -- GtkWidget *hbuttonbox2; -- GtkWidget *okButton; -- GtkWidget *cancelButton; - GtkWidget *fileSelectButton; -+ gchar *editString; -+ gint result; - -- configDialog = gtk_dialog_new (); -- gtk_object_set_data (GTK_OBJECT (configDialog), "configDialog", configDialog); -- gtk_window_set_title (GTK_WINDOW (configDialog), "USB View Configuration"); -- gtk_window_set_policy (GTK_WINDOW (configDialog), TRUE, TRUE, FALSE); -- -- dialog_vbox2 = GTK_DIALOG (configDialog)->vbox; -- gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_vbox2", dialog_vbox2); -- gtk_widget_show (dialog_vbox2); -- -- vbox1 = gtk_vbox_new (FALSE, 0); -- gtk_widget_ref (vbox1); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (vbox1); -- gtk_box_pack_start (GTK_BOX (dialog_vbox2), vbox1, TRUE, TRUE, 0); -- -- label41 = gtk_label_new (""); -- gtk_widget_ref (label41); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label41", label41, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (label41); -- gtk_box_pack_start (GTK_BOX (vbox1), label41, FALSE, FALSE, 0); -- -- hbox1 = gtk_hbox_new (FALSE, 0); -- gtk_widget_ref (hbox1); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (hbox1); --// gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox1, TRUE, TRUE, 0); -- gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); -- -- label42 = gtk_label_new (""); -- gtk_widget_ref (label42); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label42", label42, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (label42); -- gtk_box_pack_start (GTK_BOX (vbox1), label42, FALSE, FALSE, 0); -- -- -- label1 = gtk_label_new (" Location of usbdevfs devices file"); -- gtk_widget_ref (label1); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label1", label1, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (label1); -+ dialog = gtk_dialog_new_with_buttons ( -+ "USB View Configuration", -+ GTK_WINDOW (windowMain), -+ GTK_DIALOG_DESTROY_WITH_PARENT, -+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, -+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, -+ NULL); -+ -+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); -+ -+ hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); -+ gtk_container_add (GTK_CONTAINER (content_area), hbox1); -+ -+ label1 = gtk_label_new ("Location of usbdevfs devices file"); - gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5); - - fileEntry = gtk_entry_new (); -- gtk_widget_ref (fileEntry); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileEntry", fileEntry, (GtkDestroyNotify) gtk_widget_unref); - gtk_entry_set_text (GTK_ENTRY (fileEntry), devicesFile); -- gtk_widget_show (fileEntry); - gtk_box_pack_start (GTK_BOX (hbox1), fileEntry, TRUE, TRUE, 0); - -- dialog_action_area2 = GTK_DIALOG (configDialog)->action_area; -- gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_action_area2", dialog_action_area2); -- gtk_widget_show (dialog_action_area2); -- gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 1); -- -- hbuttonbox2 = gtk_hbutton_box_new (); -- gtk_widget_ref (hbuttonbox2); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbuttonbox2", hbuttonbox2, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (hbuttonbox2); -- gtk_box_pack_start (GTK_BOX (dialog_action_area2), hbuttonbox2, TRUE, TRUE, 11); -- -- okButton = gtk_button_new_with_label (" OK "); -- gtk_widget_ref (okButton); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "okButton", okButton, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (okButton); -- gtk_container_add (GTK_CONTAINER (hbuttonbox2), okButton); -- GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT); -- -- cancelButton = gtk_button_new_with_label (" Cancel "); -- gtk_widget_ref (cancelButton); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "cancelButton", cancelButton, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (cancelButton); -- gtk_container_add (GTK_CONTAINER (hbuttonbox2), cancelButton); -- GTK_WIDGET_SET_FLAGS (cancelButton, GTK_CAN_DEFAULT); -- - fileSelectButton = gtk_button_new_with_label ("..."); -- gtk_widget_ref (fileSelectButton); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileSelectButton", fileSelectButton, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (fileSelectButton); -- -+ g_signal_connect (G_OBJECT (fileSelectButton), "clicked", -+ G_CALLBACK (fileSelectButtonClick), NULL); - gtk_box_pack_start (GTK_BOX (hbox1), fileSelectButton, TRUE, FALSE, 1); - -- label43 = gtk_label_new (" "); -- gtk_widget_ref (label43); -- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label43", label43, (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (label43); -- gtk_box_pack_start (GTK_BOX (hbox1), label43, FALSE, FALSE, 0); -- -- gtk_signal_connect (GTK_OBJECT (okButton), "clicked", GTK_SIGNAL_FUNC (OkConfigureDialog), configDialog); -- gtk_signal_connect (GTK_OBJECT (cancelButton), "clicked", GTK_SIGNAL_FUNC (CancelConfigureDialog), configDialog); -- gtk_signal_connect (GTK_OBJECT (fileSelectButton), "clicked", GTK_SIGNAL_FUNC (fileSelectButtonClick), configDialog); -- -- /* --- Default the "Ok" button --- */ -- GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT); -- gtk_widget_grab_default (okButton); -- -- gtk_signal_connect (GTK_OBJECT (configDialog), "destroy", GTK_SIGNAL_FUNC (ClearShowMessage), NULL); -- -- /* --- Show the dialog --- */ -- gtk_widget_show (configDialog); -- -- /* --- Only this window can have actions done. --- */ -- gtk_grab_add (configDialog); -- -- return; -+ gtk_widget_show_all (dialog); -+ result = gtk_dialog_run(GTK_DIALOG (dialog)); -+ if (result == GTK_RESPONSE_ACCEPT) { -+ editString = gtk_editable_get_chars ( -+ GTK_EDITABLE (fileEntry), 0, -1); -+ strcpy (devicesFile, editString); -+ g_free (editString); -+ LoadUSBTree (0); -+ } -+ gtk_widget_destroy (dialog); - } -- -- ---- a/configure.in 2007-10-23 02:03:36.000000000 +0200 -+++ b/configure.in 2012-06-14 20:25:16.629667442 +0200 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - - AC_INIT(configure.in) --AM_INIT_AUTOMAKE(usbview, 1.0) -+AM_INIT_AUTOMAKE(usbview, 1.1) - AM_CONFIG_HEADER(config.h) - - # required versions of other packages -@@ -12,33 +12,10 @@ - AM_PROG_CC_STDC - AC_HEADER_STDC - --PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5) -+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0) - AC_SUBST(GTK_FLAGS) - AC_SUBST(GTK_LIBS) - -- --dnl Set PACKAGE_LOCALE_DIR in config.h. --if test "x${prefix}" = "xNONE"; then -- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale") --else -- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale") --fi -- --dnl Set PACKAGE_DATA_DIR in config.h. --if test "x${datadir}" = 'x${prefix}/share'; then -- if test "x${prefix}" = "xNONE"; then -- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}") -- else -- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}") -- fi --else -- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}") --fi -- --dnl Set PACKAGE_SOURCE_DIR in config.h. --packagesrcdir=`cd $srcdir && pwd` --AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}") -- - dnl Use -Wall if we have gcc. - changequote(,)dnl - if test "x$GCC" = "xyes"; then ---- a/interface.c 2009-03-11 03:11:47.000000000 +0100 -+++ b/interface.c 2012-06-14 21:06:05.000523489 +0200 -@@ -32,15 +32,16 @@ - #include "usb_icon.xpm" - - GtkWidget *treeUSB; -+GtkTreeStore *treeStore; - GtkTextBuffer *textDescriptionBuffer; - GtkWidget *textDescriptionView; -+GtkWidget *windowMain; - - int timer; - - GtkWidget* - create_windowMain () - { -- GtkWidget *windowMain; - GtkWidget *vbox1; - GtkWidget *hpaned1; - GtkWidget *scrolledwindow1; -@@ -50,68 +51,61 @@ - GtkWidget *buttonClose; - GtkWidget *buttonAbout; - GdkPixbuf *icon; -+ GtkCellRenderer *treeRenderer; -+ GtkTreeViewColumn *treeColumn; - - windowMain = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_name (windowMain, "windowMain"); -- gtk_object_set_data (GTK_OBJECT (windowMain), "windowMain", windowMain); - gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer"); -- gtk_window_set_default_size (GTK_WINDOW (windowMain), 500, 300); -+ gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300); - - icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm); - gtk_window_set_icon(GTK_WINDOW(windowMain), icon); - -- vbox1 = gtk_vbox_new (FALSE, 0); -+ vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_set_name (vbox1, "vbox1"); -- gtk_widget_ref (vbox1); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "vbox1", vbox1, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (vbox1); - gtk_container_add (GTK_CONTAINER (windowMain), vbox1); - -- hpaned1 = gtk_hpaned_new (); -+ hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_name (hpaned1, "hpaned1"); -- gtk_widget_ref (hpaned1); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "hpaned1", hpaned1, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hpaned1); - gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0); -- gtk_paned_set_position (GTK_PANED (hpaned1), 200); - -- treeUSB = gtk_ctree_new_with_titles (1, 0, NULL); -+ treeStore = gtk_tree_store_new (N_COLUMNS, -+ G_TYPE_STRING, /* NAME_COLUMN */ -+ G_TYPE_INT, /* DEVICE_ADDR_COLUMN */ -+ G_TYPE_STRING /* COLOR_COLUMN */); -+ treeUSB = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treeStore)); -+ treeRenderer = gtk_cell_renderer_text_new (); -+ treeColumn = gtk_tree_view_column_new_with_attributes ( -+ "USB devices", -+ treeRenderer, -+ "text", NAME_COLUMN, -+ "foreground", COLOR_COLUMN, -+ NULL); -+ gtk_tree_view_append_column (GTK_TREE_VIEW (treeUSB), treeColumn); - gtk_widget_set_name (treeUSB, "treeUSB"); -- gtk_widget_ref (treeUSB); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "treeUSB", treeUSB, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (treeUSB); -- gtk_container_add (GTK_CONTAINER (hpaned1), treeUSB); -- gtk_widget_set_usize (treeUSB, 200, -2); -+ gtk_paned_pack1 (GTK_PANED (hpaned1), treeUSB, FALSE, FALSE); - - scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_set_name (scrolledwindow1, "scrolledwindow1"); -- gtk_widget_ref (scrolledwindow1); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "scrolledwindow1", scrolledwindow1, -- (GtkDestroyNotify) gtk_widget_unref); -- gtk_widget_show (scrolledwindow1); -- gtk_container_add (GTK_CONTAINER (hpaned1), scrolledwindow1); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); -+ gtk_widget_show (scrolledwindow1); -+ gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow1, TRUE, FALSE); - - textDescriptionBuffer = gtk_text_buffer_new(NULL); - //textDescription = gtk_text_new (NULL, NULL); - textDescriptionView = gtk_text_view_new_with_buffer(textDescriptionBuffer); - gtk_widget_set_name (textDescriptionView, "textDescription"); -- gtk_widget_ref (textDescriptionView); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "textDescription", textDescriptionView, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_text_view_set_editable(GTK_TEXT_VIEW(textDescriptionView), FALSE); - gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textDescriptionView), FALSE); - gtk_widget_show (textDescriptionView); - gtk_container_add (GTK_CONTAINER (scrolledwindow1), textDescriptionView); - -- hbuttonbox1 = gtk_hbutton_box_new (); -+ hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_name (hbuttonbox1, "hbuttonbox1"); -- gtk_widget_ref (hbuttonbox1); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "hbuttonbox1", hbuttonbox1, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hbuttonbox1); - gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, FALSE, 5); - //gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 10); -@@ -120,58 +115,46 @@ - - buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH); - gtk_widget_set_name (buttonRefresh, "buttonRefresh"); -- gtk_widget_ref (buttonRefresh); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonRefresh", buttonRefresh, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (buttonRefresh); - gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonRefresh); - gtk_container_set_border_width (GTK_CONTAINER (buttonRefresh), 4); -- GTK_WIDGET_SET_FLAGS (buttonRefresh, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default (buttonRefresh, TRUE); - - buttonConfigure = gtk_button_new_with_label ("Configure..."); - gtk_widget_set_name (buttonConfigure, "buttonConfigure"); -- gtk_widget_ref (buttonConfigure); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonConfigure", buttonConfigure, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (buttonConfigure); - gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonConfigure); - gtk_container_set_border_width (GTK_CONTAINER (buttonConfigure), 4); -- GTK_WIDGET_SET_FLAGS (buttonConfigure, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default (buttonConfigure, TRUE); - - buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT); - gtk_widget_set_name (buttonAbout, "buttonAbout"); -- gtk_widget_ref (buttonAbout); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonAbout", buttonAbout, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (buttonAbout); - gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonAbout); - gtk_container_set_border_width (GTK_CONTAINER (buttonAbout), 4); -- GTK_WIDGET_SET_FLAGS (buttonAbout, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default (buttonAbout, TRUE); - - buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT); - gtk_widget_set_name (buttonClose, "buttonClose"); -- gtk_widget_ref (buttonClose); -- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonClose", buttonClose, -- (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (buttonClose); - gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonClose); - gtk_container_set_border_width (GTK_CONTAINER (buttonClose), 4); -- GTK_WIDGET_SET_FLAGS (buttonClose, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default (buttonClose, TRUE); - -- gtk_signal_connect (GTK_OBJECT (windowMain), "delete_event", -- GTK_SIGNAL_FUNC (on_window1_delete_event), -+ g_signal_connect (G_OBJECT (windowMain), "delete_event", -+ G_CALLBACK (on_window1_delete_event), - NULL); -- gtk_signal_connect (GTK_OBJECT (buttonRefresh), "clicked", -- GTK_SIGNAL_FUNC (on_buttonRefresh_clicked), -+ g_signal_connect (G_OBJECT (buttonRefresh), "clicked", -+ G_CALLBACK (on_buttonRefresh_clicked), - NULL); -- gtk_signal_connect (GTK_OBJECT (buttonConfigure), "clicked", -- GTK_SIGNAL_FUNC (on_buttonConfigure_clicked), -+ g_signal_connect (G_OBJECT (buttonConfigure), "clicked", -+ G_CALLBACK (on_buttonConfigure_clicked), - NULL); -- gtk_signal_connect (GTK_OBJECT (buttonAbout), "clicked", -- GTK_SIGNAL_FUNC (on_buttonAbout_clicked), -+ g_signal_connect (G_OBJECT (buttonAbout), "clicked", -+ G_CALLBACK (on_buttonAbout_clicked), - NULL); -- gtk_signal_connect (GTK_OBJECT (buttonClose), "clicked", -- GTK_SIGNAL_FUNC (on_buttonClose_clicked), -+ g_signal_connect (G_OBJECT (buttonClose), "clicked", -+ G_CALLBACK (on_buttonClose_clicked), - NULL); - - /* create our timer */ ---- a/main.c 2008-06-25 23:03:27.000000000 +0200 -+++ b/main.c 2012-06-14 21:06:05.000523489 +0200 -@@ -30,7 +30,6 @@ - { - GtkWidget *window1; - -- gtk_set_locale (); - gtk_init (&argc, &argv); - - initialize_stuff(); ---- a/usbparse.h 2008-06-25 23:03:47.000000000 +0200 -+++ b/usbparse.h 2012-06-14 21:06:05.000523489 +0200 -@@ -166,7 +166,7 @@ - struct Device *child[MAX_CHILDREN]; - DeviceBandwidth *bandwidth; - GtkWidget *tree; -- GtkCTreeNode *leaf; -+ GtkTreeIter leaf; - } Device; - - ---- a/usbtree.c 2012-06-14 21:08:11.672516042 +0200 -+++ b/usbtree.c 2012-06-14 21:06:05.000523489 +0200 -@@ -45,7 +45,7 @@ - - /* blow away the tree if there is one */ - if (rootDevice != NULL) { -- gtk_ctree_remove_node (GTK_CTREE(treeUSB), GTK_CTREE_NODE(rootDevice->leaf)); -+ gtk_tree_store_clear (treeStore); - } - - /* clean out the text box */ -@@ -208,32 +208,37 @@ - } - - --void SelectItem (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer userData) -+void SelectItem (GtkTreeSelection *selection, gpointer userData) - { -- int data; -- data = (int) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node); -- -- PopulateListBox ((int)data); -- -- return; -+ GtkTreeIter iter; -+ GtkTreeModel *model; -+ gint deviceAddr; -+ -+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) { -+ gtk_tree_model_get (model, &iter, -+ DEVICE_ADDR_COLUMN, &deviceAddr, -+ -1); -+ PopulateListBox (deviceAddr); -+ } - } - - - static void DisplayDevice (Device *parent, Device *device) - { - int i; -- gchar *text[1]; - int configNum; - int interfaceNum; - gboolean driverAttached = TRUE; -+ gint deviceAddr; -+ const gchar *color = "black"; - - if (device == NULL) - return; - - /* build this node */ -- text[0] = device->name; -- device->leaf = gtk_ctree_insert_node (GTK_CTREE(treeUSB), parent->leaf, NULL, text, 1, NULL, NULL, NULL, NULL, FALSE, FALSE); -- gtk_ctree_node_set_row_data (GTK_CTREE(treeUSB), device->leaf, (gpointer)((device->deviceNumber<<8) | (device->busNumber))); -+ deviceAddr = (device->deviceNumber << 8) | device->busNumber; -+ gtk_tree_store_append (treeStore, &device->leaf, -+ (device->level != 0) ? &parent->leaf : NULL); - - /* determine if this device has drivers attached to all interfaces */ - for (configNum = 0; configNum < MAX_CONFIGS; ++configNum) { -@@ -252,15 +257,14 @@ - } - - /* change the color of this leaf if there are no drivers attached to it */ -- if (driverAttached == FALSE) { -- GdkColor red; -- -- red.red = 56000; -- red.green = 0; -- red.blue = 0; -- red.pixel = 0; -- gtk_ctree_node_set_foreground (GTK_CTREE(treeUSB), device->leaf, &red); -- } -+ if (driverAttached == FALSE) -+ color = "red"; -+ -+ gtk_tree_store_set (treeStore, &device->leaf, -+ NAME_COLUMN, device->name, -+ DEVICE_ADDR_COLUMN, deviceAddr, -+ COLOR_COLUMN, color, -+ -1); - - /* create all of the children's leafs */ - for (i = 0; i < MAX_CHILDREN; ++i) { -@@ -283,11 +287,16 @@ - - static void FileError (void) - { -- gchar *tempString = g_malloc0(strlen (verifyMessage) + strlen (devicesFile) + 50); -- sprintf (tempString, " Can not open the file %s \n\n%s", devicesFile, verifyMessage); -- ShowMessage ("USBView Error", tempString, FALSE); -- g_free (tempString); -- return; -+ GtkWidget *dialog; -+ -+ dialog = gtk_message_dialog_new ( -+ GTK_WINDOW (windowMain), -+ GTK_DIALOG_DESTROY_WITH_PARENT, -+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, -+ "Can not open the file %s\n\n%s", -+ devicesFile, verifyMessage); -+ gtk_dialog_run (GTK_DIALOG (dialog)); -+ gtk_widget_destroy (dialog); - } - - -@@ -328,10 +337,6 @@ - int finished; - int i; - -- if (MessageShown() == TRUE) { -- return; -- } -- - /* if refresh is selected, then always do a refresh, otherwise look at the file first */ - if (!refresh) { - if (!FileHasChanged()) { -@@ -368,11 +373,5 @@ - usb_name_devices (); - -- /* set up our tree */ -- gtk_ctree_set_line_style (GTK_CTREE(treeUSB), GTK_CTREE_LINES_DOTTED); -- gtk_ctree_set_expander_style (GTK_CTREE(treeUSB), GTK_CTREE_EXPANDER_SQUARE); -- gtk_ctree_set_indent (GTK_CTREE(treeUSB),10); -- gtk_clist_column_titles_passive (GTK_CLIST(treeUSB)); -- - /* build our tree */ - for (i = 0; i < rootDevice->maxChildren; ++i) { - DisplayDevice (rootDevice, rootDevice->child[i]); -@@ -380,11 +386,14 @@ - - gtk_widget_show (treeUSB); - -- gtk_ctree_expand_recursive (GTK_CTREE(treeUSB), NULL); -+ gtk_tree_view_expand_all (GTK_TREE_VIEW (treeUSB)); - - /* hook up our callback function to this tree if we haven't yet */ - if (!signal_connected) { -- gtk_signal_connect (GTK_OBJECT (treeUSB), "tree-select-row", GTK_SIGNAL_FUNC (SelectItem), NULL); -+ GtkTreeSelection *select; -+ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeUSB)); -+ g_signal_connect (G_OBJECT (select), "changed", -+ G_CALLBACK (SelectItem), NULL); - signal_connected = TRUE; - } - ---- a/usbtree.h 2008-06-25 23:03:52.000000000 +0200 -+++ b/usbtree.h 2012-06-14 21:06:05.000523489 +0200 -@@ -21,16 +21,24 @@ - #ifndef __USB_TREE_H - #define __USB_TREE_H - -+enum { -+ NAME_COLUMN, -+ DEVICE_ADDR_COLUMN, -+ COLOR_COLUMN, -+ N_COLUMNS -+}; -+ - extern gchar devicesFile[1000]; -+extern GtkTreeStore *treeStore; - extern GtkWidget *treeUSB; - extern GtkWidget *textDescriptionView; - extern GtkTextBuffer *textDescriptionBuffer; -+extern GtkWidget *windowMain; - - extern void LoadUSBTree (int refresh); - extern void initialize_stuff (void); - extern GtkWidget * create_windowMain (void); - extern void configure_dialog (void); --extern void about_dialog (void); - - extern void on_buttonClose_clicked (GtkButton *button, gpointer user_data); - extern gboolean on_window1_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data); -@@ -39,8 +47,4 @@ - extern void on_buttonAbout_clicked (GtkButton *button, gpointer user_data); - extern gint on_timer_timeout (gpointer user_data); - --extern void ShowMessage (gchar *title, gchar *message, gboolean centered); --extern gboolean MessageShown (void); -- -- - #endif /* __USB_TREE_H */ diff --git a/extra/usbview/usbview-1.1-missing-usbfs.patch b/extra/usbview/usbview-1.1-missing-usbfs.patch deleted file mode 100644 index 7da2f0ca0..000000000 --- a/extra/usbview/usbview-1.1-missing-usbfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/usbtree.c 2012-10-21 08:21:35.000000000 +0200 -+++ b/usbtree.c 2012-10-21 08:21:12.000000000 +0200 -@@ -397,7 +397,7 @@ - - void initialize_stuff (void) - { -- strcpy (devicesFile, "/proc/bus/usb/devices"); -+ strcpy (devicesFile, "/sys/kernel/debug/usb/devices"); - memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile)); - previousChange = 0; - diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install deleted file mode 100644 index b7f7e849b..000000000 --- a/extra/usbview/usbview.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - update-desktop-database -q - echo ">>> Debugfs must be mounted in order to use usbview." - echo ">>> As root execute:" - echo ">>> \"mount -t debugfs none /sys/kernel/debug\" or add" - echo ">>> \"none /sys/kernel/debug debugfs defaults 0 0\"" - echo ">>> to /etc/fstab" -} - -post_upgrade() { - post_install -} - -post_remove() { - update-desktop-database -q -} diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index efb043b62..afea07d9b 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 172061 2012-11-27 13:18:13Z tomegun $ +# $Id: PKGBUILD 177815 2013-02-09 14:53:43Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.9 +pkgver=0.9.3 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') @@ -9,27 +9,26 @@ url="http://freshmeat.net/projects/libv4l" provides=("libv4l=$pkgver") replaces=('libv4l') conflicts=('libv4l') +backup=(etc/rc_maps.cfg) license=('LGPL') makedepends=('qt') optdepends=('qt') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) +sha256sums=('502db0d865a392d87bff22c4f3bcfb3d0755937b1c18496edd941fd2d1784a3d' + '120388a92c3b720bd82e7617a908f3f7e1071d3b9075e9b537b7c60fc3575b08') +options=(!libtool) build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules - - make PREFIX="/usr" + ./configure --prefix=/usr --sysconfdir=/etc + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make install PREFIX="/usr" DESTDIR="${pkgdir}/" - rm -f "${pkgdir}/usr/bin/ivtv-ctl" - mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" - rm -rf "${pkgdir}/lib" + MAKEFLAGS="-j1" make install DESTDIR="${pkgdir}/" + rm "${pkgdir}/usr/bin/ivtv-ctl" } -md5sums=('cc4f34a1494275ed70f76f2a806dca6a' - 'ae8f4ed2ca0c1e006cb8c69b5a2982f7') diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch deleted file mode 100644 index fa400b953..000000000 --- a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure ---- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000 -+++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000 -@@ -6402,6 +6402,17 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.15) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5 -+$as_echo "2.15 family" >&6; } -+ -+$as_echo "#define GLIBC_2_15 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -@@ -6422,7 +6433,7 @@ - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; - esac diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch deleted file mode 100644 index 4d28ff11a..000000000 --- a/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure ---- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000 -+++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000 -@@ -6402,6 +6402,28 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.15) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5 -+$as_echo "2.15 family" >&6; } -+ -+$as_echo "#define GLIBC_2_15 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ -+ 2.16) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5 -+$as_echo "2.16 family" >&6; } -+ -+$as_echo "#define GLIBC_2_16 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -@@ -6422,7 +6433,7 @@ - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; - esac diff --git a/extra/valgrind/valgrind-3.7.0-supp.patch b/extra/valgrind/valgrind-3.7.0-supp.patch deleted file mode 100644 index 63a71de0e..000000000 --- a/extra/valgrind/valgrind-3.7.0-supp.patch +++ /dev/null @@ -1,253 +0,0 @@ ---- valgrind-orig/exp-sgcheck.supp 2011-10-27 07:24:45.000000000 +1000 -+++ valgrind-new/exp-sgcheck.supp 2012-07-12 21:49:58.290123661 +1000 -@@ -1,8 +1,8 @@ - { - ld-2.X possibly applying relocations - exp-sgcheck:SorG -- obj:/*lib*/ld-2.*so* -- obj:/*lib*/ld-2.*so* -+ obj:*/*lib*/ld-2.*so* -+ obj:*/*lib*/ld-2.*so* - } - - # I'm pretty sure this is a false positive caused by the sg_ stuff ---- valgrind-orig/glibc-2.34567-NPTL-helgrind.supp 2011-10-27 07:24:45.000000000 +1000 -+++ valgrind-new/glibc-2.34567-NPTL-helgrind.supp 2012-07-12 21:50:03.663270525 +1000 -@@ -27,7 +27,7 @@ - #{ - # helgrind-glibc2X-001 - # Helgrind:Race --# obj:/lib*/ld-2.*so* -+# obj:*/lib*/ld-2.*so* - #} - - # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001 -@@ -37,13 +37,13 @@ - { - helgrind-glibc2X-004 - Helgrind:Race -- obj:/lib*/libc-2.*so* -+ obj:*/lib*/libc-2.*so* - } - - { - helgrind-glibc2X-005 - Helgrind:Race -- obj:/lib*/libpthread-2.*so* -+ obj:*/lib*/libpthread-2.*so* - } - - # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005 -@@ -78,14 +78,14 @@ - { - helgrind-glibc2X-101 - Helgrind:Race -- obj:/lib*/libpthread-2.*so* -+ obj:*/lib*/libpthread-2.*so* - fun:pthread_* - } - { - helgrind-glibc2X-102 - Helgrind:Race - fun:mythread_wrapper -- obj:/lib*/libpthread-2.*so* -+ obj:*/lib*/libpthread-2.*so* - } - { - helgrind-glibc2X-103 -@@ -110,7 +110,7 @@ - { - helgrind-glibc2X-107 - Helgrind:Race -- obj:/lib*/libpthread-2.*so* -+ obj:*/lib*/libpthread-2.*so* - fun:sem_* - } - { -@@ -126,7 +126,7 @@ - { - helgrind-glibc2X-110 - Helgrind:Race -- obj:/lib*/libc-2.*so* -+ obj:*/lib*/libc-2.*so* - fun:pthread_* - } - { ---- valgrind-orig/glibc-2.X.supp.in 2011-10-27 07:24:45.000000000 +1000 -+++ valgrind-new/glibc-2.X.supp.in 2012-07-12 21:49:57.323490407 +1000 -@@ -39,74 +39,74 @@ - { - dl-hack3-cond-1 - Memcheck:Cond -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* - } - { - dl-hack3-cond-2 - Memcheck:Cond -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/libc-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/libc-@GLIBC_VERSION@*.so* - } - { - dl-hack3-cond-3 - Memcheck:Cond -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/libc-@GLIBC_VERSION@*.so* -- obj:/lib*/libc-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/libc-@GLIBC_VERSION@*.so* -+ obj:*/lib*/libc-@GLIBC_VERSION@*.so* - } - { - dl-hack3-cond-4 - Memcheck:Cond -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/libdl-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* - } - - { - dl-hack4-64bit-addr-1 - Memcheck:Addr8 -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* - } - { - dl-hack4-64bit-addr-2 - Memcheck:Addr8 -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/libc-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/libc-@GLIBC_VERSION@*.so* - } - { - dl-hack4-64bit-addr-3 - Memcheck:Addr8 -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so* -- obj:/lib*/libdl-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so* -+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* - } - - { - dl-hack5-32bit-addr-1 - Memcheck:Addr4 -- obj:/lib*/ld-@GLIBC_VERSION@*.so -- obj:/lib*/ld-@GLIBC_VERSION@*.so -- obj:/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so - } - { - dl-hack5-32bit-addr-3 - Memcheck:Addr4 -- obj:/lib*/ld-@GLIBC_VERSION@*.so -- obj:/lib*/ld-@GLIBC_VERSION@*.so -- obj:/lib*/libdl-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* - } - { - dl-hack5-32bit-addr-4 - Memcheck:Addr4 -- obj:/lib*/ld-@GLIBC_VERSION@*.so -- obj:/lib*/libdl-@GLIBC_VERSION@*.so* -- obj:/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so -+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* -+ obj:*/lib*/ld-@GLIBC_VERSION@*.so - } - - -@@ -149,9 +149,9 @@ - { - glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86) - Memcheck:Addr4 -- obj:/lib/ld-@GLIBC_VERSION@*.so -- obj:/lib/ld-@GLIBC_VERSION@*.so -- obj:/lib/ld-@GLIBC_VERSION@*.so -+ obj:*/lib/ld-@GLIBC_VERSION@*.so -+ obj:*/lib/ld-@GLIBC_VERSION@*.so -+ obj:*/lib/ld-@GLIBC_VERSION@*.so - } - - { -@@ -225,7 +225,7 @@ - MVL-401-linuxthreads-pthread_create - Memcheck:Param - write(buf) -- obj:/lib/libpthread-0.10.so -+ obj:*/lib/libpthread-0.10.so - fun:pthread_create - } - ---- valgrind-orig/glibc-2.X-drd.supp 2011-10-27 07:24:45.000000000 +1000 -+++ valgrind-new/glibc-2.X-drd.supp 2012-07-12 21:49:57.323490407 +1000 -@@ -6,7 +6,7 @@ - { - drd-ld - drd:ConflictingAccess -- obj:/lib*/ld-*.so -+ obj:*/lib*/ld-*.so - } - - # -@@ -22,13 +22,19 @@ - { - drd-libc-stdio - drd:ConflictingAccess -- obj:/lib*/libc-* -+ obj:*/lib*/libc-* - } - { - drd-libc-thread-cancellation-test - drd:ConflictingAccess - fun:write - } -+{ -+ drd-libc-random -+ drd:ConflictingAccess -+ fun:random_r -+ fun:random -+} - - # - # Suppression patterns for libstdc++, the implementation of the standard C++ -@@ -128,7 +134,7 @@ - { - drd-libpthread-? - drd:ConflictingAccess -- obj:/lib/libgcc_s.so.1 -+ obj:*/lib/libgcc_s.so.1 - } - { - drd-libpthread-nanosleep -@@ -171,6 +177,7 @@ - { - drd-libxcb-xcb_wait_for_reply - drd:CondErr -+ ... - fun:pthread_cond_destroy* - fun:xcb_wait_for_reply - } diff --git a/extra/vamp-plugin-sdk/gcc44.patch b/extra/vamp-plugin-sdk/gcc44.patch deleted file mode 100644 index f559a7da9..000000000 --- a/extra/vamp-plugin-sdk/gcc44.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur vamp-plugin-sdk-2.0.orig/examples/FixedTempoEstimator.cpp vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp ---- vamp-plugin-sdk-2.0.orig/examples/FixedTempoEstimator.cpp 2008-12-01 13:48:41.000000000 +0200 -+++ vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp 2009-06-06 00:57:58.000000000 +0300 -@@ -43,9 +43,9 @@ - - using Vamp::RealTime; - -+#include <cstdio> - #include <cmath> - -- - class FixedTempoEstimator::D - // this class just avoids us having to declare any data members in the header - { diff --git a/extra/vice/vice-2.3-no-fc-cache.patch b/extra/vice/vice-2.3-no-fc-cache.patch deleted file mode 100644 index 7efdc87c7..000000000 --- a/extra/vice/vice-2.3-no-fc-cache.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.in 2011-02-19 23:07:05.000000000 +0100 -+++ b/configure.in 2012-08-06 13:18:46.000000000 +0200 -@@ -1990,12 +1990,7 @@ - - fi - --AC_PATH_PROGS(FCCACHE, fc-cache, false) --if test x"$FCCACHE" = "xfalse"; then - AM_CONDITIONAL(HAVE_FC_CACHE, false) --else -- AM_CONDITIONAL(HAVE_FC_CACHE, true) --fi - - if test x"$is_amigaos4" = "xyes"; then - if test x"$enable_sdlui" != "xyes"; then diff --git a/extra/vice/vice-2.3-notexi-notxt.patch b/extra/vice/vice-2.3-notexi-notxt.patch deleted file mode 100644 index f26ac0beb..000000000 --- a/extra/vice/vice-2.3-notexi-notxt.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/doc/Makefile.am 2011-02-05 17:52:48.000000000 +0100 -+++ b/doc/Makefile.am 2012-08-06 14:33:37.000000000 +0200 -@@ -48,14 +48,7 @@ - $(srcdir)/vice.txt: vice.texi - $(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi - --if BUILD_PDF --$(srcdir)/vice.pdf: vice.texi -- $(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi -- --PDF_DEPS=$(srcdir)/vice.pdf --else - PDF_DEPS= --endif - - if BUILD_AMIGAGUIDE - $(srcdir)/vice.guide: vice.texi -@@ -99,4 +92,4 @@ - IPF_DEPS= - endif - --INFO_DEPS = $(srcdir)/vice.txt $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS) -+INFO_DEPS = $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS) diff --git a/extra/vice/vice-2.3-x11video.patch b/extra/vice/vice-2.3-x11video.patch deleted file mode 100644 index d698638c6..000000000 --- a/extra/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/extra/vice/vice-2.3-zlib-1.2.7.patch b/extra/vice/vice-2.3-zlib-1.2.7.patch deleted file mode 100644 index 079a8d6bd..000000000 --- a/extra/vice/vice-2.3-zlib-1.2.7.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/src/zfile.c 2010-07-16 20:20:01.000000000 +0200 -+++ b/src/zfile.c 2012-08-06 15:29:10.000000000 +0200 -@@ -197,10 +197,10 @@ - do { - char buf[256]; - -- len = gzread(fdsrc, (void *)buf, 256); -+ len = gzread((gzFile)fdsrc, (void *)buf, 256); - if (len > 0) { - if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) { -- gzclose(fdsrc); -+ gzclose((gzFile)fdsrc); - fclose(fddest); - ioutil_remove(tmp_name); - lib_free(tmp_name); -@@ -209,7 +209,7 @@ - } - } while (len > 0); - -- gzclose(fdsrc); -+ gzclose((gzFile)fdsrc); - fclose(fddest); - - return tmp_name; -@@ -792,10 +792,10 @@ - char buf[256]; - len = fread((void *)buf, 256, 1, fdsrc); - if (len > 0) -- gzwrite(fddest, (void *)buf, (unsigned int)len); -+ gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len); - } while (len > 0); - -- gzclose(fddest); -+ gzclose((gzFile)fddest); - fclose(fdsrc); - - archdep_file_set_gzip(dest); diff --git a/extra/w3m/https-segfault.patch b/extra/w3m/https-segfault.patch deleted file mode 100644 index 31286a70d..000000000 --- a/extra/w3m/https-segfault.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 - ---- old/url.c 2011-01-04 14:52:24.000000000 +0530 -+++ new/url.c 2011-09-02 18:25:43.305652690 +0530 -@@ -82,11 +82,11 @@ - {"ftp", SCM_FTP}, - {"local", SCM_LOCAL}, - {"file", SCM_LOCAL}, -- /* {"exec", SCM_EXEC}, */ -+ {"exec", SCM_EXEC}, - {"nntp", SCM_NNTP}, -- /* {"nntp", SCM_NNTP_GROUP}, */ -+ {"nntp", SCM_NNTP_GROUP}, - {"news", SCM_NEWS}, -- /* {"news", SCM_NEWS_GROUP}, */ -+ {"news", SCM_NEWS_GROUP}, - {"data", SCM_DATA}, - #ifndef USE_W3MMAILER - {"mailto", SCM_MAILTO}, diff --git a/extra/wireshark/enable_version.patch b/extra/wireshark/enable_version.patch deleted file mode 100644 index 18ad14b1f..000000000 --- a/extra/wireshark/enable_version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.in.init 2012-05-24 20:08:15.040038922 +0000 -+++ configure.in 2012-05-24 20:08:27.869944008 +0000 -@@ -185,7 +185,7 @@ - [use gnutls library @<:@default=yes@:>@]), - with_gnutls="$withval", with_gnutls="yes") - if test "x$with_gnutls" = "xyes"; then -- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], -+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], - [ - echo "gnuTLS found, enabling ssl decryption" - AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use gnutls library]) - diff --git a/extra/xchat/PKGBUILD b/extra/xchat/PKGBUILD deleted file mode 100644 index 6fee3c70f..000000000 --- a/extra/xchat/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 173853 2012-12-25 00:35:03Z foutrelis $ -# Maintainer: Eric BĂ©langer <eric@archlinux.org> - -pkgname=xchat -pkgver=2.8.8 -pkgrel=11 -pkgdesc="A GTK+ based IRC client" -arch=('i686' 'x86_64') -url="http://www.xchat.org/" -license=('GPL') -depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme') -makedepends=('tcl' 'perl' 'python2' 'librsvg') -optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' - 'python2: for python plugin') -options=('!libtool') -install=xchat.install -source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - http://xchat.org/files/icons/xchat-svg.tar.bz2 - xchat-2.8.8-libnotify07.patch - xchat-2.8.8-link-against-libnotify.patch - xchat-2.8.8-glib-2.31.patch) -sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' - '0d366346cc11e0efb57fc2648fe423c94a3469bd' - 'a053fba4e1911d1ee6a8248fe19e344797920fe3' - '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1' - 'aecaf6176a7cfd62555207b02f2793b360aa39da') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" - patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" - patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" - autoconf - autoheader - - LIBS+="-lgmodule-2.0" ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \ - --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - for i in 24 32 48 64 128 256 ; do - install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps" - rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg - done - install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg" - install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg" -} diff --git a/extra/xchat/xchat-2.8.8-glib-2.31.patch b/extra/xchat/xchat-2.8.8-glib-2.31.patch deleted file mode 100644 index 63f562ff8..000000000 --- a/extra/xchat/xchat-2.8.8-glib-2.31.patch +++ /dev/null @@ -1,62 +0,0 @@ -Author: Dominique Leuenberger <dimstar@opensuse.org> - -http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239 - -glib got stricter in checking includes. Only glib.h (and a few exceptions) -are to be included directly. - -Index: xchat-2.8.8/src/common/servlist.c -=================================================================== ---- xchat-2.8.8.orig/src/common/servlist.c -+++ xchat-2.8.8/src/common/servlist.c -@@ -24,7 +24,7 @@ - #include <unistd.h> - - #include "xchat.h" --#include <glib/ghash.h> -+#include <glib.h> - - #include "cfgfiles.h" - #include "fe.h" -Index: xchat-2.8.8/src/common/text.c -=================================================================== ---- xchat-2.8.8.orig/src/common/text.c -+++ xchat-2.8.8/src/common/text.c -@@ -28,7 +28,7 @@ - #include <sys/mman.h> - - #include "xchat.h" --#include <glib/ghash.h> -+#include <glib.h> - #include "cfgfiles.h" - #include "chanopt.h" - #include "plugin.h" -Index: xchat-2.8.8/src/common/util.c -=================================================================== ---- xchat-2.8.8.orig/src/common/util.c -+++ xchat-2.8.8/src/common/util.c -@@ -39,7 +39,7 @@ - #include <errno.h> - #include "xchat.h" - #include "xchatc.h" --#include <glib/gmarkup.h> -+#include <glib.h> - #include <ctype.h> - #include "util.h" - #include "../../config.h" -Index: xchat-2.8.8/src/common/xchat.h -=================================================================== ---- xchat-2.8.8.orig/src/common/xchat.h -+++ xchat-2.8.8/src/common/xchat.h -@@ -1,10 +1,6 @@ - #include "../../config.h" - --#include <glib/gslist.h> --#include <glib/glist.h> --#include <glib/gutils.h> --#include <glib/giochannel.h> --#include <glib/gstrfuncs.h> -+#include <glib.h> - #include <time.h> /* need time_t */ - - #ifndef XCHAT_H diff --git a/extra/xchat/xchat-2.8.8-libnotify07.patch b/extra/xchat/xchat-2.8.8-libnotify07.patch deleted file mode 100644 index 2a6dce9a2..000000000 --- a/extra/xchat/xchat-2.8.8-libnotify07.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c ---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 2010-11-15 17:32:15.708325783 -0500 -+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2010-11-15 18:05:17.322141789 -0500 -@@ -125,8 +125,9 @@ static void *nn_mod = NULL; - /* prototypes */ - static gboolean (*nn_init) (char *); - static void (*nn_uninit) (void); --static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon); --static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach); -+/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an -+ * extra NULL argument will be fine */ -+static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy); - static gboolean (*nn_show) (void *noti, GError **error); - static void (*nn_set_timeout) (void *noti, gint timeout); - -@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title, - goto bad; - if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit)) - goto bad; -- if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon)) -- goto bad; - if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) - goto bad; - if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) diff --git a/extra/xchat/xchat-2.8.8-link-against-libnotify.patch b/extra/xchat/xchat-2.8.8-link-against-libnotify.patch deleted file mode 100644 index 31e6c0854..000000000 --- a/extra/xchat/xchat-2.8.8-link-against-libnotify.patch +++ /dev/null @@ -1,343 +0,0 @@ -From: Christopher Aillon <caillon@redhat.com> -Date: Thu, 7 Apr 2011 19:34:14 -0700 -Subject: [PATCH] Link directly against libnotify - -Dynamically loading the library isn't ideal since the soname -can change silently on us. Additionally, notify-send is -shipped as part of libnotify, so we aren't actually bringing -in a new dependency. Since we'd need to patch the source and -rebuild for new sonames anyway, there's little benefit to -dynamically loading libnotify. - -Plus, this has the benefit of cleaning up the code, as well as -ensuring we'll catch any future soname changes sooner. - -https://bugzilla.redhat.com/show_bug.cgi?id=693362 -https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239 ---- - configure.in | 23 +++++++ - src/fe-gtk/plugin-tray.c | 144 ++++++++++------------------------------------- - 2 files changed, 55 insertions(+), 112 deletions(-) - -diff -p -U8 xchat-2.8.8/configure.in.libnotifyso4 xchat-2.8.8/configure.in ---- xchat-2.8.8/configure.in.libnotifyso4 2010-05-29 23:01:16.000000000 -0700 -+++ xchat-2.8.8/configure.in 2011-04-07 19:27:00.448137113 -0700 -@@ -34,16 +34,17 @@ AH_VERBATIM([PREFIX],[#undef PREFIX]) - AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR]) - AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR]) - AH_VERBATIM([SOCKS],[#undef SOCKS]) - AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY]) - dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME]) - AH_VERBATIM([USE_SHM],[#undef USE_SHM]) - AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL]) - AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY]) -+AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY]) - AH_VERBATIM([USE_IPV6],[#undef USE_IPV6]) - AH_VERBATIM([USE_MMX],[#undef USE_MMX]) - AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL]) - AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN]) - AH_VERBATIM([USE_XFT],[#undef USE_XFT]) - AH_VERBATIM([USE_XLIB],[#undef USE_XLIB]) - AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION]) - AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD]) -@@ -126,16 +127,20 @@ AC_ARG_ENABLE(tcl, - AC_ARG_ENABLE(plugin, - [ --disable-plugin disable plugin support], - plugin=$enableval, plugin=yes) - - AC_ARG_ENABLE(dbus, - [ --disable-dbus disable DBUS support], - dbus=$enableval, dbus=yes) - -+AC_ARG_ENABLE(libnotify, -+[ --disable-libnotify disable libnotify support], -+ libnotify=$enableval, libnotify=yes) -+ - AC_ARG_ENABLE(mmx, - [ --disable-mmx disable MMX assembly routines], - mmx=$enableval, mmx=yes) - - AC_ARG_ENABLE(shm, - [ --enable-shm enable use of XShm for fast tinting (default: no)], - shm=$enableval, shm=no) - -@@ -482,16 +487,32 @@ if test "x$dbus" = "xyes" ; then - - DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" - AC_SUBST(DBUS_SERVICES_DIR) - AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) - fi - fi - - dnl ********************************************************************* -+dnl ** LIBNOTIFY ******************************************************** -+dnl ********************************************************************* -+ -+if test "x$libnotify" = "xyes" ; then -+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [ -+ AC_MSG_RESULT(no) -+ libnotify=no -+ ]) -+ if test "$libnotify" != "no" ; then -+ GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS" -+ GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS" -+ AC_DEFINE(USE_LIBNOTIFY) -+ fi -+fi -+ -+dnl ********************************************************************* - dnl ** SPELL ************************************************************ - dnl ********************************************************************* - - if test "$spell" = "gtkspell" ; then - PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [ - AC_MSG_RESULT(no) - spell=no - ]) -@@ -519,16 +540,17 @@ if test "$spell" = "static" ; then - fi - - dnl ********************************************************************* - dnl ** CONDITIONALS ***************************************************** - dnl ********************************************************************* - - AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes") - AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic") -+AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes") - AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes") - AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes") - AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") - AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") - AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes") - AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes") - AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes") - AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno") -@@ -807,16 +829,17 @@ echo mmx tinting ......... : $mmx\ spell - echo XShm tinting ........ : $shm\ plugin interface ...... : $plugin - if test "$xft" = no; then - echo text backend ........ : pango\ nls/gettext ........... : $USE_NLS - else - echo text backend ........ : xft\ nls/gettext ........... : $USE_NLS - fi - echo openssl support ..... : $openssl\ ipv6 support .......... : $ipv6 - echo dbus support ........ : $dbus\ msproxy ntlm \(ISA\) .... : $have_ntlm -+echo libnotify support ... : $libnotify - echo - echo The binary will be installed in $prefix/bin - echo - - if test "$gtkfe" = no; then - echo Warning: The GTK \(GUI\) frontend will not be built. - echo - fi -diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe-gtk/plugin-tray.c ---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 2011-04-07 17:57:27.524307905 -0700 -+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2011-04-07 19:18:33.429475719 -0700 -@@ -10,17 +10,27 @@ - #include "../common/fe.h" - #include "../common/util.h" - #include "fe-gtk.h" - #include "pixmaps.h" - #include "maingui.h" - #include "menu.h" - #include <gtk/gtk.h> - --#define LIBNOTIFY -+#ifdef USE_LIBNOTIFY -+#include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+#if NOTIFY_CHECK_VERSION(0,7,0) -+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c) -+#else -+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c,d) -+#endif -+#endif - - typedef enum /* current icon status */ - { - TS_NONE, - TS_MESSAGE, - TS_HIGHLIGHT, - TS_FILEOFFER, - TS_CUSTOM /* plugin */ -@@ -112,90 +122,16 @@ tray_count_networks (void) - - void - fe_tray_set_tooltip (const char *text) - { - if (sticon) - gtk_status_icon_set_tooltip (sticon, text); - } - --#ifdef LIBNOTIFY -- --/* dynamic access to libnotify.so */ -- --static void *nn_mod = NULL; --/* prototypes */ --static gboolean (*nn_init) (char *); --static void (*nn_uninit) (void); --/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an -- * extra NULL argument will be fine */ --static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy); --static gboolean (*nn_show) (void *noti, GError **error); --static void (*nn_set_timeout) (void *noti, gint timeout); -- --static void --libnotify_cleanup (void) --{ -- if (nn_mod) -- { -- nn_uninit (); -- g_module_close (nn_mod); -- nn_mod = NULL; -- } --} -- --static gboolean --libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon) --{ -- void *noti; -- -- if (!nn_mod) -- { -- nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY); -- if (!nn_mod) -- { -- nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY); -- if (!nn_mod) -- return FALSE; -- } -- -- if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init)) -- goto bad; -- if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit)) -- goto bad; -- if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) -- goto bad; -- if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) -- goto bad; -- if (!g_module_symbol (nn_mod, "notify_notification_set_timeout", (gpointer)&nn_set_timeout)) -- goto bad; -- if (!nn_init (PACKAGE_NAME)) -- goto bad; -- } -- -- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); -- title = strip_color (title, -1, STRIP_ALL); -- noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL); -- g_free ((char *)title); -- g_free ((char *)text); -- -- nn_set_timeout (noti, prefs.input_balloon_time*1000); -- nn_show (noti, NULL); -- g_object_unref (G_OBJECT (noti)); -- -- return TRUE; -- --bad: -- g_module_close (nn_mod); -- nn_mod = NULL; -- return FALSE; --} -- --#endif -- - void - fe_tray_set_balloon (const char *title, const char *text) - { - #ifndef WIN32 - const char *argv[8]; - const char *path; - char time[16]; - WinStatus ws; -@@ -208,52 +144,36 @@ fe_tray_set_balloon (const char *title, - /* bit 1 of flags means "no balloons unless hidden/iconified" */ - if (ws != WS_HIDDEN && (prefs.gui_tray_flags & 2)) - return; - - /* FIXME: this should close the current balloon */ - if (!text) - return; - --#ifdef LIBNOTIFY -- /* try it via libnotify.so */ -- if (libnotify_notify_new (title, text, sticon)) -- return; /* success */ --#endif -+#ifdef USE_LIBNOTIFY -+ NotifyNotification *notification; -+ char *notify_text, *notify_title; - -- /* try it the crude way */ -- path = g_find_program_in_path ("notify-send"); -- if (path) -- { -- sprintf(time, "%d000",prefs.input_balloon_time); -- argv[0] = path; -- argv[1] = "-i"; -- argv[2] = "gtk-dialog-info"; -- if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0) -- argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png"; -- argv[3] = "-t"; -- argv[4] = time; -- argv[5] = title; -- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); -- argv[6] = text; -- argv[7] = NULL; -- xchat_execv (argv); -- g_free ((char *)path); -- g_free ((char *)text); -- } -- else -- { -- /* show this error only once */ -- static unsigned char said_it = FALSE; -- if (!said_it) -- { -- said_it = TRUE; -- fe_message (_("Cannot find 'notify-send' to open balloon alerts.\nPlease install libnotify."), FE_MSG_ERROR); -- } -- } -+ if (!notify_is_initted()) -+ notify_init(PACKAGE_NAME); -+ -+ notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); -+ notify_title = strip_color (title, -1, STRIP_ALL); -+ -+ notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL); -+ -+ g_free ((char *)notify_title); -+ g_free ((char *)notify_text); -+ -+ notify_notification_set_timeout (notification, prefs.input_balloon_time*1000); -+ notify_notification_show (notification, NULL); -+ -+ g_object_unref (notification); -+#endif - #endif - } - - static void - tray_set_balloonf (const char *text, const char *format, ...) - { - va_list args; - char *buf; -@@ -840,13 +760,13 @@ tray_plugin_init (xchat_plugin *plugin_h - return 1; /* return 1 for success */ - } - - int - tray_plugin_deinit (xchat_plugin *plugin_handle) - { - #ifdef WIN32 - tray_cleanup (); --#elif defined(LIBNOTIFY) -- libnotify_cleanup (); -+#elif defined(USE_LIBNOTIFY) -+ notify_uninit (); - #endif - return 1; - } diff --git a/extra/xchat/xchat.install b/extra/xchat/xchat.install deleted file mode 100644 index eab82d16f..000000000 --- a/extra/xchat/xchat.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/extra/xdelta/PKGBUILD b/extra/xdelta/PKGBUILD deleted file mode 100644 index 6fecbfc18..000000000 --- a/extra/xdelta/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 145275 2011-12-21 01:19:51Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=xdelta -pkgver=1.1.4 -pkgrel=4.1 -pkgdesc="binary file delta generator" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/xdelta/" -license=('GPL') -depends=('glib' 'zlib') -options=('!libtool') -source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz - xdelta-1.1.4-aclocal.patch) -md5sums=('1b896c01ebf0e353b7e3c3071b05f496' - '1d8ab5909bdf977a2783c164b66906fd') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/xdelta-1.1.4-aclocal.patch - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/extra/xdelta/xdelta-1.1.4-aclocal.patch b/extra/xdelta/xdelta-1.1.4-aclocal.patch deleted file mode 100644 index ad8c99de5..000000000 --- a/extra/xdelta/xdelta-1.1.4-aclocal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xdelta-1.1.3/xdelta.m4.aclocal 2004-10-20 00:20:47.875648144 +0200 -+++ xdelta-1.1.3/xdelta.m4 2004-10-20 00:21:47.205628616 +0200 -@@ -4,7 +4,7 @@ - dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or - dnl --AC_DEFUN(AM_PATH_XDELTA, -+AC_DEFUN([AM_PATH_XDELTA], - [dnl - dnl Get the cflags and libraries from the xdelta-config script - dnl diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD deleted file mode 100644 index e9c34c169..000000000 --- a/extra/xdelta3/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 176015 2013-01-26 01:45:29Z eric $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> -# Contributor: Henning Garus <henning.garus@gmail.com> - -pkgname=xdelta3 -pkgver=3.0.6 -pkgrel=1 -pkgdesc="A diff utility which works with binary files" -arch=('i686' 'x86_64' 'mips64el') -url="http://xdelta.org/" -license=('GPL') -depends=('xz') -source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('652048ab4a7e5f927bce045228a17b31') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - ./xdelta3 test -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/xdelta3/xdelta3-makefile.patch b/extra/xdelta3/xdelta3-makefile.patch deleted file mode 100644 index d5fa12e70..000000000 --- a/extra/xdelta3/xdelta3-makefile.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile ---- xdelta3.0.0-orig/Makefile 2011-01-09 18:29:06.000000000 +1000 -+++ xdelta3.0.0/Makefile 2011-12-21 11:53:13.530028738 +1000 -@@ -54,7 +54,7 @@ - WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820" - - # -arch x86_64 --CFLAGS= -Wall -Wshadow -fno-builtin -+CFLAGS+= -Wall -Wshadow -fno-builtin - WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter - - # $Format: "REL=$Xdelta3Version$" $ -@@ -126,7 +126,7 @@ - $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi - - xdelta3: $(SOURCES) -- $(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \ -+ $(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \ - -DGENERIC_ENCODE_TABLES=0 \ - -DREGRESSION_TEST=1 \ - -DSECONDARY_DJW=1 \ -@@ -137,7 +137,7 @@ - -DXD3_USE_LARGEFILE64=1 - - xdelta3-debug: $(SOURCES) -- $(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \ -+ $(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \ - -DGENERIC_ENCODE_TABLES=1 \ - -DREGRESSION_TEST=1 \ - -DSECONDARY_DJW=1 \ -@@ -202,6 +202,9 @@ - xdelta3.o: $(SOURCES) - $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o - -+xdelta3_PIC.o: $(SOURCES) -+ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o -+ - xdelta3_wrap.o: xdelta3_wrap.c - $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \ - -DHAVE_CONFIG_H \ -@@ -221,8 +224,8 @@ - cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages - - ifeq ("$(DARWIN)", "") --xdelta3module.so: xdelta3_wrap.o xdelta3.o -- ld -shared xdelta3.o xdelta3_wrap.o \ -+xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o -+ cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \ - -o xdelta3module.so \ - /usr/lib/libpython$(PYVER).so \ - -lc diff --git a/extra/xdg-user-dirs-gtk/lxde.patch b/extra/xdg-user-dirs-gtk/lxde.patch deleted file mode 100644 index c5520475c..000000000 --- a/extra/xdg-user-dirs-gtk/lxde.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in ---- xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde 2010-02-13 23:52:49.130115833 -0500 -+++ xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in 2010-02-13 23:54:57.574114211 -0500 -@@ -1,10 +1,9 @@ - [Desktop Entry] --Encoding=UTF-8 - Exec=xdg-user-dirs-gtk-update - _Name=User folders update - _Comment=Update common folders names to match current locale - Terminal=false --OnlyShowIn=GNOME; -+OnlyShowIn=GNOME;LXDE; - Type=Application - StartupNotify=false - X-KDE-autostart-after=panel diff --git a/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff b/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff deleted file mode 100644 index 93c54d300..000000000 --- a/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff +++ /dev/null @@ -1,27 +0,0 @@ -From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 15 Mar 2012 05:46:32 +0000 -Subject: Fix inverted horizontal scroll (#46205) - -REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL. - -X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205> - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Chase Douglas <chase.douglas@canonical.com> ---- -diff --git a/src/evdev.c b/src/evdev.c -index d540b87..8cf630c 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - else if (axis == REL_DIAL) - SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE); - else if (axis == REL_HWHEEL) -- SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE); -+ SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE); - #endif - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-input-joystick/git-fixes.patch b/extra/xf86-input-joystick/git-fixes.patch deleted file mode 100644 index b3afa06cc..000000000 --- a/extra/xf86-input-joystick/git-fixes.patch +++ /dev/null @@ -1,399 +0,0 @@ -From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 -From: Terry Lambert <tlambert@chromium.org> -Date: Sat, 16 Jul 2011 00:23:22 +0000 -Subject: Return proper default for unknown values in pInfo->device_control. - -Signed-off-by: Terry Lambert <tlambert@chromium.org> -Reviewed-by: Stephane Marchesin <marcheu@chromium.org> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/jstk.c b/src/jstk.c -index ec6b79a..6db0e7c 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - - default: - ErrorF("unsupported mode=%d\n", what); -- return !Success; -- break; -+ return BadValue; - } /* switch (what) */ - return Success; - } -diff --git a/src/jstk_key.c b/src/jstk_key.c -index 3c471ce..d699dcd 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, - DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); - dev->public.on = FALSE; - break; -+ default: -+ return BadValue; - } - - return Success; --- -cgit v0.9.0.2-2-gbebe -From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 -From: Devin J. Pohly <djpohly+xorg@gmail.com> -Date: Sat, 03 Sep 2011 23:00:07 +0000 -Subject: unify capitalization of joystick properties - -the axis keys high/low properties were inconsistently capitalized, -leading to potential confusion as to why one works but not the other. - -Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/include/joystick-properties.h b/include/joystick-properties.h -index 49ef800..36f4082 100644 ---- a/include/joystick-properties.h -+++ b/include/joystick-properties.h -@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { - - /** Scancodes for axis in high position */ - /* 8 bit, 4 per axis */ --#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" -+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" - - /** Set the mapping of each button to - none, x, y, zx, zy, button, key, speed_multiply, --- -cgit v0.9.0.2-2-gbebe -From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sat, 15 Oct 2011 22:47:52 +0000 -Subject: label buttons and axes - -Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. -Mapping can be changed while running so the labels will be constant. - -Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator -data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" -and "Rel Y", representing the aggregated post-calculation data from all axes. - -Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de> ---- -diff --git a/man/joystick.man b/man/joystick.man -index da92ceb..b401de5 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -140,7 +140,11 @@ Neither - .B mode - nor - .B axis --needs to be set to generate extra valuator events. -+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with -+.I 1 -+, i.e. -+.I \*qAxis 1\*q -+for the first axis (being the 3rd valuator). - Default: not set. - .TP 7 - .BI "\*qaxis="[<factor>]<axis> \*q -@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys - The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. - The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. - -+.SH "XI2 Events" -+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: -+ -+.nf -+.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q -+\ \ ... -+.BI " Option \*qMapButton1\*q \*q" "button=1" \*q -+.BI " Option \*qMapButton2\*q \*q" "button=2" \*q -+.BI " Option \*qMapButton3\*q \*q" "button=3" \*q -+.BI " Option \*qMapButton4\*q \*q" "button=4" \*q -+.BI " Option \*qMapButton5\*q \*q" "button=5" \*q -+\ \ ... -+.fi -+ -+You might also want to set the device "floating" to stop it from reporting core events: -+.nf -+.BI " Option \*qFloating\*q \*q" "true" \*q -+.fi -+ - .SH "NOTES" - Configuration through - .I InputClass -diff --git a/src/jstk.c b/src/jstk.c -index 6db0e7c..772683f 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -1,5 +1,5 @@ - /* -- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> -+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> - * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> - * - * Permission to use, copy, modify, distribute, and sell this software and its -@@ -21,7 +21,6 @@ - * PERFORMANCE OF THIS SOFTWARE. - */ - -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - switch (what) { - case DEVICE_INIT: { - int m; -+ char str[32]; - CARD8 buttonmap[BUTTONMAP_SIZE+1]; - DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); - /* Probe device and return if error */ -@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - } - - for (m=0; m<=BUTTONMAP_SIZE; m++) { -+ sprintf(str, "Button %d", m); -+ - buttonmap[m] = m; -- } -+ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); -+ } -+ -+ - -- -- - if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, - btn_labels, - buttonmap) == FALSE) { -@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - if (priv->axis[i].valuator != -1) - { - DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); -+ sprintf(str, "Axis %d", i + 1); - priv->axis[i].valuator = m++; -+ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); - } - - if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, -@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = - /* a tool */ - }; - -- - /* - *************************************************************************** - * -@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { - jstkDriverPlug, - jstkDriverUnplug - }; -+ -+/* vim: set filetype=c.doxygen ts=4 et: */ -+ --- -cgit v0.9.0.2-2-gbebe -From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:27:22 +0000 -Subject: Fix option type for option duplication - -xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption -list. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index d699dcd..e842941 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *options; - InputOption *iopts = NULL, *tmp; - DeviceIntPtr dev; -+ XF86OptionPtr opts; - - /* duplicate option list, append to name */ -- options = xf86OptionListDuplicate(pInfo->options); -+ opts = xf86OptionListDuplicate(pInfo->options); - strcpy(name, pInfo->name); - strcat(name, " (keys)"); -- options = xf86ReplaceStrOption(options, "Name", name); -- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); -+ opts = xf86ReplaceStrOption(opts, "Name", name); -+ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); - -- while(options) -+ while(opts) - { - tmp = calloc(1, sizeof(InputOption)); - -- tmp->key = xf86OptionName(options); -- tmp->value = xf86OptionValue(options); -+ tmp->key = xf86OptionName(opts); -+ tmp->value = xf86OptionValue(opts); - tmp->next = iopts; - iopts = tmp; -- options = xf86NextOption(options); -+ opts = xf86NextOption(opts); - } - - /* duplicate attribute list */ --- -cgit v0.9.0.2-2-gbebe -From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:33:08 +0000 -Subject: Deal with opaque input option types. - -ABI 14 made the InputOption type opaque, move the existing code to ifdefs -and use the new function calls otherwise. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Reviewed-by: Chase Douglas <chase.douglas@canonical.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index e842941..a71275a 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return Success; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 -+static InputOption* -+input_option_new(InputOption* list, char *key, char *value) -+{ -+ InputOption *tmp; -+ -+ tmp = calloc(1, sizeof(*tmp)); -+ tmp->key = key; -+ tmp->value = value; -+ tmp->next = list; -+ -+ return tmp; -+} -+ -+static void -+input_option_free_list(InputOption **list) -+{ -+ InputOption *iopts = *list; -+ -+ while(iopts) -+ { -+ InputOption *tmp = iopts->next; -+ free(iopts->key); -+ free(iopts->value); -+ free(iopts); -+ iopts = tmp; -+ } -+ -+ *list = NULL; -+} -+ -+#endif -+ - InputInfoPtr - jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - { - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *iopts = NULL, *tmp; -+ InputOption *iopts = NULL; - DeviceIntPtr dev; - XF86OptionPtr opts; - -@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - while(opts) - { -- tmp = calloc(1, sizeof(InputOption)); -- -- tmp->key = xf86OptionName(opts); -- tmp->value = xf86OptionValue(opts); -- tmp->next = iopts; -- iopts = tmp; -+ iopts = input_option_new(iopts, -+ xf86OptionName(opts), -+ xf86OptionValue(opts)); - opts = xf86NextOption(opts); - } - -@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - rc = NewInputDeviceRequest(iopts, attrs, &dev); - -- while(iopts) -- { -- tmp = iopts->next; -- free(iopts->key); -- free(iopts->value); -- free(iopts); -- iopts = tmp; -- } -+ input_option_free_list(&iopts); - - FreeInputAttributes(attrs); - --- -cgit v0.9.0.2-2-gbebe -From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 17:04:25 +0000 -Subject: man: valuators are not added automatically - ---- -diff --git a/man/joystick.man b/man/joystick.man -index b401de5..9f38ceb 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -129,9 +129,6 @@ can be one of: - - .B none, relative, accelerated, absolute - --Every axis which's mode is not --.B none --will be reported as an additional valuator. - .TP 7 - .B \*qvaluator\*q - Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always --- -cgit v0.9.0.2-2-gbebe -From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 19:36:07 +0000 -Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device - -udev does copy the Driver line to the list of options, but when manually -specifying the driver in xorg.conf, the option "Driver" is unset. Because we -do hotplug a sub-device from within the core device, we need the "Driver" -option to be present in the list. - -This should fix archlinux bug #23577: - https://bugs.archlinux.org/task/23577 - -Thanks to Malek for coming up with a fix. - -Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index a71275a..241b15d 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - strcat(name, " (keys)"); - opts = xf86ReplaceStrOption(opts, "Name", name); - opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); -+ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); - - while(opts) - { --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-input-synaptics/10-synaptics.conf b/extra/xf86-input-synaptics/10-synaptics.conf deleted file mode 100644 index 81a90fb81..000000000 --- a/extra/xf86-input-synaptics/10-synaptics.conf +++ /dev/null @@ -1,9 +0,0 @@ -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Option "TapButton1" "1" - Option "TapButton2" "2" - Option "TapButton3" "3" -EndSection diff --git a/extra/xf86-video-apm/apm-1.2.3-git.patch b/extra/xf86-video-apm/apm-1.2.3-git.patch deleted file mode 100644 index 1c6afb29d..000000000 --- a/extra/xf86-video-apm/apm-1.2.3-git.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/apm.h b/src/apm.h -index bc66714..86c7663 100644 ---- a/src/apm.h -+++ b/src/apm.h -@@ -109,7 +109,7 @@ typedef struct { - char *MemMap; - pointer BltMap; - Bool UnlockCalled; -- IOADDRESS iobase, xport, xbase; -+ unsigned long iobase, xport, xbase; - unsigned char savedSR10; - CARD8 MiscOut; - CARD8 c9, d9, db, Rush; -diff --git a/src/apm_driver.c b/src/apm_driver.c -index f172bab..f77bb2b 100644 ---- a/src/apm_driver.c -+++ b/src/apm_driver.c -@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) - - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); -- pApm->iobase = hwp->PIOOffset; -- pApm->xport = hwp->PIOOffset + 0x3C4; -+#if ABI_VIDEODRV_VERSION < 12 -+#define PIOOFFSET hwp->PIOOffset -+#else -+/* FIXME reintroduce domain support */ -+#define PIOOFFSET 0 -+#endif -+ pApm->iobase = PIOOFFSET; -+ pApm->xport = PIOOFFSET + 0x3C4; - - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; diff --git a/extra/xf86-video-ark/git-fixes.patch b/extra/xf86-video-ark/git-fixes.patch deleted file mode 100644 index 2de0f64be..000000000 --- a/extra/xf86-video-ark/git-fixes.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001 -From: Ondrej Zary <linux@rainbow-software.org> -Date: Sat, 04 Dec 2010 00:23:51 +0000 -Subject: Don't assume that FB address registers are initialized properly - -https://bugs.freedesktop.org/show_bug.cgi?id=28249 - -ark driver does not work with Hercules Stingray 64 card (ark2000pv). -X fails to start with: - -[...] -(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is -0x0000 -(II) ark(0): Creating default Display subsection in Screen section - "Default Screen Section" for depth/fbbpp 24/32 -(==) ark(0): Depth 24, (--) framebuffer bpp 32 -(==) ark(0): RGB weight 888 -(==) ark(0): Default visual is TrueColor -(**) ark(0): Chipset: "ark2000pv" -(--) ark(0): Framebuffer @ 0xe5e50000 -(==) ark(0): Using gamma correction (1.0, 1.0, 1.0) -(--) ark(0): Detected 2048 bytes video ram -[...] -Fatal server error: -AddScreen/ScreenInit failed for driver 0 - -Comparing with lspci, the framebuffer address is wrong: -00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller]) - Flags: medium devsel - Memory at e5000000 (32-bit, prefetchable) [size=4M] - [virtual] Expansion ROM at 1c000000 [disabled] [size=64K] - -Reviewed-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/ark.h b/src/ark.h -index de301dc..077f93b 100644 ---- a/src/ark.h -+++ b/src/ark.h -@@ -34,7 +34,6 @@ typedef struct _ARKRec { - #endif - EntityInfoPtr pEnt; - CARD32 IOAddress; -- CARD32 FBAddress; - unsigned char * FBBase; - unsigned char * MMIOBase; - unsigned long videoRam; -diff --git a/src/ark_driver.c b/src/ark_driver.c -index 5de3b9a..fec3e1a 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) - outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f); - modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01); - -- /* use membase's later on ??? */ -- pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) + -- (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24); -- -- pScrn->memPhysBase = pARK->FBAddress; -+#ifndef XSERVER_LIBPCIACCESS -+ pScrn->memPhysBase = pARK->PciInfo->memBase[0]; -+#else -+ pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr; -+#endif - - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n", -- (unsigned long)pARK->FBAddress); -+ (unsigned long)pScrn->memPhysBase); - - if (!xf86SetGamma(pScrn, gzeros)) - return FALSE; -@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f; - new->sr10 |= 0x1f; - -- new->sr13 = pARK->FBAddress >> 16; -- new->sr14 = pARK->FBAddress >> 24; -+#ifndef XSERVER_LIBPCIACCESS -+ new->sr13 = pARK->PciInfo->memBase[0] >> 16; -+ new->sr14 = pARK->PciInfo->memBase[0] >> 24; -+#else -+ new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16; -+ new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24; -+#endif - - new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03; - switch (pScrn->videoRam) { -@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) - pARK->PciTag, 0xb8000, 0x8000); - - pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, -- pARK->PciTag, pARK->FBAddress, -+ pARK->PciTag, pARK->PciInfo->memBase[0], - pScrn->videoRam * 1024); - #else - -@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) - { - void** result = (void**)&pARK->FBBase; - int err = pci_device_map_range(pARK->PciInfo, -- pARK->FBAddress, -+ pARK->PciInfo->regions[0].base_addr, - pScrn->videoRam * 1024, - PCI_DEV_MAP_FLAG_WRITABLE | - PCI_DEV_MAP_FLAG_WRITE_COMBINE, - result); - -- if (err) -+ if (err) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Cound not map framebuffer: %d\n", err); - return FALSE; -+ } - } - #endif - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch b/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch deleted file mode 100644 index bcfbf94db..000000000 --- a/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch +++ /dev/null @@ -1,571 +0,0 @@ -From 837149c63929d7d5a8ef6f8204d396f8e6d5acd7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net> -Date: Fri, 13 Apr 2012 11:12:51 +0200 -Subject: [PATCH 1/4] Poor man's acceleration of solid pictures for R3xx-R7xx - -The patch below implements basic acceleration of solid pictures via -scratch 1x1 pixmaps. It seems to at least alleviate some of the -corruption and performance issues exposed by Cairo 1.12, and should also -improve performance for other toolkits/apps using solid pictures. - -If there are no objections to this approach, maybe someone else can beat -me to extending this for Evergreen+ and R1/2xx. ---- - src/r600_exa.c | 160 ++++++++++++++++++++++++++-------------------- - src/radeon_exa_render.c | 115 ++++++++++++++++++++-------------- - src/radeon_exa_shared.c | 19 ++++++ - src/radeon_exa_shared.h | 1 + - 4 files changed, 179 insertions(+), 116 deletions(-) - -diff --git a/src/r600_exa.c b/src/r600_exa.c -index e1eb62f..c3ae553 100644 ---- a/src/r600_exa.c -+++ b/src/r600_exa.c -@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict, - int op, - int unit) - { -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; - unsigned int i; -- int max_tex_w, max_tex_h; -- -- max_tex_w = 8192; -- max_tex_h = 8192; -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) { - if (R600TexFormats[i].fmt == pPict->format) -@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - unsigned int i; - tex_resource_t tex_res; - tex_sampler_t tex_samp; -@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - } - - /* Texture */ -+ if (pPict->pDrawable) { -+ tex_res.w = pPict->pDrawable->width; -+ tex_res.h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ tex_res.w = 1; -+ tex_res.h = 1; -+ repeatType = RepeatNormal; -+ } - tex_res.id = unit; -- tex_res.w = w; -- tex_res.h = h; - tex_res.pitch = accel_state->src_obj[unit].pitch; - tex_res.depth = 0; - tex_res.dim = SQ_TEX_DIM_2D; -@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]); - vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]); - vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]); -- vs_alu_consts[3] = 1.0 / w; -+ vs_alu_consts[3] = 1.0 / tex_res.w; - - vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]); - vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]); - vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]); -- vs_alu_consts[7] = 1.0 / h; -+ vs_alu_consts[7] = 1.0 / tex_res.h; - } else { - accel_state->is_transform[unit] = FALSE; - - vs_alu_consts[0] = 1.0; - vs_alu_consts[1] = 0.0; - vs_alu_consts[2] = 0.0; -- vs_alu_consts[3] = 1.0 / w; -+ vs_alu_consts[3] = 1.0 / tex_res.w; - - vs_alu_consts[4] = 0.0; - vs_alu_consts[5] = 1.0; - vs_alu_consts[6] = 0.0; -- vs_alu_consts[7] = 1.0 / h; -+ vs_alu_consts[7] = 1.0 / tex_res.h; - } - - /* VS alu constants */ -@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - { - uint32_t tmp1; - PixmapPtr pSrcPixmap, pDstPixmap; -- int max_tex_w, max_tex_h, max_dst_w, max_dst_h; - - /* Check for unsupported compositing operations. */ - if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0]))) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); - -- max_tex_w = 8192; -- max_tex_h = 8192; -- max_dst_w = 8192; -- max_dst_h = 8192; -+ if (pSrcPixmap->drawable.width >= 8192 || -+ pSrcPixmap->drawable.height >= 8192) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } - -- if (pSrcPixmap->drawable.width >= max_tex_w || -- pSrcPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -+ if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -+ return FALSE; -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - -- if (pDstPixmap->drawable.width >= max_dst_w || -- pDstPixmap->drawable.height >= max_dst_h) { -+ if (pDstPixmap->drawable.width >= 8192 || -+ pDstPixmap->drawable.height >= 8192) { - RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", - pDstPixmap->drawable.width, - pDstPixmap->drawable.height)); -@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -- -- if (pMaskPixmap->drawable.width >= max_tex_w || -- pMaskPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width >= 8192 || -+ pMaskPixmap->drawable.height >= 8192) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } - -- if (pMaskPicture->componentAlpha) { -- /* Check if it's component alpha that relies on a source alpha and -- * on the source value. We can only get one of those into the -- * single source value that we get to blend with. -- */ -- if (R600BlendOp[op].src_alpha && -- (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -- (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -- RADEON_FALLBACK(("Component alpha not supported with source " -- "alpha and source value blending.\n")); -+ if (pMaskPicture->componentAlpha) { -+ /* Check if it's component alpha that relies on a source alpha and -+ * on the source value. We can only get one of those into the -+ * single source value that we get to blend with. -+ */ -+ if (R600BlendOp[op].src_alpha && -+ (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -+ (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -+ RADEON_FALLBACK(("Component alpha not supported with source " -+ "alpha and source value blending.\n")); -+ } - } -- } - -- if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -- return FALSE; -+ if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -+ return FALSE; -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - } - -- if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -- return FALSE; -- - if (!R600GetDestFormat(pDstPicture, &tmp1)) - return FALSE; - -@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum]; -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; - uint32_t dst_format; -@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - shader_config_t vs_conf, ps_conf; - struct r600_accel_object src_obj, mask_obj, dst_obj; - -- if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8) -+ if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8)) - return FALSE; - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - #if defined(XF86DRM_MODE) - if (info->cs) { - src_obj.offset = 0; - dst_obj.offset = 0; -- src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.bo = radeon_get_pixmap_bo(pDst); -+ src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst); - src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc); - dst_obj.surface = radeon_get_pixmap_surface(pDst); -@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - dst_obj.bpp = pDst->drawable.bitsPerPixel; - dst_obj.domain = RADEON_GEM_DOMAIN_VRAM; - -- if (pMask) { -+ if (pMaskPicture) { -+ if (!pMask) { -+ pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - #if defined(XF86DRM_MODE) - if (info->cs) { - mask_obj.offset = 0; -@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void R600DoneComposite(PixmapPtr pDst) -+static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst, -+ struct radeon_accel_state *accel_state) - { -- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; -- RADEONInfoPtr info = RADEONPTR(pScrn); -- struct radeon_accel_state *accel_state = info->accel_state; - int vtx_size; - - if (accel_state->vsync) -@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst) - r600_finish_op(pScrn, vtx_size); - } - -+static void R600DoneComposite(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ R600FinishComposite(pScrn, pDst, accel_state); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} -+ - static void R600Composite(PixmapPtr pDst, - int srcX, int srcY, - int maskX, int maskY, -@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst, - - #ifdef XF86DRM_MODE - if (info->cs && CS_FULL(info->cs)) { -- R600DoneComposite(info->accel_state->dst_pix); -+ R600FinishComposite(pScrn, pDst, info->accel_state); - radeon_cs_flush_indirect(pScrn); - R600PrepareComposite(info->accel_state->composite_op, - info->accel_state->src_pic, -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index e5c231f..b6cc9e4 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict, - if (repeatType == RepeatNormal || repeatType == RepeatReflect) { - Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix); - -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -+ int w = pPict->pDrawable ? pPict->pDrawable->width : 1; -+ int h = pPict->pDrawable ? pPict->pDrawable->height : 1; - - if (pPict->transform) { - if (badPitch) -@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, - ScreenPtr pScreen = pDstPict->pDrawable->pScreen; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); -- - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; -- int max_tex_w, max_tex_h; -- -- if (is_r500) { -- max_tex_w = 4096; -- max_tex_h = 4096; -- } else { -- max_tex_w = 2048; -- max_tex_h = 2048; -- } -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++) - { -@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) { -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) { - if (info->cs) { - struct radeon_exa_pixmap_priv *driver_priv; - PixmapPtr pPix; -@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -+ int w, h; - int i, pixel_shift, out_size = 6; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - - TRACE; - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ - txpitch = exaGetPixmapPitch(pPix); - txoffset = 0; - -@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- - if (IS_R500_3D) { - max_tex_w = 4096; - max_tex_h = 4096; -@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - } - } - -- if (pSrcPixmap->drawable.width > max_tex_w || -- pSrcPixmap->drawable.height > max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > max_dst_w || -@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > max_tex_w || -+ pSrcPixmap->drawable.height > max_tex_h) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -- -- if (pMaskPixmap->drawable.width > max_tex_w || -- pMaskPixmap->drawable.height > max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > max_tex_w || -+ pMaskPixmap->drawable.height > max_tex_h) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch; - uint32_t txenable, colorpitch; - uint32_t blendcntl, output_fmt; -@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - -@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) -+static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst) - { - RINFO_FROM_SCREEN(pDst->drawable.pScreen); - ACCEL_PREAMBLE(); -@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) - LEAVE_DRAW(0); - } - -+static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ FUNC_NAME(RadeonFinishComposite)(pDst); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} - - #ifdef ACCEL_CP - -@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn, - if ((info->cs && CS_FULL(info->cs)) || - (!info->cs && (info->cp->indirectBuffer->used + 4 * 32) > - info->cp->indirectBuffer->total)) { -- FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix); -+ FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix); - if (info->cs) - radeon_cs_flush_indirect(pScrn); - else -diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c -index be1d2fa..28dc335 100644 ---- a/src/radeon_exa_shared.c -+++ b/src/radeon_exa_shared.c -@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp) - return FALSE; - } - -+PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid) -+{ -+ PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0); -+ struct radeon_bo *bo; -+ -+ exaMoveInPixmap(pPix); -+ bo = radeon_get_pixmap_bo(pPix); -+ -+ if (radeon_bo_map(bo, 1)) { -+ pScreen->DestroyPixmap(pPix); -+ return NULL; -+ } -+ -+ memcpy(bo->ptr, &solid, 4); -+ radeon_bo_unmap(bo); -+ -+ return pPix; -+} -+ - static Bool radeon_vb_get(ScrnInfoPtr pScrn) - { - RADEONInfoPtr info = RADEONPTR(pScrn); -diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h -index 7b8b5ca..60a1045 100644 ---- a/src/radeon_exa_shared.h -+++ b/src/radeon_exa_shared.h -@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn); - extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2); - extern Bool RADEONValidPM(uint32_t pm, int bpp); - extern Bool RADEONCheckBPP(int bpp); -+extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid); - - #define RADEON_TRACE_FALL 0 - #define RADEON_TRACE_DRAW 0 --- -1.7.7.5 - diff --git a/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch b/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch deleted file mode 100644 index e6b5433e1..000000000 --- a/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 761ef4b340e689490a76ec5ce520c858335e2106 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Sat, 14 Apr 2012 08:53:39 -0400 -Subject: [PATCH] poor man's solid picture support for evergreen - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/evergreen_exa.c | 163 ++++++++++++++++++++++++++++++--------------------- - 1 files changed, 95 insertions(+), 68 deletions(-) - -diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c -index cee3ec2..61b47a4 100644 ---- a/src/evergreen_exa.c -+++ b/src/evergreen_exa.c -@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict, - int op, - int unit) - { -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; - unsigned int i; -- int max_tex_w, max_tex_h; -- -- max_tex_w = 16384; -- max_tex_h = 16384; -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) { - if (EVERGREENTexFormats[i].fmt == pPict->format) -@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int const_offset = unit * 8; -+ int w, h; -+ -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ } else { -+ w = 1; -+ h = 1; -+ } - - if (pPict->transform != 0) { - accel_state->is_transform[unit] = TRUE; -@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - unsigned int i; - tex_resource_t tex_res; - tex_sampler_t tex_samp; -@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix, - } - - /* Texture */ -+ if (pPict->pDrawable) { -+ tex_res.w = pPict->pDrawable->width; -+ tex_res.h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ tex_res.w = 1; -+ tex_res.h = 1; -+ repeatType = RepeatNormal; -+ } -+ - tex_res.id = unit; -- tex_res.w = w; -- tex_res.h = h; - tex_res.pitch = accel_state->src_obj[unit].pitch; - tex_res.depth = 0; - tex_res.dim = SQ_TEX_DIM_2D; -@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture, - { - uint32_t tmp1; - PixmapPtr pSrcPixmap, pDstPixmap; -- int max_tex_w, max_tex_h, max_dst_w, max_dst_h; - - /* Check for unsupported compositing operations. */ - if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0]))) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); - -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- max_tex_w = 8192; -- max_tex_h = 8192; -- max_dst_w = 8192; -- max_dst_h = 8192; -+ if (pSrcPixmap->drawable.width >= 16384 || -+ pSrcPixmap->drawable.height >= 16384) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } - -- if (pSrcPixmap->drawable.width >= max_tex_w || -- pSrcPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -+ if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -+ return FALSE; -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - -- if (pDstPixmap->drawable.width >= max_dst_w || -- pDstPixmap->drawable.height >= max_dst_h) { -+ if (pDstPixmap->drawable.width >= 16384 || -+ pDstPixmap->drawable.height >= 16384) { - RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", - pDstPixmap->drawable.width, - pDstPixmap->drawable.height)); -@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture, - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width >= max_tex_w || -- pMaskPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width >= 16384 || -+ pMaskPixmap->drawable.height >= 16384) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } - -- if (pMaskPicture->componentAlpha) { -- /* Check if it's component alpha that relies on a source alpha and -- * on the source value. We can only get one of those into the -- * single source value that we get to blend with. -- */ -- if (EVERGREENBlendOp[op].src_alpha && -- (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -- (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -- RADEON_FALLBACK(("Component alpha not supported with source " -- "alpha and source value blending.\n")); -+ if (pMaskPicture->componentAlpha) { -+ /* Check if it's component alpha that relies on a source alpha and -+ * on the source value. We can only get one of those into the -+ * single source value that we get to blend with. -+ */ -+ if (EVERGREENBlendOp[op].src_alpha && -+ (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -+ (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -+ RADEON_FALLBACK(("Component alpha not supported with source " -+ "alpha and source value blending.\n")); -+ } - } -- } - -- if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -- return FALSE; -+ if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -+ return FALSE; -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - } - -- if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -- return FALSE; -- - if (!EVERGREENGetDestFormat(pDstPicture, &tmp1)) - return FALSE; - -@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum]; -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; - uint32_t dst_format; -@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - struct r600_accel_object src_obj, mask_obj, dst_obj; - float *cbuf; - -- if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8) -+ if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8)) - return FALSE; - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - src_obj.offset = 0; - dst_obj.offset = 0; -- src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.bo = radeon_get_pixmap_bo(pDst); -+ src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.surface = radeon_get_pixmap_surface(pDst); - src_obj.surface = radeon_get_pixmap_surface(pSrc); - dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst); -@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - dst_obj.bpp = pDst->drawable.bitsPerPixel; - dst_obj.domain = RADEON_GEM_DOMAIN_VRAM; - -- if (pMask) { -+ if (pMaskPicture) { -+ if (!pMask) { -+ pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } - mask_obj.offset = 0; - mask_obj.bo = radeon_get_pixmap_bo(pMask); - mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask); -@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void EVERGREENDoneComposite(PixmapPtr pDst) -+static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst, -+ struct radeon_accel_state *accel_state) - { -- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; -- RADEONInfoPtr info = RADEONPTR(pScrn); -- struct radeon_accel_state *accel_state = info->accel_state; - int vtx_size; - - if (accel_state->vsync) -@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst) - evergreen_finish_op(pScrn, vtx_size); - } - -+static void EVERGREENDoneComposite(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ EVERGREENFinishComposite(pScrn, pDst, accel_state); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} -+ - static void EVERGREENComposite(PixmapPtr pDst, - int srcX, int srcY, - int maskX, int maskY, -@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst, - float *vb; - - if (CS_FULL(info->cs)) { -- EVERGREENDoneComposite(info->accel_state->dst_pix); -+ EVERGREENFinishComposite(pScrn, pDst, info->accel_state); - radeon_cs_flush_indirect(pScrn); - EVERGREENPrepareComposite(info->accel_state->composite_op, - info->accel_state->src_pic, --- -1.7.7.5 - diff --git a/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch b/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch deleted file mode 100644 index 3a2779446..000000000 --- a/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch +++ /dev/null @@ -1,182 +0,0 @@ -From f36b911ecc31f689ddceeeb11d10eb7cb4a3428d Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 13 Apr 2012 13:24:46 -0400 -Subject: [PATCH 2/3] poor man's solid picture support for r100 - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/radeon_exa_render.c | 101 +++++++++++++++++++++++++++-------------------- - 1 files changed, 58 insertions(+), 43 deletions(-) - -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index b6cc9e4..451a625 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, - int unit) - { - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; - -- /* r100 limit should be 2048, there are issues with 2048 -- * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -- */ -- -- if ((w > 2047) || (h > 2047)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); -- - for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) { - if (R100TexFormats[i].fmt == pPict->format) - break; -@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) - return FALSE; - - if (pPict->filter != PictFilterNearest && -@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat, txoffset, txpitch; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -- !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -- int i; -+ unsigned int repeatType; -+ Bool repeat; -+ int i, w, h; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ -+ repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -+ !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -+ - txpitch = exaGetPixmapPitch(pPix); - txoffset = 0; - -@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture, - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- /* r100 limit should be 2048, there are issues with 2048 -- * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -- */ -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- if (pSrcPixmap->drawable.width > 2047 || -- pSrcPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > 2047 || -@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture, - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ /* r100 limit should be 2048, there are issues with 2048 -+ * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -+ */ -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > 2047 || -+ pSrcPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width > 2047 || -- pMaskPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > 2047 || -+ pMaskPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, - PixmapPtr pMask, - PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch, colorpitch; - uint32_t pp_cntl, blendcntl, cblend, ablend; - int pixel_shift; -@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, - - CHECK_OFFSET(pDst, 0x0f, "destination"); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - --- -1.7.7.5 - diff --git a/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch b/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch deleted file mode 100644 index 0a448fc93..000000000 --- a/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch +++ /dev/null @@ -1,179 +0,0 @@ -From c5c8310858f8018a1754f2457d7b102dc7d62b23 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 13 Apr 2012 13:28:10 -0400 -Subject: [PATCH 3/3] poor man's solid picture support for r200 - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/radeon_exa_render.c | 101 +++++++++++++++++++++++++++-------------------- - 1 files changed, 58 insertions(+), 43 deletions(-) - -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index 451a625..7f1a3ff 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, - int unit) - { - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; - -- /* r200 limit should be 2048, there are issues with 2048 -- * see bug 19269 -- */ -- -- if ((w > 2047) || (h > 2047)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); -- - for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++) - { - if (R200TexFormats[i].fmt == pPict->format) -@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) - return FALSE; - - if (pPict->filter != PictFilterNearest && -@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat, txoffset, txpitch; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -- !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -- int i; -+ unsigned int repeatType; -+ Bool repeat; -+ int i, w, h; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ -+ repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -+ !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -+ - txpitch = exaGetPixmapPitch(pPix); - - txoffset = 0; -@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- /* r200 limit should be 2048, there are issues with 2048 -- * see bug 19269 -- */ -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- if (pSrcPixmap->drawable.width > 2047 || -- pSrcPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > 2047 || -@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ /* r200 limit should be 2048, there are issues with 2048 -+ * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -+ */ -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > 2047 || -+ pSrcPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width > 2047 || -- pMaskPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > 2047 || -+ pMaskPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch; - uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch; - int pixel_shift; -@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - --- -1.7.7.5 - diff --git a/extra/xf86-video-ati/git_fixes.diff b/extra/xf86-video-ati/git_fixes.diff deleted file mode 100644 index 0c4518319..000000000 --- a/extra/xf86-video-ati/git_fixes.diff +++ /dev/null @@ -1,33 +0,0 @@ -From d282719a9c2fb0ee32830aa75b8dfbb9392954ed Mon Sep 17 00:00:00 2001 -From: Jerome Glisse <jglisse@redhat.com> -Date: Wed, 04 Apr 2012 21:08:30 +0000 -Subject: r6xx-r9xx: force 1D tiling for buffer with height < 64 - -Due to some old kernel issue, height is 8 aligned insided the ddx -For buffer with height btw 57 & 63 this lead ddx to believe it can -allocate a 2D tiled surface while mesa will not align height and -will assume 1D tiled leading to disagreement and rendering issue. -This patch force buffer with height < 64 to be 1D tiled. - -Signed-off-by: Jerome Glisse <jglisse@redhat.com> ---- -diff --git a/src/radeon_exa.c b/src/radeon_exa.c -index 99a5806..270dad4 100644 ---- a/src/radeon_exa.c -+++ b/src/radeon_exa.c -@@ -511,6 +511,13 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, - surface.last_level = 0; - surface.bpe = cpp; - surface.nsamples = 1; -+ if (height < 64) { -+ /* disable 2d tiling for small surface to work around -+ * the fact that ddx align height to 8 pixel for old -+ * obscure reason i can't remember -+ */ -+ tiling &= ~RADEON_TILING_MACRO; -+ } - surface.flags = RADEON_SURF_SCANOUT; - surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE); - surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-chips/chips-1.2.4-git.patch b/extra/xf86-video-chips/chips-1.2.4-git.patch deleted file mode 100644 index 9d8e856a3..000000000 --- a/extra/xf86-video-chips/chips-1.2.4-git.patch +++ /dev/null @@ -1,912 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 225e516..c0ed508 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - --# Checks for programs. --AM_PROG_CC_C_O -- - AH_TOP([#include "xorg-server.h"]) - - # Define a configure option for an alternate module directory -diff --git a/man/chips.man b/man/chips.man -index 740af38..0c022ee 100644 ---- a/man/chips.man -+++ b/man/chips.man -@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off - Force driver to leave centering and stretching registers alone. This - can fix some laptop suspend/resume problems. Default: off - .TP --.BI "Option \*qOverlay\*q" --Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off. --.TP - .BI "Option \*qColorKey\*q \*q" integer \*q - Set the colormap index used for the transparency key for the depth 8 plane - when operating in 8+16 overlay mode. The value must be in the range -diff --git a/src/ct_accel.c b/src/ct_accel.c -index 3920b0a..4b5776a 100644 ---- a/src/ct_accel.c -+++ b/src/ct_accel.c -@@ -428,19 +428,7 @@ chips_imagewrite: - infoPtr->ImageWriteFlags |= NO_PLANEMASK; - #endif - -- --#ifdef CHIPS_HIQV -- if (XAAInit(pScreen, infoPtr)) { -- if (cPtr->Flags & ChipsOverlay8plus16) -- return(XAAInitDualFramebufferOverlay(pScreen, -- CTNAME(DepthChange))); -- else -- return TRUE; -- } else -- return FALSE; --#else - return(XAAInit(pScreen, infoPtr)); --#endif - } - - #ifdef CHIPS_HIQV -@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn, - #endif - w *= cAcl->BytesPerPixel; - ctBLTWAIT; --#ifdef CHIPS_HIQV -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) && -- (pScrn->depth == 8)) -- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes); --#endif - ctSETSRCADDR(srcaddr); - ctSETDSTADDR(destaddr); - #ifdef CHIPS_HIQV -@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - patternaddr = (paty * pScrn->displayWidth + - (patx & ~0x3F)) * cAcl->BytesPerPixel; - cAcl->patternyrot = (patx & 0x3F) >> 3; --#ifdef CHIPS_HIQV -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr += cPtr->FbOffset16; --#endif - - ctBLTWAIT; - ctSETPATSRCADDR(patternaddr); -@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - - #ifdef CHIPS_HIQV - patternaddr = paty * pScrn->displayWidth + patx; -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr = patternaddr * 2 + cPtr->FbOffset16; -- else -- patternaddr *= cAcl->BytesPerPixel; -+ patternaddr *= cAcl->BytesPerPixel; - #else - patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel; - #endif -@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2; - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - destpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - -@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - y++; - - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETDSTADDR(destaddr); -@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - srcpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | -@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dst += dstwidth; - y++; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - ctBLTWAIT; - ctSETSRCADDR(srcaddr); - ctSETHEIGHTWIDTHGO(h, bytesPerLine); -diff --git a/src/ct_driver.c b/src/ct_driver.c -index 6624b79..a2e5c94 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags) - } - - } -- xfree(usedChips); -+ free(usedChips); - } - } - -@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags) - pScrn->ValidMode = CHIPSValidMode; - foundScreen = TRUE; - } -- xfree(usedChips); -+ free(usedChips); - } - } - #endif - -- xfree(devSections); -+ free(devSections); - return foundScreen; - } - #endif -@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - cPtr->PIOBase = hwp->PIOOffset; -+#else -+ cPtr->PIOBase = 0; -+#endif -+ - /* - * Must allow ensure that storage for the 2nd set of vga registers is - * allocated for dual channel cards -@@ -1639,55 +1644,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - } - } - -- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) { -- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) { -- if (pScrn->bitsPerPixel == 16) { -- if (cPtr->Flags & ChipsLinearSupport) { -- cPtr->Flags |= ChipsOverlay8plus16; -- if(!xf86GetOptValInteger( -- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey))) -- pScrn->colorKey = TRANSPARENCY_KEY; -- pScrn->overlayFlags = OVERLAY_8_16_DUALFB; -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "PseudoColor overlay enabled.\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"Stretch\" \"ON\".\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"LcdCenter\" \"OFF\".\n"); -- if (cPtr->Flags & ChipsShadowFB) { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Disabling \"Shadow Framebuffer\".\n"); -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " Not support with option \"8Plus16\".\n"); -- cPtr->Flags &= ~ChipsShadowFB; -- cPtr->Rotate = 0; -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "Option \"Overlay\" is not supported in this configuration\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "\"%s\" is not a valid value for Option \"Overlay\"\n", s); -- } -- } -- -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -- &(cPtr->videoKey))) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", -+ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -+ &(cPtr->videoKey))) { -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", - cPtr->videoKey); -- } else { -- cPtr->videoKey = (1 << pScrn->offset.red) | -+ } else { -+ cPtr->videoKey = (1 << pScrn->offset.red) | - (1 << pScrn->offset.green) | - (((pScrn->mask.blue >> pScrn->offset.blue) - 1) - << pScrn->offset.blue); -- } - } - - if (cPtr->Flags & ChipsShadowFB) { -@@ -2335,28 +2300,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - /* and 32bits on the others. Thus multiply by a suitable factor */ - if (cPtr->Flags & Chips64BitMemory) { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / bytesPerPixel); - } else { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / bytesPerPixel); - } -@@ -3736,8 +3689,7 @@ CHIPSEnterVT(int scrnIndex, int flags) - /* Should we re-save the text mode on each VT enter? */ - if(!chipsModeInit(pScrn, pScrn->currentMode)) - return FALSE; -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) - CHIPSResetVideo(pScrn); - -@@ -3788,8 +3740,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, - int i, index, shift ; - CHIPSEntPtr cPtrEnt; - -- shift = ((pScrn->depth == 15) && -- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0; -+ shift = (pScrn->depth == 15) ? 3 : 0; - - if (cPtr->UseDualChannel) { - cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0], -@@ -3895,18 +3846,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, - hwp->disablePalette(hwp); - } - --static Bool --cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, -- int xsize, int ysize, int dpix, int dpiy, -- int width16, int width8) --{ -- return -- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8) && -- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8, 16, 8)); --} -- - /* Mandatory */ - static Bool - CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -@@ -3947,22 +3886,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!chipsMapMem(pScrn)) - return FALSE; - -- /* Setup a pointer to the overlay if needed */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY; -- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY; -- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Too little memory for overlay. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Max overlay Width/Height 1024 pixels. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- } -- - /* Setup the MMIO register access functions if need */ - if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) { - CHIPSSetMmioExtFuncs(cPtr); -@@ -4035,18 +3958,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - miClearVisualTypes(); - - /* Setup the visuals we support. */ -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){ -- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask, -- pScrn->rgbBits, PseudoColor)) -- return FALSE; -- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor)) -- return FALSE; -- } else { -- if (!miSetVisualTypes(pScrn->depth, -+ if (!miSetVisualTypes(pScrn->depth, - miGetDefaultVisualMask(pScrn->depth), - pScrn->rgbBits, pScrn->defaultVisual)) -- return FALSE; -- } -+ return FALSE; - miSetPixmapDepths (); - - /* -@@ -4090,13 +4005,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - break; - #endif - case 16: -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + -- cPtr->FbOffset16, FBStart, width, -- height, pScrn->xDpi, pScrn->yDpi, -- displayWidth, displayWidth); -- break; -- } - default: - ret = fbScreenInit(pScreen, FBStart, - width,height, -@@ -4223,7 +4131,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY, - pScrn->displayWidth, pBankInfo)) { -- xfree(pBankInfo); -+ free(pBankInfo); - pBankInfo = NULL; - return FALSE; - } -@@ -4244,9 +4152,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (pScrn->bitsPerPixel < 8) - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY / 2; -- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) -- freespace = allocatebase - pScrn->displayWidth * -- pScrn->virtualY - cPtr->FbSize16; - else - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY * (pScrn->bitsPerPixel >> 3); -@@ -4369,9 +4274,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - AvailFBArea.y2 = cAcl->CacheEnd / - (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); - -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- xf86InitFBManager(pScreen, &AvailFBArea); -- } -+ xf86InitFBManager(pScreen, &AvailFBArea); - } - if (cPtr->Flags & ChipsAccelSupport) { - if (IS_HiQV(cPtr)) { -@@ -4425,16 +4328,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!miCreateDefColormap(pScreen)) - return FALSE; - -- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette, -- NULL, CMAP_RELOAD_ON_MODE_SWITCH)) -- return FALSE; -- } else { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, -+ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, - (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette), - NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) -- return FALSE; -- } -+ return FALSE; - - #ifndef XSERVER_LIBPCIACCESS - racflag = RAC_COLORMAP; -@@ -4448,8 +4345,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - xf86SetSilkenMouse(pScreen); - #endif - -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) { - CHIPSInitVideo(pScreen); - } -@@ -4522,10 +4418,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - Base >>= 3; - break; - case 16: -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- Base >>= 1; -- else -- Base >>= 2; -+ Base >>= 1; - break; - case 24: - if (!IS_HiQV(cPtr)) -@@ -4581,14 +4474,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - cPtr->writeMSS(cPtr, hwp, MSS); - } - -- if (cPtr->Flags & ChipsOverlay8plus16) { -- Base = (Base << 3) & ~(unsigned long)0xF; -- -- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8); -- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF); -- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF); -- } -- - } - - /* Mandatory */ -@@ -4652,13 +4537,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - CHIPSPtr cPtr = CHIPSPTR(pScrn); - -- if (flags & MODECHECK_FINAL) { -- /* Don't subtract FrambufferSize here as it should be subtracted already */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY -- < 0)) -- return MODE_MEM; -- } - /* The tests here need to be expanded */ - if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD)) - return MODE_NO_INTERLACE; -@@ -5544,12 +5422,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } else { - ChipsStd->Attribute[0x10] = 0x01; /* mode */ - } -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) { -- /* Make sure that the overlay isn't visible in the overscan region */ -- if (ChipsStd->Attribute[0x11] == pScrn->colorKey) -- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1; -- } else -- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ -+ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ - ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */ - ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */ - -@@ -5558,8 +5431,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* set virtual screen width */ - tmp = pScrn->displayWidth >> 3; - if (pScrn->bitsPerPixel == 16) { -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- tmp <<= 1; /* double the width of the buffer */ -+ tmp <<= 1; /* double the width of the buffer */ - } else if (pScrn->bitsPerPixel == 24) { - tmp += tmp << 1; - } else if (pScrn->bitsPerPixel == 32) { -@@ -5688,8 +5560,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - - /* centering/stretching */ - if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) { -- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) || -- (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) { - ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */ - ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */ - ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */ -@@ -5709,8 +5580,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - -- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) -- || (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) { - ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */ - ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */ - } else { -@@ -5723,8 +5593,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - ChipsNew->XR[0x82] |=0x02; - - /* software mode flag */ -- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ? -- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ? -+ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ? - min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) : - mode->CrtcHDisplay, mode->CrtcVDisplay); - #ifdef DEBUG -@@ -5762,7 +5631,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - /* bpp depend */ -- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) { -+ if (pScrn->bitsPerPixel == 16) { - ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4; - if (cPtr->Flags & ChipsGammaSupport) - ChipsNew->XR[0x82] |= 0x0C; -@@ -5915,60 +5784,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* Turn off multimedia by default as it degrades performance */ - ChipsNew->XR[0xD0] &= 0x0f; - -- /* Setup the video/overlay */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ --#ifdef SAR04 -- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */ --#endif -- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */ -- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) -- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */ -- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */ -- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */ -- if (pScrn->weight.green == 5) -- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */ -- -- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */ -- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */ -- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */ -- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */ -- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ -- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1; -- -- /* Left Edge of Overlay */ -- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX; -- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7); -- /* Right Edge of Overlay */ -- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) & 0xFF; -- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) >> 8) & 0x07; -- /* Top Edge of Overlay */ -- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY; -- ChipsNew->MR[0x2F] &= 0xF8; -- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7); -- /* Bottom Edge of Overlay*/ -- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF; -- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - -- 1 ) >> 8) & 0x07; -- -- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */ -- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */ -- ChipsNew->MR[0x3D] = 0x00; -- ChipsNew->MR[0x3E] = 0x00; -- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */ -- ChipsNew->MR[0x40] = 0xFF; -- ChipsNew->MR[0x41] = 0xFF; -- ChipsNew->MR[0x42] = 0x00; -- } else if (cPtr->Flags & ChipsVideoSupport) { -+ if (cPtr->Flags & ChipsVideoSupport) { - #if 0 /* if we do this even though video isn't playing we kill performance */ - ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ - #endif -@@ -6877,8 +6693,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs) - } - - /* Set SAR04 multimedia register correctly */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- || (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - #ifdef SAR04 - cPtr->writeXR(cPtr, 0x4E, 0x04); - if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F]) -diff --git a/src/ct_driver.h b/src/ct_driver.h -index d8ce228..9033867 100644 ---- a/src/ct_driver.h -+++ b/src/ct_driver.h -@@ -114,7 +114,6 @@ typedef struct { - /* Options flags for the C&T chipsets */ - #define ChipsHWCursor 0x00001000 - #define ChipsShadowFB 0x00002000 --#define ChipsOverlay8plus16 0x00004000 - #define ChipsUseNewFB 0x00008000 - - /* Architecture type flags */ -@@ -272,11 +271,13 @@ typedef struct { - - typedef struct _CHIPSRec { - pciVideoPtr PciInfo; -+#ifndef XSERVER_LIBPCIACCESS - PCITAG PciTag; -+#endif - int Chipset; - EntityInfoPtr pEnt; -- IOADDRESS PIOBase; -- CARD32 IOAddress; -+ unsigned long PIOBase; -+ unsigned long IOAddress; - unsigned long FbAddress; - unsigned int IOBase; - unsigned char * FbBase; -diff --git a/src/ct_video.c b/src/ct_video.c -index a68acb9..c9e5bb4 100644 ---- a/src/ct_video.c -+++ b/src/ct_video.c -@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen) - CHIPSPtr cPtr = CHIPSPTR(pScrn); - int num_adaptors; - -- if (!(cPtr->Flags & ChipsOverlay8plus16) && -- (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - newAdaptor = CHIPSSetupImageVideo(pScreen); - CHIPSInitOffscreenImages(pScreen); - } -diff --git a/util/dRegs.c b/util/dRegs.c -index b7edc8f..0d2f0cb 100644 ---- a/util/dRegs.c -+++ b/util/dRegs.c -@@ -1,63 +1,8 @@ -- -- -- -- -- -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - int main(void) - { -diff --git a/util/iopl.h b/util/iopl.h -new file mode 100644 -index 0000000..e08207c ---- /dev/null -+++ b/util/iopl.h -@@ -0,0 +1,60 @@ -+#ifdef __NetBSD__ -+# include <sys/types.h> -+# include <machine/pio.h> -+# include <machine/sysarch.h> -+#else -+# if defined(__linux__) -+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc -+ * # include <sys/io.h> -+ */ -+int iopl(int level); -+# endif -+# if defined(SVR4) && defined(i386) -+# include <sys/types.h> -+# ifdef NCR -+ /* broken NCR <sys/sysi86.h> */ -+# define __STDC -+# include <sys/sysi86.h> -+# undef __STDC -+# else -+# include <sys/sysi86.h> -+# endif -+# ifdef SVR4 -+# if !defined(sun) -+# include <sys/seg.h> -+# endif -+# endif -+# include <sys/v86.h> -+# if defined(sun) -+# include <sys/psw.h> -+# endif -+# endif -+# include "AsmMacros.h" -+#endif /* NetBSD */ -+ -+#include <unistd.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+#ifdef __NetBSD__ -+# define SET_IOPL() i386_iopl(3) -+# define RESET_IOPL() i386_iopl(0) -+#else -+# if defined(SVR4) && defined(i386) -+# ifndef SI86IOPL -+# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) -+# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) -+# else -+# define SET_IOPL() sysi86(SI86IOPL,3) -+# define RESET_IOPL() sysi86(SI86IOPL,0) -+# endif -+# else -+# ifdef linux -+# define SET_IOPL() iopl(3) -+# define RESET_IOPL() iopl(0) -+# else -+# define SET_IOPL() (void)0 -+# define RESET_IOPL() (void)0 -+# endif -+# endif -+#endif -diff --git a/util/mRegs.c b/util/mRegs.c -index f359738..843d01d 100644 ---- a/util/mRegs.c -+++ b/util/mRegs.c -@@ -1,63 +1,8 @@ -- -- -- -- -- -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - int hex2int(char* str); - -diff --git a/util/modClock.c b/util/modClock.c -index 89a291a..45af19b 100644 ---- a/util/modClock.c -+++ b/util/modClock.c -@@ -1,61 +1,12 @@ -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+ - #ifndef Lynx - #include <fnmatch.h> - #endif - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - #define tolerance 0.01 /* +/- 1% */ - diff --git a/extra/xf86-video-intel/fix_gen4.diff b/extra/xf86-video-intel/fix_gen4.diff deleted file mode 100644 index 87a2fa8db..000000000 --- a/extra/xf86-video-intel/fix_gen4.diff +++ /dev/null @@ -1,142 +0,0 @@ -From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 27 Jul 2012 11:43:00 +0000 -Subject: sna/gen4: Further refinement to the GT allocation - -Still hunting for why gen4 fails utterly. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c -index 25229e1..1a860bd 100644 ---- a/src/sna/gen4_render.c -+++ b/src/sna/gen4_render.c -@@ -79,8 +79,8 @@ - #define URB_CS_ENTRY_SIZE 1 - #define URB_CS_ENTRIES 0 - --#define URB_VS_ENTRY_SIZE 1 // each 512-bit row --#define URB_VS_ENTRIES 32 // we needs at least 8 entries -+#define URB_VS_ENTRY_SIZE 1 -+#define URB_VS_ENTRIES 32 - - #define URB_GS_ENTRY_SIZE 0 - #define URB_GS_ENTRIES 0 -@@ -89,25 +89,24 @@ - #define URB_CLIP_ENTRIES 0 - - #define URB_SF_ENTRY_SIZE 2 --#define URB_SF_ENTRIES 8 -+#define URB_SF_ENTRIES 64 - - /* - * this program computes dA/dx and dA/dy for the texture coordinates along - * with the base texture coordinate. It was extracted from the Mesa driver - */ - --#define SF_KERNEL_NUM_GRF 16 -- --#define PS_KERNEL_NUM_GRF 32 -+#define SF_KERNEL_NUM_GRF 16 -+#define PS_KERNEL_NUM_GRF 32 - - static const struct gt_info { - uint32_t max_sf_threads; - uint32_t max_wm_threads; - uint32_t urb_size; - } gen4_gt_info = { -- 16, 32, 256, -+ 24, 32, 256, - }, g4x_gt_info = { -- 32, 50, 384, -+ 24, 50, 384, - }; - - static const uint32_t sf_kernel[][4] = { -@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna, - const struct sna_composite_op *op, - uint16_t wm_binding_table) - { -+ gen4_emit_drawing_rectangle(sna, op); - gen4_emit_binding_table(sna, wm_binding_table); - gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel); - gen4_emit_vertex_elements(sna, op); -- gen4_emit_drawing_rectangle(sna, op); - - if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) { - DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__, --- -cgit v0.9.0.2-2-gbebe -From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 27 Jul 2012 12:24:04 +0000 -Subject: sna/gen4: Move the common vertex_offset==0 check into the flush() - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c -index 1a860bd..58d4422 100644 ---- a/src/sna/gen4_render.c -+++ b/src/sna/gen4_render.c -@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna, - - static void gen4_vertex_flush(struct sna *sna) - { -- assert(sna->render_state.gen4.vertex_offset); -+ if (sna->render_state.gen4.vertex_offset == 0) -+ return; - - DBG(("%s[%x] = %d\n", __FUNCTION__, - 4*sna->render_state.gen4.vertex_offset, -@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna) - - bo = sna->render.vbo; - if (bo) { -- if (sna->render_state.gen4.vertex_offset) -- gen4_vertex_flush(sna); -+ gen4_vertex_flush(sna); - - for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) { - if (sna->render.vertex_reloc[i]) { -@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna, - } - priv->clear = false; - -- if (sna->render_state.gen4.vertex_offset) -- gen4_vertex_flush(sna); -+ gen4_vertex_flush(sna); - return true; - } - -@@ -2693,8 +2692,7 @@ fastcall static void - gen4_render_composite_spans_done(struct sna *sna, - const struct sna_composite_spans_op *op) - { -- if (sna->render_state.gen4.vertex_offset) -- gen4_vertex_flush(sna); -+ gen4_vertex_flush(sna); - - DBG(("%s()\n", __FUNCTION__)); - -@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna, - static void - gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op) - { -- if (sna->render_state.gen4.vertex_offset) -- gen4_vertex_flush(sna); -+ gen4_vertex_flush(sna); - } - - static bool -@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna, - static void - gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op) - { -- if (sna->render_state.gen4.vertex_offset) -- gen4_vertex_flush(sna); -+ gen4_vertex_flush(sna); - kgem_bo_destroy(&sna->kgem, op->base.src.bo); - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-intel/gmux_backlight.diff b/extra/xf86-video-intel/gmux_backlight.diff deleted file mode 100644 index a5522e82b..000000000 --- a/extra/xf86-video-intel/gmux_backlight.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- xf86-video-intel-2.20.0.orig/src/intel_display.c 2012-07-15 21:02:49.000000000 +1000 -+++ xf86-video-intel-2.20.0/src/intel_display.c 2012-07-24 11:53:42.762165514 +1000 -@@ -127,6 +127,7 @@ - * List of available kernel interfaces in priority order - */ - static const char *backlight_interfaces[] = { -+ "gmux_backlight", - "asus-laptop", - "asus-nb-wmi", - "eeepc", diff --git a/extra/xf86-video-intel/sna_backlight_fixes.diff b/extra/xf86-video-intel/sna_backlight_fixes.diff deleted file mode 100644 index 1511a8d79..000000000 --- a/extra/xf86-video-intel/sna_backlight_fixes.diff +++ /dev/null @@ -1,54 +0,0 @@ -From 0ab6d7a50d37cf4454577cb8c333d4b8683aa054 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 25 Jul 2012 11:20:36 +0000 -Subject: sna: Prefer platform backlight devices over firmware - -This is in contrast to libbacklight but closer to our original code as -we prefer a known custom backlight controller over the ACPI interfaces. -As only the ACPI interfaces are marked as firmware, and the custom -backlight controllers as platform, we therefore need to prefer platform -backlight devices. - -Reported-by: Austin Lund <austin.lund@gmail.com> -References: https://bugs.freedesktop.org/show_bug.cgi?id=52423 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c -index b31f08d..ebecd21 100644 ---- a/src/sna/sna_display.c -+++ b/src/sna/sna_display.c -@@ -282,8 +282,8 @@ sna_output_backlight_get_max(xf86OutputPtr output) - } - - enum { -- FIRMWARE, - PLATFORM, -+ FIRMWARE, - RAW, - NAMED, - }; --- -cgit v0.9.0.2-2-gbebe -From 484b072072c8297a87940c9e32097923f0a77c8f Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 25 Jul 2012 11:22:47 +0000 -Subject: sna: Add 'gmux_backlight' to list of known devices for backwards compatability - -Reported-by: Austin Lund <austin.lund@gmail.com> -References: https://bugs.freedesktop.org/show_bug.cgi?id=52423 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c -index ebecd21..a908596 100644 ---- a/src/sna/sna_display.c -+++ b/src/sna/sna_display.c -@@ -292,6 +292,7 @@ static void - sna_output_backlight_init(xf86OutputPtr output) - { - static const char *known_interfaces[] = { -+ "gmux_backlight", - "asus-laptop", - "asus-nb-wmi", - "eeepc", --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-mach64/git_fixes.diff b/extra/xf86-video-mach64/git_fixes.diff deleted file mode 100644 index aad11772e..000000000 --- a/extra/xf86-video-mach64/git_fixes.diff +++ /dev/null @@ -1,107 +0,0 @@ -From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@gmail.com> -Date: Wed, 18 Jul 2012 08:46:49 +0000 -Subject: mach64: fix build on 32-bit. - -tvout code only builds on 32-bit, fix build. - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/atiscreen.c b/src/atiscreen.c -index 2957877..b1fbd3c 100644 ---- a/src/atiscreen.c -+++ b/src/atiscreen.c -@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL) - #ifdef TV_OUT - /* Fix-up TV out after ImpacTV probe */ - if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO) -- ATISwitchMode(0, pScreenInfo->currentMode, 0); -+ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode)); - #endif /* TV_OUT */ - - #ifdef XF86DRI_DEVEL --- -cgit v0.9.0.2-2-gbebe -From 104e3e067a7dcac143cb672fe42d56396ba6087b Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 26 Sep 2012 20:21:25 +0000 -Subject: Don't gratuitously disable Render when ShadowFBing - -There's no reason to do this, and I am at a loss to explain why that was -ever done. The first instance of this logic comes from xfree86 (over 11 -years ago!): - -http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16 - -Now, cfb never had Render support, so that might make some sense if -there was an intermediate uncommitted state where the driver used fb for -direct but cfb for shadowed. But that's really the only plausible -explanation I can think of. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/atiscreen.c b/src/atiscreen.c -index b1fbd3c..62a4dd9 100644 ---- a/src/atiscreen.c -+++ b/src/atiscreen.c -@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL) - } - } - -- /* If applicable, initialise RENDER extension */ -+ /* initialise RENDER extension */ -+ if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1)) - { -- if (pATI->OptionShadowFB) -- { -- if (serverGeneration == 1) -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -- "RENDER extension not supported with a shadowed" -- " framebuffer.\n"); -- } -- else if (!fbPictureInit(pScreen, NULL, 0) && -- (serverGeneration == 1)) -- { -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -- "RENDER extension initialisation failed.\n"); -- } -+ xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -+ "RENDER extension initialisation failed.\n"); - } - - xf86SetBlackWhitePixels(pScreen); --- -cgit v0.9.0.2-2-gbebe -From 42c4e423eec789606eec9703be23a9fd4483a14a Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 02 Oct 2012 14:19:47 +0000 -Subject: Fix build with neither XAA nor EXA against xserver 1.13.0 - -Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined -before compat-api.h is parsed, otherwise you fail with: - -In file included from /usr/include/xorg/picturestr.h:28:0, - from /usr/include/xorg/exa.h:38, - from atimach64accel.h:31, - from atiscreen.c:46: -/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token -/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token -/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token -/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/atistruct.h b/src/atistruct.h -index 702360b..98dc15e 100644 ---- a/src/atistruct.h -+++ b/src/atistruct.h -@@ -51,6 +51,7 @@ - - #endif /* TV_OUT */ - -+#include "picturestr.h" - #ifdef USE_EXA - #include "exa.h" - #endif --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-nv/git_fixes.patch b/extra/xf86-video-nv/git_fixes.patch deleted file mode 100644 index 059ccf56e..000000000 --- a/extra/xf86-video-nv/git_fixes.patch +++ /dev/null @@ -1,234 +0,0 @@ -From cb93a9b513b5814b18594de7a3b67bb225fb9c34 Mon Sep 17 00:00:00 2001 -From: Jesse Adkins <jesserayadkins@gmail.com> -Date: Tue, 28 Sep 2010 20:29:51 +0000 -Subject: Purge cvs tags. - -Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/man/nv.man b/man/nv.man -index 228f1da..c679803 100644 ---- a/man/nv.man -+++ b/man/nv.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man,v 1.30 2006/06/16 00:19:32 mvojkovi Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH NV __drivermansuffix__ __vendorversion__ --- -cgit v0.9.0.2-2-gbebe -From d7727e5307c5c3fd0dbc51394893385cb3b01101 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 30 Oct 2010 16:39:39 +0000 -Subject: Sun's copyrights now belong to Oracle - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/man/Makefile.am b/man/Makefile.am -index b3688ce..e39d1fc 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,5 @@ - # --# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - # - # Permission is hereby granted, free of charge, to any person obtaining a - # copy of this software and associated documentation files (the "Software"), -@@ -19,7 +19,7 @@ - # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - # DEALINGS IN THE SOFTWARE. --# -+# - - drivermandir = $(DRIVER_MAN_DIR) - --- -cgit v0.9.0.2-2-gbebe -From 95108089e22d33723488baba22467f2f3c4f1bf6 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 30 Oct 2010 16:53:33 +0000 -Subject: Correct copyright date in previous commit - -Oops, pasted in the new template and forgot to restore the original date - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/man/Makefile.am b/man/Makefile.am -index e39d1fc..1ea26b3 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - # - # Permission is hereby granted, free of charge, to any person obtaining a - # copy of this software and associated documentation files (the "Software"), --- -cgit v0.9.0.2-2-gbebe -From 2b17d1ac579ee426f631f4c62c9f0cf617a06e51 Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois <kibi@debian.org> -Date: Wed, 02 Mar 2011 01:09:10 +0000 -Subject: Fix compiler warning. - -Get rid of this with CFLAGS="-Wall -Werror": -| CC g80_display.lo -| cc1: warnings being treated as errors -| g80_display.c: In function â€G80CrtcSetPClk’: -| g80_display.c:216: error: unused variable â€i’ - -Signed-off-by: Cyril Brulebois <kibi@debian.org> -Signed-off-by: Aaron Plattner <aplattner@nvidia.com> -Reviewed-by: Aaron Plattner <aplattner@nvidia.com> -Tested-by: Aaron Plattner <aplattner@nvidia.com> ---- -diff --git a/src/g80_display.c b/src/g80_display.c -index ae946a8..84e731c 100644 ---- a/src/g80_display.c -+++ b/src/g80_display.c -@@ -213,7 +213,7 @@ G80CrtcSetPClk(xf86CrtcPtr crtc) - if(pNv->architecture <= 0xa0 || - pNv->architecture == 0xaa || - pNv->architecture == 0xac) { -- int lo_n, lo_m, hi_n, hi_m, p, i; -+ int lo_n, lo_m, hi_n, hi_m, p; - CARD32 lo = pNv->reg[(0x00614104+headOff)/4]; - CARD32 hi = pNv->reg[(0x00614108+headOff)/4]; - --- -cgit v0.9.0.2-2-gbebe -From 4b03459a835ee43d940054cbdaefa7c330bff385 Mon Sep 17 00:00:00 2001 -From: Nicolas Kaiser <nikai@nikai.net> -Date: Mon, 25 Apr 2011 11:26:33 +0000 -Subject: remove duplicated includes - -Remove duplicated includes of guarded headers. - -Signed-off-by: Nicolas Kaiser <nikai@nikai.net> -Reviewed-by: Aaron Plattner <aplattner@nvidia.com> -Signed-off-by: Aaron Plattner <aplattner@nvidia.com> ---- -diff --git a/src/g80_type.h b/src/g80_type.h -index 9bb07a4..270e383 100644 ---- a/src/g80_type.h -+++ b/src/g80_type.h -@@ -5,7 +5,6 @@ - #include <xf86Cursor.h> - #include <xf86DDC.h> - #include <xf86Crtc.h> --#include <xf86int10.h> - - #define G80_NUM_I2C_PORTS 10 - -diff --git a/src/riva_include.h b/src/riva_include.h -index 04c35a6..16fd40d 100644 ---- a/src/riva_include.h -+++ b/src/riva_include.h -@@ -50,7 +50,6 @@ - #include "vgaHW.h" - - #include "xf86Cursor.h" --#include "xf86DDC.h" - - #include "region.h" - --- -cgit v0.9.0.2-2-gbebe -From 5b7f07f8171dd5ca4f13d7da25d7d91140b036e1 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 19 Dec 2011 21:55:30 +0000 -Subject: Make failure to XAA non-fatal - -Fall back to NoAccel on G80 since there's no shadowfb support there, -otherwise fall to shadowfb. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/g80_driver.c b/src/g80_driver.c -index 551abe3..35e5d7e 100644 ---- a/src/g80_driver.c -+++ b/src/g80_driver.c -@@ -429,10 +429,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) - if(!pNv->NoAccel) { - switch(pNv->AccelMethod) { - case XAA: -- if(!xf86LoadSubModule(pScrn, "xaa")) goto fail; -+ if(!xf86LoadSubModule(pScrn, "xaa")) pNv->NoAccel = 1; - break; - case EXA: -- if(!xf86LoadSubModule(pScrn, "exa")) goto fail; -+ if(!xf86LoadSubModule(pScrn, "exa")) pNv->NoAccel = 1; - break; - } - } -diff --git a/src/nv_driver.c b/src/nv_driver.c -index 3031f8b..195299a 100644 ---- a/src/nv_driver.c -+++ b/src/nv_driver.c -@@ -2048,9 +2048,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) - /* Load XAA if needed */ - if (!pNv->NoAccel) { - if (!xf86LoadSubModule(pScrn, "xaa")) { -- xf86FreeInt10(pNv->pInt); -- NVFreeRec(pScrn); -- return FALSE; -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadwwfb\n"); -+ pNv->NoAccel = 1; -+ pNv->ShadowFB = 1; - } - } - -diff --git a/src/riva_driver.c b/src/riva_driver.c -index e33a7f3..f0fcab4 100644 ---- a/src/riva_driver.c -+++ b/src/riva_driver.c -@@ -769,9 +769,9 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) - /* Load XAA if needed */ - if (!pRiva->NoAccel) { - if (!xf86LoadSubModule(pScrn, "xaa")) { -- xf86FreeInt10(pRiva->pInt); -- RivaFreeRec(pScrn); -- return FALSE; -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); -+ pRiva->NoAccel = 1; -+ pRiva->ShadowFB = 1; - } - } - --- -cgit v0.9.0.2-2-gbebe -From b3d61828837661c9b383378a7d6006752659108b Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 19 Dec 2011 21:57:40 +0000 -Subject: Fix for new vgahw ABI - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/nv_driver.c b/src/nv_driver.c -index 195299a..527ae5f 100644 ---- a/src/nv_driver.c -+++ b/src/nv_driver.c -@@ -1543,6 +1543,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) - xf86FreeInt10(pNv->pInt); - return FALSE; - } -+ vgaHWSetStdFuncs(VGAHWPTR(pScrn)); - - /* We use a programmable clock */ - pScrn->progClock = TRUE; -diff --git a/src/riva_driver.c b/src/riva_driver.c -index f0fcab4..b52f476 100644 ---- a/src/riva_driver.c -+++ b/src/riva_driver.c -@@ -484,6 +484,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) - xf86FreeInt10(pRiva->pInt); - return FALSE; - } -+ vgaHWSetStdFuncs(VGAHWPTR(pScrn)); - - /* We use a programmable clock */ - pScrn->progClock = TRUE; --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-rendition/rendition-4.2.4-git.patch b/extra/xf86-video-rendition/rendition-4.2.4-git.patch deleted file mode 100644 index 26cff2fd3..000000000 --- a/extra/xf86-video-rendition/rendition-4.2.4-git.patch +++ /dev/null @@ -1,809 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5091e50..f74b912 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,45 +20,45 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-rendition], -- 4.2.4, -+ [4.2.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-rendition) -- -+ [xf86-video-rendition]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) - - # Checks for libraries. -@@ -78,17 +78,16 @@ fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - - # Checks for header files. --AC_HEADER_STDC - AC_CHECK_HEADERS([elf.h] [elf_abi.h]) - --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=rendition - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 8f2454b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -+ -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -+ - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/rendition.man b/man/rendition.man -index 3658ab0..afeee91 100644 ---- a/man/rendition.man -+++ b/man/rendition.man -@@ -1,4 +1,3 @@ --.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH RENDITION __drivermansuffix__ __vendorversion__ -diff --git a/src/accelX.c b/src/accelX.c -index a499c56..ed4964e 100644 ---- a/src/accelX.c -+++ b/src/accelX.c -@@ -289,7 +289,7 @@ int - RENDITIONInitUcode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - if (0 == verite_getstride(pScreenInfo, NULL, - &pRendition->board.mode.stride0, -@@ -367,7 +367,7 @@ void - RENDITIONRestoreUcode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - vu8 memend; - -@@ -410,7 +410,7 @@ void - RENDITIONSaveUcode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - vu8 memend; - - #ifdef DEBUG -@@ -445,7 +445,7 @@ void - RENDITIONSyncV1000(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - int c; - -@@ -555,7 +555,7 @@ RENDITIONSubsequentScreenToScreenCopy(ScrnInfoPtr pScreenInfo, - int w, int h) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - - #ifdef DEBUG -@@ -607,7 +607,7 @@ RENDITIONSubsequentSolidFillRect(ScrnInfoPtr pScreenInfo, - int x, int y, int w, int h) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - - #ifdef DEBUG -@@ -639,7 +639,7 @@ RENDITIONSubsequentTwoPointLine(ScrnInfoPtr pScreenInfo, - int bias) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - - #ifdef DEBUG -diff --git a/src/rendition.c b/src/rendition.c -index 7a9e18b..3202b49 100644 ---- a/src/rendition.c -+++ b/src/rendition.c -@@ -330,7 +330,7 @@ renditionProbe(DriverPtr drv, int flags) - renditionChipsets, renditionPCIchipsets, - devSections, numDevSections, drv, &usedChips); - -- xfree(devSections); -+ free(devSections); - if (numUsed <= 0) - return FALSE; - -@@ -359,7 +359,7 @@ renditionProbe(DriverPtr drv, int flags) - foundScreen=TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - return foundScreen; - } -@@ -400,7 +400,7 @@ renditionGetRec(ScrnInfoPtr pScreenInfo) - sleep(1); - #endif - if (!pScreenInfo->driverPrivate) -- pScreenInfo->driverPrivate=xcalloc(sizeof(renditionRec), 1); -+ pScreenInfo->driverPrivate=calloc(sizeof(renditionRec), 1); - - /* perhaps some initialization? <ml> */ - -@@ -421,7 +421,7 @@ renditionFreeRec(ScrnInfoPtr pScreenInfo) - #endif - if (xf86LoaderCheckSymbol("vgaHWFreeHWRec")) - vgaHWFreeHWRec(pScreenInfo); -- xfree(pScreenInfo->driverPrivate); -+ free(pScreenInfo->driverPrivate); - pScreenInfo->driverPrivate=NULL; - - #ifdef DEBUG -@@ -596,7 +596,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) - /* collect all of the options flags and process them */ - - xf86CollectOptions(pScreenInfo, NULL); -- if (!(pRendition->Options = xalloc(sizeof(renditionOptions)))) -+ if (!(pRendition->Options = malloc(sizeof(renditionOptions)))) - return FALSE; - memcpy(pRendition->Options, renditionOptions, sizeof(renditionOptions)); - xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options, -@@ -663,7 +663,11 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) - vgaHWGetIOBase(pvgaHW); /* Get VGA I/O base */ - - pRendition->board.accel=0; -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pRendition->board.vgaio_base = pvgaHW->PIOOffset; -+#else -+ pRendition->board.vgaio_base = 0; -+#endif - pRendition->board.io_base = pRendition->board.vgaio_base - #ifdef XSERVER_LIBPCIACCESS - + pRendition->PciInfo->regions[1].base_addr; -@@ -1167,7 +1171,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pRendition->board.shadowPitch - = BitmapBytePad(pScreenInfo->bitsPerPixel * width); - pRendition->board.shadowPtr -- = xalloc(pRendition->board.shadowPitch * height); -+ = malloc(pRendition->board.shadowPitch * height); - displayWidth = pRendition->board.shadowPitch - / (pScreenInfo->bitsPerPixel >> 3); - FBBase = pRendition->board.shadowPtr; -@@ -1484,7 +1488,7 @@ static xf86MonPtr - renditionDDC (ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu32 temp; - - xf86MonPtr MonInfo = NULL; -@@ -1517,7 +1521,7 @@ static unsigned int - renditionDDC1Read (ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu32 value = 0; - - /* wait for Vsync */ -diff --git a/src/v1krisc.c b/src/v1krisc.c -index 2554263..9b7b4e2 100644 ---- a/src/v1krisc.c -+++ b/src/v1krisc.c -@@ -83,20 +83,20 @@ - * local function prototypes - */ - --static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask); --static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask); -+static void verite_iopoll(unsigned long port, vu32 data, vu32 mask); -+static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask); - --static vu32 readRF(IOADDRESS io_base, vu8 index); --static void writeRF(IOADDRESS io_base, vu8 index, vu32 data); -+static vu32 readRF(unsigned long io_base, vu8 index); -+static void writeRF(unsigned long io_base, vu8 index, vu32 data); - --static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type); --static void risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type); -+static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type); -+static void risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type); - - #if 0 --static void risc_step(IOADDRESS io_base, vu32 count); -+static void risc_step(unsigned long io_base, vu32 count); - #endif --static void risc_forcestep(IOADDRESS io_base, vu32 instruction); --static void risc_continue(IOADDRESS io_base); -+static void risc_forcestep(unsigned long io_base, vu32 instruction); -+static void risc_continue(unsigned long io_base); - - - -@@ -113,7 +113,7 @@ void - v1k_start(ScrnInfoPtr pScreenInfo, vu32 pc) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - - v1k_stop(pScreenInfo); - risc_forcestep(io_base, NOP_INSTR); -@@ -152,7 +152,7 @@ v1k_stop(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - vu8 debugreg, statusreg; -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - vu16 STATUS = 0x4A; /* v2x00 io register offset */ - int c; - -@@ -207,7 +207,7 @@ v1k_flushicache(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - vu32 c, p1, p2; -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - - /* first flush store accumulation buffers so data is all in memory */ - p1=risc_readmem(io_base, 0, READ_WORD); -@@ -255,7 +255,7 @@ void - v1k_softreset(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - - verite_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC); - verite_out8(io_base+STATEINDEX, STATEINDEX_PC); -@@ -300,12 +300,12 @@ v1k_getriscprocs(verite_board_desc *boardDesc) - */ - - /* -- * static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) -+ * static void verite_iopoll(unsigned long port, vu32 data, vu32 mask) - * - * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached. - */ - static void --verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) -+verite_iopoll(unsigned long port, vu32 data, vu32 mask) - { - vu32 c; - -@@ -320,12 +320,12 @@ verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) - - - /* -- * static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) -+ * static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask) - * - * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached. - */ - static void --verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) -+verite_iopoll8(unsigned long port, vu8 data, vu8 mask) - { - vu32 c; - -@@ -340,12 +340,12 @@ verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) - - - /* -- * static vu32 readRF(IOADDRESS io_base, vu8 index) -+ * static vu32 readRF(unsigned long io_base, vu8 index) - * - * Reads data from register file. - */ - static vu32 --readRF(IOADDRESS io_base, vu8 index) -+readRF(unsigned long io_base, vu8 index) - { - vu32 data, instr; - vu8 debug, stateindex; -@@ -378,12 +378,12 @@ readRF(IOADDRESS io_base, vu8 index) - - - /* -- * static void writeRF(IOADDRESS io_base, vu8 index, vu32 data) -+ * static void writeRF(unsigned long io_base, vu8 index, vu32 data) - * - * Set RF register, being careful on how to set regs below 64. - */ - static void --writeRF(IOADDRESS io_base, vu8 index, vu32 data) -+writeRF(unsigned long io_base, vu8 index, vu32 data) - { - vu8 special=0; - -@@ -417,12 +417,12 @@ writeRF(IOADDRESS io_base, vu8 index, vu32 data) - - - /* -- * static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) -+ * static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type) - * - * NOTE: Assumes RISC is in hold mode. - */ - static vu32 --risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) -+risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type) - { - vu32 data; - -@@ -445,12 +445,12 @@ risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) - - - /* -- * static vu32 risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) -+ * static vu32 risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type) - * - * NOTE: Assumes RISC is in hold mode. - */ - static void --risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) -+risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type) - { - writeRF(io_base, RISC_RA, addr); /* point to memory */ - writeRF(io_base, RISC_FP, data); /* set data */ -@@ -466,12 +466,12 @@ risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) - - #if 0 - /* -- * static void risc_step(IOADDRESS io_base, vu32 count) -+ * static void risc_step(unsigned long io_base, vu32 count) - * - * Single step the RISC. NOTE: Do not force instruction into RISCIR! - */ - static void --risc_step(IOADDRESS io_base, vu32 count) -+risc_step(unsigned long io_base, vu32 count) - { - vu32 c, d; - vu8 debugreg; -@@ -494,12 +494,12 @@ risc_step(IOADDRESS io_base, vu32 count) - - - /* -- * static void risc_forcestep(IOADDRESS io_base, vu32 instruction) -+ * static void risc_forcestep(unsigned long io_base, vu32 instruction) - * - * Single step RISC; force instruction; assumes RISC held. - */ - static void --risc_forcestep(IOADDRESS io_base, vu32 instruction) -+risc_forcestep(unsigned long io_base, vu32 instruction) - { - vu32 c; - vu8 debugreg, stateindex; -@@ -525,12 +525,12 @@ risc_forcestep(IOADDRESS io_base, vu32 instruction) - - - /* -- * static void risc_continue(IOADDRESS io_base) -+ * static void risc_continue(unsigned long io_base) - * - * Turn off hold bit. - */ - static void --risc_continue(IOADDRESS io_base) -+risc_continue(unsigned long io_base) - { - vu8 debugreg; - -diff --git a/src/vboard.c b/src/vboard.c -index 49499e2..622715f 100644 ---- a/src/vboard.c -+++ b/src/vboard.c -@@ -38,7 +38,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu8 *vmb; - vu32 offset; - vu8 memendian; -@@ -207,7 +207,7 @@ void - verite_check_csucode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu8 *vmb; - vu32 offset; - int c; -diff --git a/src/vgafont-std.data b/src/vgafont-std.data -index db63ea8..c47983f 100644 ---- a/src/vgafont-std.data -+++ b/src/vgafont-std.data -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.3 1999/10/13 04:21:22 dawes Exp $ */ - #ifndef __VGAFONT_STD__ - #define __VGAFONT_STD__ - -diff --git a/src/vgafont-vrx.data b/src/vgafont-vrx.data -index ad34582..23b5908 100644 ---- a/src/vgafont-vrx.data -+++ b/src/vgafont-vrx.data -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */ - #ifndef __VGAFONT_VRX__ - #define __VGAFONT_VRX__ - -diff --git a/src/vgapalette.data b/src/vgapalette.data -index 5267608..106028d 100644 ---- a/src/vgapalette.data -+++ b/src/vgapalette.data -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */ - #ifndef __VGAPALETTE__ - #define __VGAPALETTE__ - -diff --git a/src/vloaduc.c b/src/vloaduc.c -index 67bf901..5c6aab0 100644 ---- a/src/vloaduc.c -+++ b/src/vloaduc.c -@@ -103,7 +103,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - sz=SW16(ehdr.e_phentsize); - num=SW16(ehdr.e_phnum); - if (0!=sz && 0!=num) { -- orig_pphdr=pphdr=(Elf32_Phdr *)xalloc(sz*num); -+ orig_pphdr=pphdr=(Elf32_Phdr *)malloc(sz*num); - if (!pphdr) { - ErrorF("RENDITION: Cannot allocate global memory (1)\n"); - close(fd); -@@ -125,7 +125,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - sz=SW16(ehdr.e_shentsize); - num=SW16(ehdr.e_shnum); - if (0!=sz && 0!=num) { -- orig_pshdr=pshdr=(Elf32_Shdr *)xalloc(sz*num); -+ orig_pshdr=pshdr=(Elf32_Shdr *)malloc(sz*num); - if (!pshdr) { - ErrorF("RENDITION: Cannot allocate global memory (2)\n"); - close(fd); -@@ -148,7 +148,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - loadSegment2board(pScreenInfo, fd, pphdr); - pphdr=(Elf32_Phdr *)(((char *)pphdr)+sz); - } while (--num); -- xfree(orig_pphdr); -+ free(orig_pphdr); - } - else { - do { -@@ -158,7 +158,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - loadSection2board(pScreenInfo, fd, pshdr); - pshdr=(Elf32_Shdr *)(((char *)pshdr)+sz); - } while (--num) ; -- xfree(orig_pshdr); -+ free(orig_pshdr); - } - close(fd); - -@@ -195,7 +195,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr) - return; - } - -- data=(vu8 *)xalloc(size); -+ data=(vu8 *)malloc(size); - if (NULL == data){ - ErrorF("RENDITION: GlobalAllocPtr couldn't allocate %lx bytes", - (unsigned long)size); -@@ -210,7 +210,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr) - - mmve(pScreenInfo, size, data, physAddr); - -- xfree(data); -+ free(data); - } - - -diff --git a/src/vmodes.c b/src/vmodes.c -index c0bd0df..f2dae0b 100644 ---- a/src/vmodes.c -+++ b/src/vmodes.c -@@ -20,6 +20,7 @@ - #include "v1kregs.h" - #include "v2kregs.h" - -+#include <unistd.h> - - #undef DEBUG - -@@ -201,7 +202,7 @@ struct V1000ClocksStr { - * local function prototypes - */ - --static void set_PLL(IOADDRESS iob, vu32 value); -+static void set_PLL(unsigned long iob, vu32 value); - static double V1000CalcClock(double target, int *M, int *N, int *P); - static double V2200CalcClock(double target, int *m, int *n, int *p); - -@@ -509,13 +510,13 @@ verite_getstride(ScrnInfoPtr pScreenInfo, int *width, - */ - - /* -- * void set_PLL(IOADDRESS iob, vu32 value) -+ * void set_PLL(unsigned long iob, vu32 value) - * - * Set PLL clock to desired frequency for the V1000. - */ - - void --set_PLL(IOADDRESS iob, vu32 value) -+set_PLL(unsigned long iob, vu32 value) - { - vu32 ulD; - int b; -diff --git a/src/vos.h b/src/vos.h -index 7b55f77..999c870 100644 ---- a/src/vos.h -+++ b/src/vos.h -@@ -23,18 +23,18 @@ - /* - * function prototypes - */ --#define /*void*/ verite_out8(/*IOADDRESS*/ port, /*vu8*/ data) \ -+#define /*void*/ verite_out8(/*unsigned long*/ port, /*vu8*/ data) \ - outb(port, data) - --#define /*void*/ verite_out16(/*IOADDRESS*/ port, /*vu16*/ data) \ -+#define /*void*/ verite_out16(/*unsigned long*/ port, /*vu16*/ data) \ - outw(port, data) - --#define /*void*/ verite_out32(/*IOADDRESS*/ port, /*vu32*/ data) \ -+#define /*void*/ verite_out32(/*unsigned long*/ port, /*vu32*/ data) \ - outl(port, data) - --#define /*vu8*/ verite_in8(/*IOADDRESS*/ io_base) ((vu8)inb(io_base)) --#define /*vu16*/ verite_in16(/*IOADDRESS*/ io_base) ((vu16)inw(io_base)) --#define /*vu32*/ verite_in32(/*IOADDRESS*/ io_base) ((vu32)inl(io_base)) -+#define /*vu8*/ verite_in8(/*unsigned long*/ io_base) ((vu8)inb(io_base)) -+#define /*vu16*/ verite_in16(/*unsigned long*/ io_base) ((vu16)inw(io_base)) -+#define /*vu32*/ verite_in32(/*unsigned long*/ io_base) ((vu32)inl(io_base)) - - /* memory accesses */ - #define verite_read_memory32(base, offset) MMIO_IN32(base, offset) -diff --git a/src/vramdac.c b/src/vramdac.c -index 7c8acbd..21c1df7 100644 ---- a/src/vramdac.c -+++ b/src/vramdac.c -@@ -93,11 +93,11 @@ - * local function prototypes - */ - --static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data); --static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data); -+static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data); -+static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data); - #if 0 --static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask); --static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask); -+static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask); -+static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask); - #endif - - /* -@@ -159,7 +159,7 @@ int - verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - vu8 cmd0,cmd1,cmd2; - vu8 cmd3_data=0; - -@@ -271,7 +271,7 @@ verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size) - BT485_3_COLOR_CURSOR, BT485_X_WINDOW_CURSOR }; - static vu8 csizes[]={ BT485_32_BY_32_CURSOR, BT485_64_BY_64_CURSOR }; - -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - - #ifdef DEBUG - ErrorF ("Rendition: Debug verite_enablecursor called type=0x%x\n",type); -@@ -304,7 +304,7 @@ void - verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - - x+=Cursor_size-xo; - y+=Cursor_size-yo; -@@ -327,7 +327,7 @@ void - verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 fg, vu32 bg) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - - #ifdef DEBUG - ErrorF ("Rendition: Debug verite_setcursorcolor called FG=0x%x BG=0x%x\n", -@@ -374,7 +374,7 @@ verite_loadcursor(ScrnInfoPtr pScreenInfo, vu8 size, vu8 *cursorimage) - int c, bytes, row; - vu8 *src = cursorimage; - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - vu8 tmp; - vu8 memend; /* Added for byte-swap fix */ - -@@ -454,7 +454,7 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices, - LOCO *colors, VisualPtr pVisual) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu32 crtc_status; - int i, index; - -@@ -485,12 +485,12 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices, - */ - - /* -- * static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data) -+ * static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data) - * - * - */ - static void --Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data) -+Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data) - { - vu8 tmp; - -@@ -501,12 +501,12 @@ Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data) - - - /* -- * static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data) -+ * static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data) - * - * - */ - static void --Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data) -+Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data) - { - /* - * Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x80); -@@ -522,24 +522,24 @@ Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data) - - #if 0 - /* -- * static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask) -+ * static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask) - * - * - */ - static vu8 --Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask) -+Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask) - { - return verite_in8(port+reg)&mask; - } - - - /* -- * static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask) -+ * static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask) - * - * - */ - static vu8 --Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask) -+Bt485_read_cmd3_masked(unsigned long port, vu8 mask) - { - vu8 value; - -diff --git a/src/vtypes.h b/src/vtypes.h -index 257870b..e4ad468 100644 ---- a/src/vtypes.h -+++ b/src/vtypes.h -@@ -123,7 +123,7 @@ struct verite_board_t { - vu16 chip; - - /* */ -- IOADDRESS io_base, vgaio_base; -+ unsigned long io_base, vgaio_base; - vu32 mmio_base; - vu32 vmmio_base; - vu32 mem_size; diff --git a/extra/xf86-video-s3/LICENSE b/extra/xf86-video-s3/LICENSE deleted file mode 100644 index a4c8d5dd4..000000000 --- a/extra/xf86-video-s3/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - - Copyright 2001 Ani Joshi <ajoshi@unixbox.com> - - XFree86 4.x driver for S3 chipsets - - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation and -that the name of Ani Joshi not be used in advertising or -publicity pertaining to distribution of the software without specific, -written prior permission. Ani Joshi makes no representations -about the suitability of this software for any purpose. It is provided -"as-is" without express or implied warranty. - -ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL ANI JOSHI 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/extra/xf86-video-s3/git-fixes.patch b/extra/xf86-video-s3/git-fixes.patch deleted file mode 100644 index d6792f38e..000000000 --- a/extra/xf86-video-s3/git-fixes.patch +++ /dev/null @@ -1,502 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..458ab5f 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,70 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+ Copyright 2001 Ani Joshi <ajoshi@unixbox.com> - --Please submit updated COPYING files to the Xorg bugzilla: -+ XFree86 4.x driver for S3 chipsets - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+Permission to use, copy, modify, distribute, and sell this software and its -+documentation for any purpose is hereby granted without fee, provided that -+the above copyright notice appear in all copies and that both that copyright -+notice and this permission notice appear in supporting documentation and -+that the name of Ani Joshi not be used in advertising or -+publicity pertaining to distribution of the software without specific, -+written prior permission. Ani Joshi makes no representations -+about the suitability of this software for any purpose. It is provided -+"as-is" without express or implied warranty. -+ -+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+EVENT SHALL ANI JOSHI 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. -+Copyright 2007 George Sapountzis -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+ -+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal in -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of the XFree86 Project shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization from the XFree86 Project. -+ -+ -+Copyright 1995-1997 The XFree86 Project, Inc. -+Copyright (c) 1999,2000 The XFree86 Project Inc. - --http://lists.freedesktop.org/mailman/listinfo/xorg -diff --git a/ChangeLog b/ChangeLog -deleted file mode 100644 -index ad0b227..0000000 ---- a/ChangeLog -+++ /dev/null -@@ -1,133 +0,0 @@ --2009-06-25 Evgeny M. zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- Revert the old behaviour when the BIOS settings are used for -- intialization of DRAM/VRAM timings, i. e. we don't touch the -- timings during initialization phase until any memory option (like -- slow_edodram) is specified. -- -- Add manual page. -- --2009-05-25 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- * src/s3_video.c: -- -- Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for -- testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by -- overriding Chipset with "Trio64UV+" but not on real hardware). -- -- S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId -- as Trio32/64 but only with chip revision greater or eq 0x40. So if -- you have problems with NewMMIO, you may override ChipRev in "Device" -- section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO -- also disables overlay video (Xv) because it isn't implemented for -- Old MMIO yet. -- --2009-05-04 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- * src/s3_shadow.c: -- -- Add shadowFB option. It can be used to speedup drawing when -- hardware acceleration is undesirable or unavailable (for colour depth -- 24 with 24 bpp framebuffer, for example). shadowFB is disabled by -- default. Enabling shadowFB option disables HW acceleration. Thanks -- to Egor Ivanov for initial porting of shadowFB from s3virge. -- -- Interlace mode support. -- -- Close bug #14999. -- --2008-07-06 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_video.c: -- -- Streams Processor initialization. -- -- XVideo support for 16, 24 and 32 bpp (only for TRIO64V2). -- -- * src/s3_driver.c: -- -- Add XVideo option (enabled by default). -- -- Replace "swcursor" by "hwcursor" option (HW cursor -- not implemented yet for all chipsets). -- -- Close bug #5527: 24-bit colour depth support (24bpp and -- 32bpp framebuffer) for TRIOs. Acceleration doesn't work -- with packed colour mode (24 bpp FB) but works with 32bpp -- framebuffer mode (hardware limitation? -- need data). -- -- Fix system hang-up when switching between console and X session. -- -- Some minor changes of driver messages. -- --2008-02-23 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly -- others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64 -- * src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make -- the 1024x768@16bpp mode work. -- Thanks to Richard Driscoll for these patches. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3.h: -- Bump to 0.4.1 for Xv changes. -- --2006-04-07 Aaron Plattner <aplattner@nvidia.com> -- -- * src/s3_video.c: (S3PutImage): -- Add a DrawablePtr argument to the XV functions to pave the way for -- redirected video. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3.h: -- * src/s3_IBMRGB.c: -- * src/s3_Ti.c: -- * src/s3_Trio64DAC.c: -- * src/s3_bios.c: -- * src/s3_cursor.c: -- * src/s3_dga.c: -- * src/s3_driver.c: -- * src/s3_video.c: -- Unlibcwrap. Bump server version requirement. Bump to 0.4.0. -- --2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version for X11R7 release. -- --2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for final X11R7 release candidate. -- --2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC3 release. -- --2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Remove extraneous AC_MSG_RESULT. -- --2005-11-29 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- Only build dlloader modules by default. -- --2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC2 release. -- --2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update pkgcheck dependencies to work with separate build roots. -diff --git a/Makefile.am b/Makefile.am -index 7052905..4c278ba 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,5 +18,15 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man -+MAINTAINERCLEANFILES = ChangeLog INSTALL -+ -+.PHONY: ChangeLog INSTALL -+ -+INSTALL: -+ $(INSTALL_CMD) -+ -+ChangeLog: -+ $(CHANGELOG_CMD) -+ -+dist-hook: ChangeLog INSTALL -diff --git a/configure.ac b/configure.ac -index 0eecc87..0ac34f9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,42 +20,50 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-s3], -- 0.6.3, -+ [0.6.3], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-s3) -- -+ [xf86-video-s3]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -- -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Checks for programs. -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS -+ -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC -+ -+# Checks for programs. -+AM_PROG_CC_C_O - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - SAVE_CPPFLAGS="$CPPFLAGS" -@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - [#include "xorg-server.h"]) - CPPFLAGS="$SAVE_CPPFLAGS" - --# Checks for header files. --AC_HEADER_STDC -- - if test "x$XSERVER_LIBPCIACCESS" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) - XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=s3 - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION -- --XORG_CHECK_LINUXDOC -- --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation. --# --# The above copyright notice and this permission notice shall be included --# in all copies or substantial portions of the Software. --# --# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --# OTHER DEALINGS IN THE SOFTWARE. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# Permission is hereby granted, free of charge, to any person obtaining a -+# copy of this software and associated documentation files (the "Software"), -+# to deal in the Software without restriction, including without limitation -+# the rights to use, copy, modify, merge, publish, distribute, sublicense, -+# and/or sell copies of the Software, and to permit persons to whom the -+# Software is furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice (including the next -+# paragraph) shall be included in all copies or substantial portions of the -+# Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+# DEALINGS IN THE SOFTWARE. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/src/s3.h b/src/s3.h -index 49b8a54..0875fc9 100644 ---- a/src/s3.h -+++ b/src/s3.h -@@ -113,7 +113,6 @@ typedef struct _S3Rec { - XAAInfoRecPtr pXAA; - xf86CursorInfoPtr pCurs; - xf86Int10InfoPtr pInt10; -- vbeInfoPtr pVBE; - XF86VideoAdaptorPtr adaptor; - S3PortPrivPtr portPrivate; - -diff --git a/src/s3_driver.c b/src/s3_driver.c -index 29e343d..2011dfc 100644 ---- a/src/s3_driver.c -+++ b/src/s3_driver.c -@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - S3Ptr pS3; - vgaHWPtr hwp; - ClockRangePtr clockRanges; -+ vbeInfoPtr pVBE; - rgb zeros = {0, 0, 0}; - Gamma gzeros = {0.0, 0.0, 0.0}; - int i, vgaCRIndex, vgaCRReg; -@@ -325,6 +326,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - return FALSE; - - hwp = VGAHWPTR(pScrn); -+ vgaHWSetStdFuncs(hwp); - vgaHWGetIOBase(hwp); - - pScrn->monitor = pScrn->confScreen->monitor; -@@ -436,9 +438,19 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - } - - if (xf86LoadSubModule(pScrn, "vbe")) { -- pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index); -+ pVBE = VBEInit(pS3->pInt10, pEnt->index); -+ vbeFree(pVBE); - } - -+ xf86LoadSubModule(pScrn, "fb"); -+ -+ if (!xf86LoadSubModule(pScrn, "xaa")) { -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "Falling back to shadowfb\n"); -+ pS3->NoAccel = TRUE; -+ pS3->shadowFB = TRUE; -+ } -+ - if (pS3->shadowFB) { - if (!xf86LoadSubModule(pScrn, "shadowfb")) { - S3FreeRec(pScrn); -@@ -726,11 +738,6 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - xf86PrintModes(pScrn); - xf86SetDpi(pScrn, 0, 0); - -- xf86LoadSubModule(pScrn, "fb"); -- -- if (!xf86LoadSubModule(pScrn, "xaa")) -- return FALSE; -- - return TRUE; - } - -diff --git a/src/s3_video.c b/src/s3_video.c -index 3e88889..9a2d458 100644 ---- a/src/s3_video.c -+++ b/src/s3_video.c -@@ -244,6 +244,8 @@ static XF86VideoAdaptorPtr S3SetupImageVideoOverlay(ScreenPtr pScreen) - XF86VideoAdaptorPtr adapt; - - adapt = S3AllocAdaptor(pScrn); -+ if (adapt == NULL) -+ return NULL; - - adapt->type = XvWindowMask | XvInputMask | XvImageMask; - adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT; diff --git a/extra/xf86-video-s3virge/git-fixes.patch b/extra/xf86-video-s3virge/git-fixes.patch deleted file mode 100644 index 4cf0a5637..000000000 --- a/extra/xf86-video-s3virge/git-fixes.patch +++ /dev/null @@ -1,1644 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..727ca51 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,60 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. - --Please submit updated COPYING files to the Xorg bugzilla: -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal in -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of the XFree86 Project shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization from the XFree86 Project. -+ -+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry, -+NH - All Rights Reserved -+ -+This code may be freely incorporated in any program without royalty, as long -+as the copyright notice stays intact. -+ -+Additions by Kevin E. Martin (martin@cs.unc.edu) -+ -+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+EVENT SHALL KEVIN E. MARTIN 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. -+ -+Copyright 2007 George Sapountzis -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. - --http://lists.freedesktop.org/mailman/listinfo/xorg -diff --git a/ChangeLog b/ChangeLog -deleted file mode 100644 -index 8ef0a7c..0000000 ---- a/ChangeLog -+++ /dev/null -@@ -1,69 +0,0 @@ --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3v_driver.c: -- Bump to 1.9.1 for Xv changes. -- --2006-04-07 Aaron Plattner <aplattner@nvidia.com> -- -- * src/s3v_xv.c: -- Add a DrawablePtr argument to the XV functions to pave the way for -- redirected video. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3v.h: -- * src/s3v_dga.c: -- * src/s3v_driver.c: -- * src/s3v_i2c.c: -- * src/s3v_shadow.c: -- Unlibcwrap. Bump server version requirement. Bump to 1.9.0. -- --2006-02-08 Luc Verhaegen <libv@skynet.be> -- -- * src/s3v.h: -- * src/s3v_driver.c: (S3VPreInit): -- -- Remove another insane use of pScrn->clock. Code ended up being ignored -- anyway. -- --2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version for X11R7 release. -- --2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for final X11R7 release candidate. -- --2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * man/Makefile.am: -- Change *man_SOURCES ==> *man_PRE to fix autotools warnings. -- --2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC3 release. -- --2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Remove extraneous AC_MSG_RESULT. -- --2005-11-29 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- Only build dlloader modules by default. -- --2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC2 release. -- --2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update pkgcheck dependencies to work with separate build roots. -diff --git a/Makefile.am b/Makefile.am -index 4443535..8467821 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,12 +18,17 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man -+MAINTAINERCLEANFILES = ChangeLog INSTALL - --if BUILD_LINUXDOC --README: README.sgml -- $(MAKE_TEXT) README.sgml && mv README.txt README --endif -+EXTRA_DIST = CALLMAP - --EXTRA_DIST = CALLMAP TODO_NOTES README.sgml -+.PHONY: ChangeLog INSTALL -+ -+INSTALL: -+ $(INSTALL_CMD) -+ -+ChangeLog: -+ $(CHANGELOG_CMD) -+ -+dist-hook: ChangeLog INSTALL -diff --git a/README b/README -index 72b75b2..036eec8 100644 ---- a/README -+++ b/README -@@ -1,112 +1,88 @@ --xf86-video-s3virge - S3 ViRGE video driver for the Xorg X server -- --Please submit bugs & patches to the Xorg bugzilla: -- -- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -- --All questions regarding this software should be directed at the --Xorg mailing list: -- -- http://lists.freedesktop.org/mailman/listinfo/xorg -- --The master development code repository can be found at: -- -- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-s3virge -- -- http://cgit.freedesktop.org/xorg/driver/xf86-video-s3virge -- --For more information on the git code manager, see: -- -- http://wiki.x.org/wiki/GitPage -- -------------------------------------------------------------------------- --What works: --- Supports 8bpp, 15/16bpp, 24bpp and 32bpp. Heavy testing on ViRGE DX. --- There is some known instability in ViRGE GX2, please report problems. --- Silken Mouse is enabled by default, use the generic server option of -- -nosilk to disable it. -- --XCONFIG options: -- --The driver supports quite a few different XConfig options, which can --be used to tune the driver and improve performance. Without any options, --the driver will use conservative settings which should work on most --hardware. Large improvements in performance are possible by selecting --the proper options, which will probably work on most systems. -- --Cursor: -- --- "hwcursor" "off" behaves exactly like "swcursor". Default: "on" --- "swcursor" will disable the HW Cursor. HW Cursor is used by default and -- no option is needed to enable it. -- --Display: --- "ShadowFB" Use shadow framebuffer. Disables HW acceleration. Default: off. --- "Rotate" " cw "|" ccw " Rotate the screen CW - clockwise or CCW - counter -- clockwise. Disables HW Acceleration and HW Cursor, uses ShadowFB. -- Default: no rotation. --- "XVideo" Disable XVideo support by using the off option. This changes FIFO -- settings which prevent screen noise for high-res modes. Default: on -- --Video memory: -- --- "slow_edodram" will switch the standard ViRGE to 2-cycle edo mode. Try this -- if you encounter pixel corruption on the ViRGE. Using this option will -- cause a large decrease in performance. --- "fpm_vram" will switch the ViRGE/VX to fast page mode vram mode --- "slow_dram " | " fast_dram" Change Trio 3D and 3D/2X memory options. -- Default: Use BIOS defaults. --- "early_ras_precharge", "late_ras_precharge" adjust memory parameters. One -- of these will us the same settings as your video card defaults, and -- using neither in the config file does the same. --- "set_mclk" sets the memory clock, format is: -- Option "set_mclk" "50000" -- in the XF86Config file. Valid values are any -- integer <= 100000, where 100000 == 100 MHz. --- "set_refclk" sets the ref clock for ViRGE MX, format is: -- Option "set_refclk" "50000" -- --Acceleration and graphic engine: -- --- "NoAccel" turns off all acceleration --- "fifo_aggressive", "fifo_moderate" and "fifo_conservative" alter the settings -- for the threshold at which the pixel FIFO takes over the internal -- memory bus to refill itself. The smaller this threshold, the better -- the acceleration performance of the card. You may try the fastest -- setting ("aggressive") and move down if you encounter pixel corruption. -- The optimal setting will probably depend on dot-clock and on color -- depth. Note that specifying any of these options will also alter other -- memory settings which should increase performance, so you should at -- least use "fifo_conservative" (this uses the chip defaults). --- Common XAA acceleration options to disable primitives for test purposes: -- "XaaNoScreenToScreenCopy" -- "XaaNoSolidFillRect" -- "XaaNoColor8x8PatternFillRect" -- "XaaNoImageWriteRect" -- "XaaNoPixmapCache" -- --PCI bus: --- "pci_burst" will enable PCI burst mode. This should work on all but a -- few "broken" PCI chipsets, and will increase performance. Option may -- take a parameter "on", "off", "yes", etc... --- "pci_retry" will allow the driver to rely on PCI Retry to program the -- ViRGE registers. "pci_burst" must be enabled for this to work. -- This will increase performance, especially for small fills/blits, -- because the driver does not have to poll the ViRGE before sending it -- commands to make sure it is ready. It should work on most -- recent PCI chipsets. -- --ViRGE MX LCD options: --- "lcd_center" --- "set_lcdclk" allows setting the clock for a ViRGE MX LCD display. Format is: -- Option "set_lcdclk" "30000" -- in the config file. Valid values are ? -- --Debug: --- "ShowCache" Enable or disable viewing offscreen cache memory. A -- development debug option. Default: off. --- "mx_cr3a_fix" Enable or disable a cr3a fix added for ViRGE MX. -- Default: on. -- -- --$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/README,v 1.9 2000/06/14 21:57:54 dawes Exp $ -+ Information for S3 ViRGE Users -+ The XFree86 Project Inc. -+ 19 Dec 2001 -+ ____________________________________________________________ -+ -+ Table of Contents -+ -+ -+ 1. Supported hardware -+ 2. Features: -+ 3. Configuration: -+ 4. Documentation: -+ 5. Support: -+ 6. Authors -+ -+ -+ ______________________________________________________________________ -+ -+ 1. Supported hardware -+ -+ The s3virge driver in X11R7.5 supports the S3 ViRGE, ViRGE DX, GX, -+ GX2, MX, MX+, and VX chipsets. It also supports Trio3D and Trio3D/2x -+ chips. A majority of testing is done on ViRGE DX chips, making them -+ the most stable to date. This release has added support for doublescan -+ modes on DX. -+ -+ This driver is moderately stable, however please use caution with any -+ new install. Please report any problems to bugzilla.freedesktop.org, -+ using the xorg component. -+ -+ -+ 2. Features: -+ -+ -+ -+ o Fully accelerated support for S3 ViRGE family video adapters -+ -+ o uses linear frame buffer -+ -+ o supports resolutions up to 2048x2048 -+ -+ o supports color depths of 8, 15, 16 and 24 -+ -+ o full use of video card memory for acceleration caching when visible -+ framebuffer leaves extra memory -+ -+ o XVideo on DX, GX, GX2, MX, MX+ and Trio3D/2X at depth 16 and 24 -+ -+ o Doublescan modes on DX, possibly others (untested) -+ -+ -+ 3. Configuration: -+ -+ -+ The driver auto-detects RAM size, RAMDAC and ClockChip. Do not bother -+ putting these in your "Device" section. -+ -+ -+ 4. Documentation: -+ -+ -+ The driver has several supported options which are documented in the -+ s3virge man page. Please refer to it for additional details about -+ configuration options. -+ -+ -+ 5. Support: -+ -+ For support with X11R7.5 video drivers please refer to our web site at -+ wiki.x.org <http://wiki.x.org>. -+ -+ -+ 6. Authors -+ -+ -+ -+ o Mark Vojkovich <mailto:mvojkovich@nvidia.com> -+ -+ o Sebastien Marineau -+ -+ o Harald Koenig <mailto:koenig@tat.physik.uni-tuebingen.de> -+ -+ o Matt Grossman <mailto:mattg@oz.net> -+ -+ o Kevin Brosius <mailto:cobra@compuserve.com> -+ -+ -+ -diff --git a/README.sgml b/README.sgml -deleted file mode 100644 -index e47b8c4..0000000 ---- a/README.sgml -+++ /dev/null -@@ -1,61 +0,0 @@ --<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [ --<!ENTITY % defs SYSTEM "defs.ent"> %defs; --]> -- --<article> --<title> Information for S3 ViRGE Users --<author>The XFree86 Project Inc. --<date>19 Dec 2001 -- --<ident> --</ident> -- --<toc> -- --<sect> Supported hardware --<p> --The s3virge driver in X11R&relvers; supports the S3 ViRGE, ViRGE DX, GX, GX2, MX, MX+, and VX chipsets. It also supports Trio3D and Trio3D/2x chips. A majority of testing is done on ViRGE DX chips, making them the most stable to date. This release has added support for doublescan modes on DX. -- --This driver is moderately stable, however please use caution with any new install. Please report any problems to bugzilla.freedesktop.org, using the xorg component. -- --<sect>Features: --<p> -- --<itemize> --<item>Fully accelerated support for S3 ViRGE family video adapters --<item>uses linear frame buffer --<item>supports resolutions up to 2048x2048 --<item>supports color depths of 8, 15, 16 and 24 --<item>full use of video card memory for acceleration caching when visible framebuffer leaves extra memory --<item>XVideo on DX, GX, GX2, MX, MX+ and Trio3D/2X at depth 16 and 24 --<item>Doublescan modes on DX, possibly others (untested) --</itemize> -- --<sect>Configuration: --<p> -- --The driver auto-detects RAM size, RAMDAC and ClockChip. Do not bother putting --these in your "Device" section. -- --<sect>Documentation: --<p> -- --The driver has several supported options which are documented in the s3virge man --page. Please refer to it for additional details about configuration options. -- --<sect>Support: --<p> --For support with X11R&relvers video drivers please refer to our web site at <url name="wiki.x.org" url="http://wiki.x.org">. -- --<sect>Authors --<p> -- --<itemize> --<item>Mark Vojkovich <email>mvojkovich@nvidia.com</email> --<item>Sebastien Marineau --<item>Harald Koenig <email>koenig@tat.physik.uni-tuebingen.de</email> --<item>Matt Grossman <email>mattg@oz.net</email> --<item>Kevin Brosius <email>cobra@compuserve.com</email> --</itemize> -- --</article> -diff --git a/TODO b/TODO -new file mode 100644 -index 0000000..de5920b ---- /dev/null -+++ b/TODO -@@ -0,0 +1,326 @@ -+S3 ViRGE 4.0 devel notes -+ -+ -+ -+Status -+------ -+1/26/2003 -+Ver 1.8.6 -+Pre-4.3.0 release. 320x240 doublescan support w/mouse adjust, -+power management printouts, DAC error printout fix, log XVideo status based -+on chipset, preliminary support for disabling XV when a mode doesn't -+support it. -+ -+5/18/2002 -+Ver 1.8.5 -+320x240 mode support (doublescan). -+ -+2/2/02 -+Ver 1.8.4 -+Make 320x240 mode work in depth 15 & 16. -+Testing, need to switch streams on/off based on dblscan_v flag and mode. -+Virge MX panel_on test (doesn't work.) -+ -+1/10/02 -+Ver 1.8.3 -+DGA fix, buffer pointer used wrong value. Submitted for 4.2.0 (late). -+ -+Ver 1.8.2 -+DPMS testing (display DPMS status, disable MX LCD panel), DGA testing. -+ -+11/11/01 KJB -+Ver 1.8.1 -+ViRGE MX (& GX2) fix to CR63 for problems with modes < 1024x768 from -+max <sunmax@libero.it>. Submitted for 4.2.0. -+ -+11/5/01 KJB -+Ver 1.8.0 -+ViRGE MX & GX2 XVideo changes. Fix overlap/color keying on MX, fix -+and enable GX2 XVideo. -+Submitted for 4.2.0. -+ -+11/4/01 KJB -+Ver 1.7.0 -+Bump version for 4.2.0. Update man and README. -+ -+11/3/01 KJB -+Ver 1.6.16 -+Pre-4.2.0 patch. cr3a fix, virge mx xvideo support, xvideo disable option -+(helps with high res modes on dx and screen noise), remove accel solid -+fill rect for trio3d, bring over some trio3d and mx fixes from 4.0.3 test -+drivers. Includes VERBLEV bump to 5 to remove register dumps in log file. -+ -+Ver 1.6.15 -+Experimental - Scanline color expand - GX2 -+ -+9/21/01 KJB -+Ver 1.6.14 -+ModeInit - cr3a for MX/GX2, don't clear reserved bit 0x40 (revert change). -+Back out previous cr3a patch for testing. -+ -+9/18/01 KJB -+Ver 1.6.13 -+Option "xvideo" added. Add patch provided by Sven Menke -+<Menke@SLAC.Stanford.EDU> for XV support on MX (slight changes to logic). -+ -+Ver 1.6.12 -+Adam J. Richter's cr3a fix (possibly temporary). -+ -+5/30/01 KJB -+Ver 1.6.10 -+Disable MaxHValue & MaxVValue setting. -+ -+1/03/01 KJB -+Ver 1.6.0 -+Revert ViRGE to pre-Xv changes. ViRGE DX still supports Xv, but changes -+added for Xv and ViRGE caused problems with normal display. -+ -+11/27/00 KJB -+Ver 1.5.0 -+Clean up, bump version for 4.0.2 submission. -+CR3A, bit 0x40 (reserved) cleared for MX/GX2. Update man page. -+ -+11/24/00 KJB -+Disable CPU to screen color expansion on GX2, causes lockups on GX2 with -+'locate html' in an xterm. Add WaitCmd code to prevent accelerator and -+reg command path activity at the same time on GX2. -+XVideo fixes, left side clipping fixed for video windows extending off left -+side of screen. Add horizontal filtering modes for 1-2x and >3x scaling. -+ -+11/7/00 KJB -+Ver 1.4.0 -+Enable MX fixes, testing with accel BLT_BUG set is worse on GX2, so left -+it out. BLT_BUG wasn't being enabled on ViRGE & VX because of case usage, -+enabled now. Re-enable silken mouse for GX2. Add Render/fbPicture support. -+Fix a few compiler warnings. -+ -+11/5/00 KJB -+Continued work on GX2, much stabler now, but I think there is a lockup case -+left if you enable pci_burst and pci_retry with accel. I still see screen -+flashes with vertical bars once in a while, and the log reports a GEReset. -+Added fbPicture (render) support, untested. XV code for GX2 is added, -+but not working yet. -+ -+10/29/00 KJB -+Much work on GX2, now SWCursor locks up but HWCursor is stable, go figure. -+Loading Netscape a couple times with the mail window was enough to lock it -+up twice in a row. Server was locked but not a box (PCI) lock. Also, -+vertical barring still occurred a couple times, so HW cursor wasn't causing -+that. Try blt_bug flag again for lock up case. And attach to debug server -+and bt... Sleep now... -+ -+10/21/00 KJB -+Ver 1.3.0 -+Depth 16 Xv support added. Testing on ViRGE DX. 1280x1024x24 is noisy, so -+needs FIFO tuning. -+ -+9/27/00 KJB -+Initial Xv support in depth 24. -+ -+9/10/00 KJB -+Convert to FB. Add option "UseFB", default true. Added -+VerticalRetraceWait timeout back as default. #if0 out the line accel -+code in s3v_accel.c. The Subsequent...Bresenham line code causes a lockup -+when used with fb. We didn't have any hardware accel in there anyway... -+ -+7/25/00 KJB -+Started Xv additions. -+ -+6/26/00 KJB -+GX2 seems to have an accel bug. I see the entire screen go solid color or -+a wide stripe pattern for about 1 second. The S3VGEReset gets called twice, -+and then everything is okay. Unless SilkenMouse is enabled... That seems to -+get you a server lock instead. Short term is to disable SilkenMouse for GX2 -+only. SilkenMouse isn't really the problem of course, it just happens that if -+we move the mouse during the 1 second engine lockup we appear more likely to -+never recover. -+ -+6/23/00 KJB -+Ver 1.2.0 - Fix console corruption on GX2 caused by reserved bit use in CR3A. -+Fix GX2 noise on screen in hi-res depth 24 by increasing FIFO fill threshold. -+ -+6/12/00 KJB -+Ver 1.1.0 - Add Init for SilkenMouse, add xf86SetBackingStore call, move -+int10Symbols[] to remove warnings. -+ -+3/3/00 KJB -+Ver 1.0.0 - S3VProbeDDC code for X -configure option added, add timeout to -+WAITIDLE macro in s3v_macros.h, change ImageWriteFlags adding NO_GXCOPY. -+Start of GX2 fixes, use CR regs for FIFO settings. Update copyrights. -+ -+2/11/00 KJB -+Ver 0.11.0 - Add cfb16/24BresS to module symbols to remove warnings. -+Fix viewport restore problem after EnterVT in 24 bpp. -+Clean up log output, removing register dumps from normal console log. -+ -+6/26/99 KJB -+Make the memory settings for fifo_conservative the default, 'fifo_conservative' -+does nothing additional now. Patch includes DGA2 additions below, non-working. -+Expected to be included in 3.9Pu. -+ -+Changes in 3.9Pt by others include additions for newer RAC support. Some reports -+say multi-head works now with ViRGE. -+ -+6/17/99 KJB -+Ver 0.9.0 - Prelim DGA2 support modeled after MGA. -+ -+5/28/99 KJB -+Ver 0.8.0 - Changes to 3.9Po - Cleaned up debug register printing function, minor -+changes to man page, remove S3V.sgml and add new s3virge.sgml in doc/sgml, also -+remove README.S3V from doc directory. -+ -+ -+4/5/99 KJB -+3.9Ph - Ver 0.7.0 - Virge man page added, HW Cursor fixed, rename chipsets removing -+slashes in the names. -+ -+03/27/99 KJB -+Ver 0.6.0 - hwcursor additions, added s3v_hwcurs.c and Option "swcursor". -+Default is hwcursor, Option "swcursor" will disable it. -+ -+Ver 0.5.0 - patch against 3.9Pf (seq 2615), fix depth 24 and Accel flags, sync pci_burst option to previous changes, remove s3v_comp.h and s3v_pio.c and merge as needed. -+ -+03/21/99 KJB -+3.9Pf has Matt Grossman's Alpha changes. -+For next patch - remove s3v_pio.c and s3v_comp.h. Include the EnableMMIO and -+DisableMMIO functions from s3v_pio.c in s3v_driver.c. -+ -+03/02/99 KJB -+3.9Pc - depth 24 doesn't work on my ViRGE DX. NoAccel doesn't start, accel does -+but has blocky noise. -+ -+03/01/99 KJB -+Macro change done, VGAIN/VGAOUT for register access, INREG/OUTREG for s3v_accel.c. -+Added Mark Vojkovich's re-write of the accel code. It may only be clean for ViRGE DX -+at the moment. x11perf showed a couple artifacts in 'move window via parent'. -+In progress, attempt to call cfbScreenInit() functions after MapMem/EnterVT. Not -+working yet. Version stamped 0.4.0. -+ -+02/22/99 KJB -+Macro change coming to add Mark's accel update. VGAOUT for old stuff and MEMOUT -+for new stuff? That way there's no confusion with the old INREG/OUTREG macros. -+Or maybe just stick with INREG/OUTREG for new stuff. -+ -+01/30/99 KJB -+Version stamp 0.3.0. Changed Chipset flags to use PCI IDs exclusively, also use -+common/xf86PciInfo.h for PCI IDs rather than coding them in regs3v.h. -+ -+11/28/98 KJB -+Bumped version stamp to 0.2, expect code in 3.9No. Cleaned up s3v.h and -+s3v_driver.c by removing unused definition & code sections. Added -+options set_mclk (from 3.3.2) and set_lcdclk (3.3.3 MX). Code support -+from 3.3.3 for ViRGE GX2 and MX+ is included. -+Disabled call to 32 bpp AccelInit to get -depth 24 -bpp 32 working again. -+ -+11/27/98 KJB -+More 3.3.3 import. -+New registers saved, CR40,CR45,SR8,(for MX) SR29,SR45,SR55,SR56,SR57. -+Reviewed s3vdriver.h, rehs3v.h, newmmio.h, s3v_accel.c, s3v_driver.c. -+Added ViRGE MX, MX+ & GX2 support. Re-synced parts of mode save and init -+with 3.3.3 versions. Added timeout ability for WaitIdle() and friends. -+Added chipnames and numbers to Chipsets struct. -+ -+11/26/98 KJB -+Import additions from 3.3.3, newmmio.h, regs3v.h, -+ -+Trap fills disabled because they don't match cfb, pixmap cache & ImageWrite -+working, fixed depth 8 color loss on VT switches, INREG & OUTREG modified to -+use a single offset value instead of adding the base and offset together. -+ -+11/18/98 KJB -+3.9Nn -+Acceleration working for Bitblt, ScreenToScreenCopy, Color 8x8 Rect fills, -+and Rect/Trap fills. -+Trap fills do not support transparency, so that needs to be exported to XAA. -+ -+ -+10/31/98 KJB -+Working depth 8, discolored dep 16 but runs, dep 24 screen goes black, -+C-A-Bkspc restores text console. At 3.9Nk tree level, module would not -+load in Loader server. why? Static server tested. -+ -+10/29/98 KJB -+ModeInit() needs work, options are heavily #if'd to try and get 8bpp -+working. -+ -+10/16/98 KJB -+General 4.0 architecture is setup. Presently at 3.9Nc level, if moved -+to a newer tree you will need to add the resource handling functions from -+Egbert (I haven't tackled that yet). -+ -+At the moment the ScreenInit() function is coded to return FALSE. On my -+ViRGE DX card this version does not lock up, but it does destroy the -+video mode. Make sure you have an external terminal or network connection -+if you run it (or blindly do a restart from your main terminal). I make -+no guarantees that it won't hard lock other versions of ViRGE. -+ -+I've left out the Alpha memory mapping, along with all option processing. -+Those will need to be done once the driver is minimally working. -+ -+Note that everything in s3v_driver.c is MMIO only. There are a pair of -+PIO functions in s3v_pio.c, but that is the only place. See notes below -+about my ViRGE DX BIOS and why I needed to do this on my hardware. -+ -+Other stuff... -+Some test stuff is assuming 8bpp, so 16 & 24 are broken. -+On my hardware, I am presently trying to get the Save/Restore sequence to -+recover the video mode. At the moment, when I run this driver, I get: -+ScreenInit() runs to completion. -+It returns FALSE, so the Server aborts. -+LeaveVT() is called, and runs to completion. -+The Server exits gracefully, but my monitor goes powersaver and the video -+mode is not recovered. -+ -+ -+ -+TODO items -+---------- -+1/30/03 General option "videoram" is ignored by the virge driver. -+ (Meelis Roos) -+3/24/02 Xv reported to not work as secondary in Xinerama multihead. -+ (xav on irc) -+3/24/02 DPMS doesn't fully disable the screen. Blue line across the -+ center in all modes. (xav on irc) -+3/25/02 Secondary reports primary BIOS during int10 detection. ie: -+ -+(II) S3VIRGE(1): VESA BIOS detected -+(II) S3VIRGE(1): VESA VBE Version 2.0 -+(II) S3VIRGE(1): VESA VBE Total Mem: 4194240 kB -+(II) S3VIRGE(1): VESA VBE OEM: ATI RAGE128 -+(II) S3VIRGE(1): VESA VBE OEM Software Rev: 1.0 -+(II) S3VIRGE(1): VESA VBE OEM Vendor: ATI Technologies Inc. -+(II) S3VIRGE(1): VESA VBE OEM Product: R128 -+(II) S3VIRGE(1): VESA VBE OEM Product Rev: 01.00 -+ -+(xav on irc) -+ -+ -+Check CR65 usage, bit 2 set based on S3_EARLY_SC? In my manual bit 2 is -+enable MMIO to RAMDAC registers. -+ -+Notes: -+---------- -+ -+/config/cf/xfree86.cf -+ -+have to add s3v to XF86CardDrivers for imake to make the -+drivers/s3v Makefile. -+ -+To remake makefiles, after editing Imakefile, go to dir above drivers/s3v -+and do a 'make Makefiles'. -+ -+For debug, make CDEBUGFLAGS='-g -DDEBUG', adding -DMetroLink enables -+timeout for VerticalRetraceWait(). -+ -+ -+ -+S3 ViRGE DX stuff: -+ -+Card seems to power up (or BIOS forces) with MMIO disabled. All flavors are -+disabled, because CR53 comes up as 0. This may preclude using this card -+as the second device in a multi-head situation although David D. says that -+the new config. management stuff may help here. -+ -+ -+ -+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.23 2003/02/13 03:21:33 dawes Exp $ -diff --git a/TODO_NOTES b/TODO_NOTES -deleted file mode 100644 -index de5920b..0000000 ---- a/TODO_NOTES -+++ /dev/null -@@ -1,326 +0,0 @@ --S3 ViRGE 4.0 devel notes -- -- -- --Status -------- --1/26/2003 --Ver 1.8.6 --Pre-4.3.0 release. 320x240 doublescan support w/mouse adjust, --power management printouts, DAC error printout fix, log XVideo status based --on chipset, preliminary support for disabling XV when a mode doesn't --support it. -- --5/18/2002 --Ver 1.8.5 --320x240 mode support (doublescan). -- --2/2/02 --Ver 1.8.4 --Make 320x240 mode work in depth 15 & 16. --Testing, need to switch streams on/off based on dblscan_v flag and mode. --Virge MX panel_on test (doesn't work.) -- --1/10/02 --Ver 1.8.3 --DGA fix, buffer pointer used wrong value. Submitted for 4.2.0 (late). -- --Ver 1.8.2 --DPMS testing (display DPMS status, disable MX LCD panel), DGA testing. -- --11/11/01 KJB --Ver 1.8.1 --ViRGE MX (& GX2) fix to CR63 for problems with modes < 1024x768 from --max <sunmax@libero.it>. Submitted for 4.2.0. -- --11/5/01 KJB --Ver 1.8.0 --ViRGE MX & GX2 XVideo changes. Fix overlap/color keying on MX, fix --and enable GX2 XVideo. --Submitted for 4.2.0. -- --11/4/01 KJB --Ver 1.7.0 --Bump version for 4.2.0. Update man and README. -- --11/3/01 KJB --Ver 1.6.16 --Pre-4.2.0 patch. cr3a fix, virge mx xvideo support, xvideo disable option --(helps with high res modes on dx and screen noise), remove accel solid --fill rect for trio3d, bring over some trio3d and mx fixes from 4.0.3 test --drivers. Includes VERBLEV bump to 5 to remove register dumps in log file. -- --Ver 1.6.15 --Experimental - Scanline color expand - GX2 -- --9/21/01 KJB --Ver 1.6.14 --ModeInit - cr3a for MX/GX2, don't clear reserved bit 0x40 (revert change). --Back out previous cr3a patch for testing. -- --9/18/01 KJB --Ver 1.6.13 --Option "xvideo" added. Add patch provided by Sven Menke --<Menke@SLAC.Stanford.EDU> for XV support on MX (slight changes to logic). -- --Ver 1.6.12 --Adam J. Richter's cr3a fix (possibly temporary). -- --5/30/01 KJB --Ver 1.6.10 --Disable MaxHValue & MaxVValue setting. -- --1/03/01 KJB --Ver 1.6.0 --Revert ViRGE to pre-Xv changes. ViRGE DX still supports Xv, but changes --added for Xv and ViRGE caused problems with normal display. -- --11/27/00 KJB --Ver 1.5.0 --Clean up, bump version for 4.0.2 submission. --CR3A, bit 0x40 (reserved) cleared for MX/GX2. Update man page. -- --11/24/00 KJB --Disable CPU to screen color expansion on GX2, causes lockups on GX2 with --'locate html' in an xterm. Add WaitCmd code to prevent accelerator and --reg command path activity at the same time on GX2. --XVideo fixes, left side clipping fixed for video windows extending off left --side of screen. Add horizontal filtering modes for 1-2x and >3x scaling. -- --11/7/00 KJB --Ver 1.4.0 --Enable MX fixes, testing with accel BLT_BUG set is worse on GX2, so left --it out. BLT_BUG wasn't being enabled on ViRGE & VX because of case usage, --enabled now. Re-enable silken mouse for GX2. Add Render/fbPicture support. --Fix a few compiler warnings. -- --11/5/00 KJB --Continued work on GX2, much stabler now, but I think there is a lockup case --left if you enable pci_burst and pci_retry with accel. I still see screen --flashes with vertical bars once in a while, and the log reports a GEReset. --Added fbPicture (render) support, untested. XV code for GX2 is added, --but not working yet. -- --10/29/00 KJB --Much work on GX2, now SWCursor locks up but HWCursor is stable, go figure. --Loading Netscape a couple times with the mail window was enough to lock it --up twice in a row. Server was locked but not a box (PCI) lock. Also, --vertical barring still occurred a couple times, so HW cursor wasn't causing --that. Try blt_bug flag again for lock up case. And attach to debug server --and bt... Sleep now... -- --10/21/00 KJB --Ver 1.3.0 --Depth 16 Xv support added. Testing on ViRGE DX. 1280x1024x24 is noisy, so --needs FIFO tuning. -- --9/27/00 KJB --Initial Xv support in depth 24. -- --9/10/00 KJB --Convert to FB. Add option "UseFB", default true. Added --VerticalRetraceWait timeout back as default. #if0 out the line accel --code in s3v_accel.c. The Subsequent...Bresenham line code causes a lockup --when used with fb. We didn't have any hardware accel in there anyway... -- --7/25/00 KJB --Started Xv additions. -- --6/26/00 KJB --GX2 seems to have an accel bug. I see the entire screen go solid color or --a wide stripe pattern for about 1 second. The S3VGEReset gets called twice, --and then everything is okay. Unless SilkenMouse is enabled... That seems to --get you a server lock instead. Short term is to disable SilkenMouse for GX2 --only. SilkenMouse isn't really the problem of course, it just happens that if --we move the mouse during the 1 second engine lockup we appear more likely to --never recover. -- --6/23/00 KJB --Ver 1.2.0 - Fix console corruption on GX2 caused by reserved bit use in CR3A. --Fix GX2 noise on screen in hi-res depth 24 by increasing FIFO fill threshold. -- --6/12/00 KJB --Ver 1.1.0 - Add Init for SilkenMouse, add xf86SetBackingStore call, move --int10Symbols[] to remove warnings. -- --3/3/00 KJB --Ver 1.0.0 - S3VProbeDDC code for X -configure option added, add timeout to --WAITIDLE macro in s3v_macros.h, change ImageWriteFlags adding NO_GXCOPY. --Start of GX2 fixes, use CR regs for FIFO settings. Update copyrights. -- --2/11/00 KJB --Ver 0.11.0 - Add cfb16/24BresS to module symbols to remove warnings. --Fix viewport restore problem after EnterVT in 24 bpp. --Clean up log output, removing register dumps from normal console log. -- --6/26/99 KJB --Make the memory settings for fifo_conservative the default, 'fifo_conservative' --does nothing additional now. Patch includes DGA2 additions below, non-working. --Expected to be included in 3.9Pu. -- --Changes in 3.9Pt by others include additions for newer RAC support. Some reports --say multi-head works now with ViRGE. -- --6/17/99 KJB --Ver 0.9.0 - Prelim DGA2 support modeled after MGA. -- --5/28/99 KJB --Ver 0.8.0 - Changes to 3.9Po - Cleaned up debug register printing function, minor --changes to man page, remove S3V.sgml and add new s3virge.sgml in doc/sgml, also --remove README.S3V from doc directory. -- -- --4/5/99 KJB --3.9Ph - Ver 0.7.0 - Virge man page added, HW Cursor fixed, rename chipsets removing --slashes in the names. -- --03/27/99 KJB --Ver 0.6.0 - hwcursor additions, added s3v_hwcurs.c and Option "swcursor". --Default is hwcursor, Option "swcursor" will disable it. -- --Ver 0.5.0 - patch against 3.9Pf (seq 2615), fix depth 24 and Accel flags, sync pci_burst option to previous changes, remove s3v_comp.h and s3v_pio.c and merge as needed. -- --03/21/99 KJB --3.9Pf has Matt Grossman's Alpha changes. --For next patch - remove s3v_pio.c and s3v_comp.h. Include the EnableMMIO and --DisableMMIO functions from s3v_pio.c in s3v_driver.c. -- --03/02/99 KJB --3.9Pc - depth 24 doesn't work on my ViRGE DX. NoAccel doesn't start, accel does --but has blocky noise. -- --03/01/99 KJB --Macro change done, VGAIN/VGAOUT for register access, INREG/OUTREG for s3v_accel.c. --Added Mark Vojkovich's re-write of the accel code. It may only be clean for ViRGE DX --at the moment. x11perf showed a couple artifacts in 'move window via parent'. --In progress, attempt to call cfbScreenInit() functions after MapMem/EnterVT. Not --working yet. Version stamped 0.4.0. -- --02/22/99 KJB --Macro change coming to add Mark's accel update. VGAOUT for old stuff and MEMOUT --for new stuff? That way there's no confusion with the old INREG/OUTREG macros. --Or maybe just stick with INREG/OUTREG for new stuff. -- --01/30/99 KJB --Version stamp 0.3.0. Changed Chipset flags to use PCI IDs exclusively, also use --common/xf86PciInfo.h for PCI IDs rather than coding them in regs3v.h. -- --11/28/98 KJB --Bumped version stamp to 0.2, expect code in 3.9No. Cleaned up s3v.h and --s3v_driver.c by removing unused definition & code sections. Added --options set_mclk (from 3.3.2) and set_lcdclk (3.3.3 MX). Code support --from 3.3.3 for ViRGE GX2 and MX+ is included. --Disabled call to 32 bpp AccelInit to get -depth 24 -bpp 32 working again. -- --11/27/98 KJB --More 3.3.3 import. --New registers saved, CR40,CR45,SR8,(for MX) SR29,SR45,SR55,SR56,SR57. --Reviewed s3vdriver.h, rehs3v.h, newmmio.h, s3v_accel.c, s3v_driver.c. --Added ViRGE MX, MX+ & GX2 support. Re-synced parts of mode save and init --with 3.3.3 versions. Added timeout ability for WaitIdle() and friends. --Added chipnames and numbers to Chipsets struct. -- --11/26/98 KJB --Import additions from 3.3.3, newmmio.h, regs3v.h, -- --Trap fills disabled because they don't match cfb, pixmap cache & ImageWrite --working, fixed depth 8 color loss on VT switches, INREG & OUTREG modified to --use a single offset value instead of adding the base and offset together. -- --11/18/98 KJB --3.9Nn --Acceleration working for Bitblt, ScreenToScreenCopy, Color 8x8 Rect fills, --and Rect/Trap fills. --Trap fills do not support transparency, so that needs to be exported to XAA. -- -- --10/31/98 KJB --Working depth 8, discolored dep 16 but runs, dep 24 screen goes black, --C-A-Bkspc restores text console. At 3.9Nk tree level, module would not --load in Loader server. why? Static server tested. -- --10/29/98 KJB --ModeInit() needs work, options are heavily #if'd to try and get 8bpp --working. -- --10/16/98 KJB --General 4.0 architecture is setup. Presently at 3.9Nc level, if moved --to a newer tree you will need to add the resource handling functions from --Egbert (I haven't tackled that yet). -- --At the moment the ScreenInit() function is coded to return FALSE. On my --ViRGE DX card this version does not lock up, but it does destroy the --video mode. Make sure you have an external terminal or network connection --if you run it (or blindly do a restart from your main terminal). I make --no guarantees that it won't hard lock other versions of ViRGE. -- --I've left out the Alpha memory mapping, along with all option processing. --Those will need to be done once the driver is minimally working. -- --Note that everything in s3v_driver.c is MMIO only. There are a pair of --PIO functions in s3v_pio.c, but that is the only place. See notes below --about my ViRGE DX BIOS and why I needed to do this on my hardware. -- --Other stuff... --Some test stuff is assuming 8bpp, so 16 & 24 are broken. --On my hardware, I am presently trying to get the Save/Restore sequence to --recover the video mode. At the moment, when I run this driver, I get: --ScreenInit() runs to completion. --It returns FALSE, so the Server aborts. --LeaveVT() is called, and runs to completion. --The Server exits gracefully, but my monitor goes powersaver and the video --mode is not recovered. -- -- -- --TODO items ------------ --1/30/03 General option "videoram" is ignored by the virge driver. -- (Meelis Roos) --3/24/02 Xv reported to not work as secondary in Xinerama multihead. -- (xav on irc) --3/24/02 DPMS doesn't fully disable the screen. Blue line across the -- center in all modes. (xav on irc) --3/25/02 Secondary reports primary BIOS during int10 detection. ie: -- --(II) S3VIRGE(1): VESA BIOS detected --(II) S3VIRGE(1): VESA VBE Version 2.0 --(II) S3VIRGE(1): VESA VBE Total Mem: 4194240 kB --(II) S3VIRGE(1): VESA VBE OEM: ATI RAGE128 --(II) S3VIRGE(1): VESA VBE OEM Software Rev: 1.0 --(II) S3VIRGE(1): VESA VBE OEM Vendor: ATI Technologies Inc. --(II) S3VIRGE(1): VESA VBE OEM Product: R128 --(II) S3VIRGE(1): VESA VBE OEM Product Rev: 01.00 -- --(xav on irc) -- -- --Check CR65 usage, bit 2 set based on S3_EARLY_SC? In my manual bit 2 is --enable MMIO to RAMDAC registers. -- --Notes: ------------ -- --/config/cf/xfree86.cf -- --have to add s3v to XF86CardDrivers for imake to make the --drivers/s3v Makefile. -- --To remake makefiles, after editing Imakefile, go to dir above drivers/s3v --and do a 'make Makefiles'. -- --For debug, make CDEBUGFLAGS='-g -DDEBUG', adding -DMetroLink enables --timeout for VerticalRetraceWait(). -- -- -- --S3 ViRGE DX stuff: -- --Card seems to power up (or BIOS forces) with MMIO disabled. All flavors are --disabled, because CR53 comes up as 0. This may preclude using this card --as the second device in a multi-head situation although David D. says that --the new config. management stuff may help here. -- -- -- --$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.23 2003/02/13 03:21:33 dawes Exp $ -diff --git a/configure.ac b/configure.ac -index 317b5bf..1c7e9f7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,46 +20,51 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-s3virge], -- 1.10.4, -+ [1.10.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-s3virge) -- -+ [xf86-video-s3virge]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -- -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Checks for programs. -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS -+ -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") - AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - SAVE_CPPFLAGS="$CPPFLAGS" -@@ -69,8 +74,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - [#include "xorg-server.h"]) - CPPFLAGS="$SAVE_CPPFLAGS" - --# Checks for header files. --AC_HEADER_STDC - - if test "x$XSERVER_LIBPCIACCESS" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) -@@ -78,20 +81,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=s3virge - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION -- --XORG_CHECK_LINUXDOC -- --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation. --# --# The above copyright notice and this permission notice shall be included --# in all copies or substantial portions of the Software. --# --# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --# OTHER DEALINGS IN THE SOFTWARE. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# Permission is hereby granted, free of charge, to any person obtaining a -+# copy of this software and associated documentation files (the "Software"), -+# to deal in the Software without restriction, including without limitation -+# the rights to use, copy, modify, merge, publish, distribute, sublicense, -+# and/or sell copies of the Software, and to permit persons to whom the -+# Software is furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice (including the next -+# paragraph) shall be included in all copies or substantial portions of the -+# Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+# DEALINGS IN THE SOFTWARE. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/src/s3v.h b/src/s3v.h -index 42b1f83..f4976ca 100644 ---- a/src/s3v.h -+++ b/src/s3v.h -@@ -40,9 +40,6 @@ in this Software without prior written authorization from the XFree86 Project. - /* Everything using inb/outb, etc needs "compiler.h" */ - #include "compiler.h" - --/* Drivers for PCI hardware need this */ --#include "xf86PciInfo.h" -- - /* Drivers that need to access the PCI config space directly need this */ - #include "xf86Pci.h" - -diff --git a/src/s3v_accel.c b/src/s3v_accel.c -index 528ab8a..7837e4a 100644 ---- a/src/s3v_accel.c -+++ b/src/s3v_accel.c -@@ -28,7 +28,9 @@ in this Software without prior written authorization from the XFree86 Project. - #include "config.h" - #endif - -+#include <unistd.h> - #include "s3v.h" -+#include "s3v_pciids.h" - - #include "miline.h" - /* fb includes are in s3v.h */ -diff --git a/src/s3v_dga.c b/src/s3v_dga.c -index 7ad42db..ecf8571 100644 ---- a/src/s3v_dga.c -+++ b/src/s3v_dga.c -@@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project. - #include "xf86.h" - #include "xf86_OSproc.h" - #include "xf86Pci.h" --#include "xf86PciInfo.h" - #include "xaa.h" - #include "xaalocal.h" - #include "s3v.h" -@@ -116,15 +115,15 @@ S3VDGAInit(ScreenPtr pScreen) - to be rewritten to accommodate depth changes in DGA mode */ - - if(0 /*pScrn->displayWidth != pMode->HDisplay*/) { -- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec)); - oneMore = TRUE; - } else { -- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec)); - oneMore = FALSE; - } - - if(!newmodes) { -- xfree(modes); -+ free(modes); - return FALSE; - } - modes = newmodes; -diff --git a/src/s3v_driver.c b/src/s3v_driver.c -index 0928a7f..7064b1e 100644 ---- a/src/s3v_driver.c -+++ b/src/s3v_driver.c -@@ -57,8 +57,9 @@ in this Software without prior written authorization from the XFree86 Project. - */ - - -- /* Most xf86 commons are already in s3v.h */ --#include "s3v.h" -+/* Most xf86 commons are already in s3v.h */ -+#include "s3v.h" -+#include "s3v_pciids.h" - - - #include "globals.h" -@@ -383,7 +384,7 @@ S3VFreeRec(ScrnInfoPtr pScrn) - PVERB5(" S3VFreeRec\n"); - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -435,7 +436,7 @@ S3VProbe(DriverPtr drv, int flags) - numDevSections, drv, &usedChips); - - /* Free it since we don't need that list after this */ -- xfree(devSections); -+ free(devSections); - if (numUsed <= 0) - return FALSE; - -@@ -463,7 +464,7 @@ S3VProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - PVERB5(" S3VProbe end\n"); - return foundScreen; - } -@@ -519,7 +520,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) - */ - if (!vgaHWGetHWRec(pScrn)) - return FALSE; -- -+ vgaHWSetStdFuncs(VGAHWPTR(pScrn)); - - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; -@@ -601,7 +602,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) - } - - /* Process the options */ -- if (!(ps3v->Options = xalloc(sizeof(S3VOptions)))) -+ if (!(ps3v->Options = malloc(sizeof(S3VOptions)))) - return FALSE; - memcpy(ps3v->Options, S3VOptions, sizeof(S3VOptions)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, ps3v->Options); -@@ -797,7 +798,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) - - #ifndef XSERVER_LIBPCIACCESS - if (pEnt->resources) { -- xfree(pEnt); -+ free(pEnt); - S3VFreeRec(pScrn); - return FALSE; - } -@@ -851,7 +852,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) - } else { - ps3v->ChipRev = PCI_DEV_REVISION(ps3v->PciInfo); - } -- xfree(pEnt); -+ free(pEnt); - - /* - * This shouldn't happen because such problems should be caught in -@@ -1328,8 +1329,11 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) - /* Load XAA if needed */ - if (!ps3v->NoAccel || ps3v->hwcursor ) { - if (!xf86LoadSubModule(pScrn, "xaa")) { -- S3VFreeRec(pScrn); -- return FALSE; -+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV, -+ "Falling back to shadowfb\n"); -+ ps3v->NoAccel = 1; -+ ps3v->hwcursor = 0; -+ ps3v->shadowFB = 1; - } - } - -@@ -2326,8 +2330,6 @@ S3VScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pScrn = xf86Screens[pScreen->myNum]; - /* Get S3V rec */ - ps3v = S3VPTR(pScrn); -- /* Make sure we have card access */ --/* xf86EnableAccess(pScrn);*/ - /* Map MMIO regs and framebuffer */ - if( !S3VMapMem(pScrn) ) - return FALSE; -@@ -2525,7 +2527,7 @@ S3VInternalScreenInit( int scrnIndex, ScreenPtr pScreen) - - if(ps3v->shadowFB) { - ps3v->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- ps3v->ShadowPtr = xalloc(ps3v->ShadowPitch * height); -+ ps3v->ShadowPtr = malloc(ps3v->ShadowPitch * height); - displayWidth = ps3v->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FBStart = ps3v->ShadowPtr; - } else { -@@ -3309,7 +3311,7 @@ S3VCloseScreen(int scrnIndex, ScreenPtr pScreen) - if (ps3v->AccelInfoRec) - XAADestroyInfoRec(ps3v->AccelInfoRec); - if (ps3v->DGAModes) -- xfree(ps3v->DGAModes); -+ free(ps3v->DGAModes); - - pScrn->vtSema = FALSE; - -@@ -3518,11 +3520,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - S3VPtr ps3v; - IOADDRESS vgaCRIndex, vgaCRReg; - unsigned char val; -- -+ unsigned int PIOOffset = 0; -+ - PVERB5(" S3VEnableMmio\n"); - - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ PIOOffset = hwp->PIOOffset; -+#endif -+ - /* - * enable chipset (seen on uninitialized secondary cards) - * might not be needed once we use the VGA softbooter -@@ -3535,17 +3543,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - * to be set correctly already and MMIO _has_ to be - * enabled. - */ -- val = inb(hwp->PIOOffset + 0x3C3); /*@@@EE*/ -- outb(hwp->PIOOffset + 0x3C3, val | 0x01); -+ val = inb(PIOOffset + 0x3C3); /*@@@EE*/ -+ outb(PIOOffset + 0x3C3, val | 0x01); - /* - * set CR registers to color mode - * in mono mode extended CR registers - * are not accessible. (EE 05/04/99) - */ -- val = inb(hwp->PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01); -+ val = inb(PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -+ outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01); - vgaHWGetIOBase(hwp); /* Get VGA I/O base */ -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = PIOOffset + hwp->IOBase + 4; - vgaCRReg = vgaCRIndex + 1; - #if 1 - /* -@@ -3564,7 +3572,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - /* Enable new MMIO, if TRIO mmio is already */ - /* enabled, then it stays enabled. */ - outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08); -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val); -+ outb(PIOOffset + VGA_MISC_OUT_W, val); - if (S3_TRIO_3D_SERIES(ps3v->Chipset)) { - outb(vgaCRIndex, 0x40); - val = inb(vgaCRReg); -@@ -3586,7 +3594,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn) - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); - -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = hwp->IOBase + 4; -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ vgaCRIndex += hwp->PIOOffset; -+#endif - vgaCRReg = vgaCRIndex + 1; - outb(vgaCRIndex, 0x53); - /* Restore register's original state */ -diff --git a/src/s3v_hwcurs.c b/src/s3v_hwcurs.c -index 53c539f..58e8fd9 100644 ---- a/src/s3v_hwcurs.c -+++ b/src/s3v_hwcurs.c -@@ -39,6 +39,7 @@ in this Software without prior written authorization from the XFree86 Project. - - - #include "s3v.h" -+#include "s3v_pciids.h" - - /* protos */ - -diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c -index cbac21f..6bbfd1e 100644 ---- a/src/s3v_i2c.c -+++ b/src/s3v_i2c.c -@@ -58,7 +58,6 @@ in this Software without prior written authorization from the XFree86 Project. - #include "compiler.h" - - #include "xf86Pci.h" --#include "xf86PciInfo.h" - - #include "vgaHW.h" - -diff --git a/src/s3v_pciids.h b/src/s3v_pciids.h -new file mode 100644 -index 0000000..5d11333 ---- /dev/null -+++ b/src/s3v_pciids.h -@@ -0,0 +1,18 @@ -+#ifndef S3V_PCIIDS_H -+#define S3V_PCIIDS_H -+ -+#define PCI_VENDOR_S3 0x5333 -+#define PCI_CHIP_VIRGE 0x5631 -+#define PCI_CHIP_TRIO 0x8811 -+#define PCI_CHIP_TRIO64UVP 0x8814 -+#define PCI_CHIP_VIRGE_VX 0x883D -+#define PCI_CHIP_TRIO64V2_DXGX 0x8901 -+#define PCI_CHIP_Trio3D 0x8904 -+#define PCI_CHIP_VIRGE_DXGX 0x8A01 -+#define PCI_CHIP_VIRGE_GX2 0x8A10 -+#define PCI_CHIP_Trio3D_2X 0x8A13 -+#define PCI_CHIP_VIRGE_MX 0x8C01 -+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 -+#define PCI_CHIP_VIRGE_MXP 0x8C03 -+ -+#endif /* S3V_PCIIDS_H */ -diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c -index e2e1269..82b763f 100644 ---- a/src/s3v_shadow.c -+++ b/src/s3v_shadow.c -@@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86PciInfo.h" - #include "xf86Pci.h" - #include "shadowfb.h" - #include "servermd.h" -diff --git a/src/s3v_xv.c b/src/s3v_xv.c -index 7e7c243..2466789 100644 ---- a/src/s3v_xv.c -+++ b/src/s3v_xv.c -@@ -40,8 +40,9 @@ in this Software without prior written authorization from the XFree86 Project. - #include "config.h" - #endif - -- /* Most xf86 commons are already in s3v.h */ --#include "s3v.h" -+/* Most xf86 commons are already in s3v.h */ -+#include "s3v.h" -+#include "s3v_pciids.h" - - #if 0 - #define OFF_DELAY 250 /* milliseconds */ -@@ -137,7 +138,7 @@ void S3VInitVideo(ScreenPtr pScreen) - adaptors = &newAdaptor; - } else { - newAdaptors = /* need to free this someplace */ -- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); -+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * - sizeof(XF86VideoAdaptorPtr)); -@@ -152,7 +153,7 @@ void S3VInitVideo(ScreenPtr pScreen) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - - if(newAdaptors) -- xfree(newAdaptors); -+ free(newAdaptors); - } - - /* client libraries expect an encoding */ -@@ -301,10 +302,10 @@ S3VAllocAdaptor(ScrnInfoPtr pScrn) - if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn))) - return NULL; - -- if(!(pPriv = xcalloc(1, sizeof(S3VPortPrivRec) + -+ if(!(pPriv = calloc(1, sizeof(S3VPortPrivRec) + - (sizeof(DevUnion) * S3V_MAX_PORTS)))) - { -- xfree(adapt); -+ free(adapt); - return NULL; - } - diff --git a/extra/xf86-video-sisusb/sisusb-0.9.4-git.patch b/extra/xf86-video-sisusb/sisusb-0.9.4-git.patch deleted file mode 100644 index 24474954a..000000000 --- a/extra/xf86-video-sisusb/sisusb-0.9.4-git.patch +++ /dev/null @@ -1,794 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 86c6ac5..725d6cb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,49 +20,48 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-sisusb], -- 0.9.4, -+ [0.9.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-sisusb) -- -+ [xf86-video-sisusb]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC --XORG_PROG_RAWCPP - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) -+# Obtain compiler/linker options for the driver dependencies -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto pciaccess $REQUIRED_MODULES]) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") -@@ -70,17 +69,14 @@ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=sisusb - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 1b26ac2..9ceb36f 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MANDEFS = \ -- -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ -- -D__appmansuffix__=$(APP_MAN_SUFFIX) \ -- -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ -- -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ -- -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ -- -D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \ -- -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \ -- -D__xconfigfile__=xorg.conf \ -- -D__xservername__=Xorg -- --# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM --# to cpp, because that trick does not work on all ANSI C preprocessors. --# Delete line numbers from the cpp output (-P is not portable, I guess). --# Allow XCOMM to be preceded by whitespace and provide a means of generating --# output lines with trailing backslashes. --# Allow XHASH to always be substituted, even in cases where XCOMM isn't. -- --CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -- -e '/^\#line *[0-9][0-9]* *.*$$/d' \ -- -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ -- -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ -- -e '/^[ ]*XHASH/s/XHASH/\#/' \ -- -e '/\@\@$$/s/\@\@$$/\\/' -- - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - .man.$(DRIVER_MAN_SUFFIX): -- $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -diff --git a/man/sisusb.man b/man/sisusb.man -index 7817cb5..6eafb8e 100644 ---- a/man/sisusb.man -+++ b/man/sisusb.man -@@ -1,17 +1,5 @@ --.\" $XFree86$ --.\" $XdotOrg$ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' --#ifdef __xservername__ --#define __myservername__ __xservername__ --#else --#define __myservername__ XFree86 --#endif --#ifdef __xconfigfile__ --#define __myxconfigfile__ __xconfigfile__ --#else --#define __myxconfigfile__ XF86Config --#endif - .TH SISUSB __drivermansuffix__ __vendorversion__ - .SH NAME - sisusb \- SiS USB video driver -@@ -25,7 +13,7 @@ sisusb \- SiS USB video driver - .fi - .SH DESCRIPTION - .B sisusb --is an __myservername__ driver for SiS (Silicon Integrated Systems) video chips that -+is an __xservername__ driver for SiS (Silicon Integrated Systems) video chips that - are connected via a Net2280-based USB dongle. The driver is not accelerated, but - provides support for colordepths of 8, 16 and 24 bpp as well as Render and other - extensions. -@@ -39,7 +27,7 @@ driver supports USB video cards based on the following chipsets: - The SiS315E/PRO features two CRT controllers. However, in its USB version, only - the first output, referred to as "CRT1", is being used. - .SH CONFIGURATION DETAILS --Please refer to __myxconfigfile__(__filemansuffix__) for general configuration -+Please refer to __xconfigfile__(__filemansuffix__) for general configuration - details and to sis(__drivermansuffix__) for more information. This manpage only - covers a subset of the supported options. - .PP -@@ -81,11 +69,7 @@ for device reconnection). - .SH "KNOWN BUGS" - none. - .SH "SEE ALSO" --#ifdef __xservername__ - __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__) --#else --XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__), sis(__drivermansuffix__) --#endif - .PP - .B "http://www.winischhofer.at/linuxsisvga.shtml" - for more information and updates -diff --git a/src/sisusb.h b/src/sisusb.h -index b9992ac..82ed509 100644 ---- a/src/sisusb.h -+++ b/src/sisusb.h -@@ -113,6 +113,14 @@ - #include <X11/extensions/Xv.h> - #endif - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+#define _swapl(x, n) swapl(x,n) -+#define _swaps(x, n) swaps(x,n) -+#else -+#define _swapl(x, n) swapl(x) -+#define _swaps(x, n) swaps(x) -+#endif -+ - /* Platform/architecture related definitions: */ - - #undef SIS_PC_PLATFORM -@@ -141,7 +149,6 @@ - #define UNLOCK_ALWAYS /* Always unlock the registers (should be set!) */ - - /* Need that for SiSCtrl */ --#define NEED_REPLIES /* ? */ - #define EXTENSION_PROC_ARGS void * - #include "extnsionst.h" /* required */ - #include <X11/extensions/panoramiXproto.h> /* required */ -@@ -732,7 +739,7 @@ typedef struct { - Bool skipswitchcheck; - ULong VBFlagsInit; - DisplayModePtr currentModeLast; -- IOADDRESS MyPIOOffset; -+ unsigned long MyPIOOffset; - - char messagebuffer[64]; - unsigned int VGAMapSize; /* SiSVGA stuff */ -diff --git a/src/sisusb_dac.c b/src/sisusb_dac.c -index 5e3eb7f..b5c4dce 100644 ---- a/src/sisusb_dac.c -+++ b/src/sisusb_dac.c -@@ -672,7 +672,7 @@ SiSUSBMemCopyToVideoRam(SISUSBPtr pSiSUSB, UChar *to, UChar *from, int size) - int num, retry = 3; - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)to, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)to, SEEK_SET); - num = write(pSiSUSB->sisusbdev, from, size); - } while((num != size) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -958,7 +958,7 @@ void sisclearvram(SISUSBPtr pSiSUSB, UChar *where, unsigned int howmuch) - if(pSiSUSB->sisusbfatalerror) return; - do { - x.operation = SUCMD_CLRSCR; -- x.data3 = (CARD32)where; -+ x.data3 = (CARD32)(uintptr_t)where; - x.data0 = (howmuch >> 16) & 0xff; - x.data1 = (howmuch >> 8) & 0xff; - x.data2 = howmuch & 0xff; -@@ -990,7 +990,7 @@ void SIS_MMIO_OUT8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD8 va - int num, retry = 3; - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = write(pSiSUSB->sisusbdev, &val, 1); - } while((num != 1) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1002,7 +1002,7 @@ void SIS_MMIO_OUT16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD16 - CARD16 buf = sisusb_cpu_to_le16(val); - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = write(pSiSUSB->sisusbdev, &buf, 2); - } while((num != 2) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1014,7 +1014,7 @@ void SIS_MMIO_OUT32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD32 - CARD32 buf = sisusb_cpu_to_le32(val); - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = write(pSiSUSB->sisusbdev, &buf, 4); - } while((num != 4) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1026,7 +1026,7 @@ CARD8 SIS_MMIO_IN8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) - CARD8 tmp; - if(pSiSUSB->sisusbfatalerror) return 0; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = read(pSiSUSB->sisusbdev, &tmp, 1); - } while((num != 1) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1039,7 +1039,7 @@ CARD16 SIS_MMIO_IN16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) - CARD16 tmp; - if(pSiSUSB->sisusbfatalerror) return 0; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = read(pSiSUSB->sisusbdev, &tmp, 2); - } while((num != 2) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1052,7 +1052,7 @@ CARD32 SIS_MMIO_IN32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) - CARD32 tmp; - if(pSiSUSB->sisusbfatalerror) return 0; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = read(pSiSUSB->sisusbdev, &tmp, 4); - } while((num != 4) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c -index 8ba2c33..032225c 100644 ---- a/src/sisusb_driver.c -+++ b/src/sisusb_driver.c -@@ -186,12 +186,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn) - /* Just to make sure... */ - if(!pSiSUSB) return; - -- if(pSiSUSB->pstate) xfree(pSiSUSB->pstate); -+ if(pSiSUSB->pstate) free(pSiSUSB->pstate); - pSiSUSB->pstate = NULL; -- if(pSiSUSB->fonts) xfree(pSiSUSB->fonts); -+ if(pSiSUSB->fonts) free(pSiSUSB->fonts); - pSiSUSB->fonts = NULL; - -- if(pSiSUSB->SiS_Pr) xfree(pSiSUSB->SiS_Pr); -+ if(pSiSUSB->SiS_Pr) free(pSiSUSB->SiS_Pr); - pSiSUSB->SiS_Pr = NULL; - - if(pSiSUSB->sisusbdevopen) { -@@ -200,12 +200,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn) - } - - if(pScrn->chipset) { -- xfree(pScrn->chipset); -+ free(pScrn->chipset); - pScrn->chipset = NULL; - } - - if(pScrn->driverPrivate) { -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - } -@@ -217,14 +217,14 @@ SISUSBErrorLog(ScrnInfoPtr pScrn, const char *format, ...) - static const char *str = "**************************************************\n"; - - va_start(ap, format); -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - " ERROR:\n"); - xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap); - va_end(ap); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - " END OF MESSAGE\n"); -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); - } - - static int -@@ -248,7 +248,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle) - - if((myfile = open(filename, O_RDWR, 0)) != -1) { - if(!ioctl(myfile, SISUSB_GET_CONFIG_SIZE, &sisusbinfosize)) { -- if((mysisusbinfo = xalloc(sisusbinfosize))) { -+ if((mysisusbinfo = malloc(sisusbinfosize))) { - if(!ioctl(myfile, (SISUSB_GET_CONFIG | (sisusbinfosize << 16)), mysisusbinfo)) { - if(mysisusbinfo->sisusb_id == SISUSB_ID) { - sisusbversion = (mysisusbinfo->sisusb_version << 16) | -@@ -280,7 +280,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle) - retval = mysisusbinfo->sisusb_minor; - } - } -- xfree(mysisusbinfo); -+ free(mysisusbinfo); - mysisusbinfo = NULL; - } - } -@@ -307,13 +307,13 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam - } - if((p) && (*p) && (*p == '/')) { - gotdev = 1; -- *nameptr = xalloc(strlen(p) + 1); -+ *nameptr = malloc(strlen(p) + 1); - strcpy(*nameptr, p); - retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL); - } else if((p) && (*p) && (sscanf(p, "%d", &i) == 1)) { - if(i >= 0 && i <= 31) { - gotdev = 1; -- *nameptr = xalloc(32); -+ *nameptr = malloc(32); - sprintf(*nameptr, "/dev/sisusbvga%d", i); - retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL); - if(retval < 0) { -@@ -324,7 +324,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam - } - } - if(!gotdev) { -- *nameptr = xalloc(32); -+ *nameptr = malloc(32); - for(i = 0; i < 64; i++) { - if(i < 32) sprintf(*nameptr, "/dev/sisusbvga%d", i); - else sprintf(*nameptr, "/dev/usb/sisusbvga%d", i); -@@ -338,7 +338,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam - if(retval >= 0) { - xf86Msg(X_INFO, "Found SiSUSB dongle (node %s, minor %d)\n", *nameptr, retval); - } else if((*nameptr)) { -- xfree(*nameptr); -+ free(*nameptr); - *nameptr = NULL; - } - -@@ -401,14 +401,14 @@ SISUSBProbe(DriverPtr drv, int flags) - */ - - /* Allocate and initialize an array of ints for storing the minors */ -- if(!(minorArray = (int *)xalloc(numDevSections * sizeof(int)))) { -+ if(!(minorArray = (int *)malloc(numDevSections * sizeof(int)))) { - return FALSE; - } - for(i = 0; i < numDevSections; i++) minorArray[i] = -1; - - /* Allocate an array of char ptrs for storing the device node names */ -- if(!(devnameArray = (char **)xalloc(numDevSections * sizeof(char *)))) { -- xfree(minorArray); -+ if(!(devnameArray = (char **)malloc(numDevSections * sizeof(char *)))) { -+ free(minorArray); - return FALSE; - } - -@@ -420,20 +420,20 @@ SISUSBProbe(DriverPtr drv, int flags) - if((myminor = SiSUSBFindUSBDongle(devSections[i], minorArray, numDevSections, &nameptr)) >= 0) { - if(!SiSUSBFindDuplicate(myminor, minorArray, numDevSections)) { - minorArray[numUsed] = myminor; -- devnameArray[numUsed] = xalloc(strlen(nameptr) + 1); -+ devnameArray[numUsed] = malloc(strlen(nameptr) + 1); - strcpy(devnameArray[numUsed], nameptr); - numUsed++; - } -- xfree(nameptr); -+ free(nameptr); - } - } - - /* Free the minor array, we don't need it anymore */ -- xfree(minorArray); -+ free(minorArray); - - if(numUsed <= 0) { -- xfree(devSections); -- xfree(devnameArray); -+ free(devSections); -+ free(devnameArray); - return FALSE; - } - -@@ -470,8 +470,8 @@ SISUSBProbe(DriverPtr drv, int flags) - - } - -- xfree(devSections); -- xfree(devnameArray); -+ free(devSections); -+ free(devnameArray); - return foundScreen; - } - -@@ -622,10 +622,10 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn) - if(!(nramp = xf86GetGammaRampSize(pScreen))) return; - - for(i=0; i<3; i++) { -- ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort)); -+ ramp[i] = (UShort *)malloc(nramp * sizeof(UShort)); - if(!ramp[i]) { -- if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; } -- if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; } -+ if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; } -+ if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; } - return; - } - } -@@ -685,9 +685,9 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn) - - xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]); - -- xfree(ramp[0]); -- xfree(ramp[1]); -- xfree(ramp[2]); -+ free(ramp[0]); -+ free(ramp[1]); -+ free(ramp[2]); - ramp[0] = ramp[1] = ramp[2] = NULL; - } - #endif -@@ -906,11 +906,11 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) - Bool gotit = FALSE; - - if(!ioctl(fd, SISUSBFB_GET_INFO_SIZE, &sisfbinfosize)) { -- if((mysisfbinfo = xalloc(sisfbinfosize))) { -+ if((mysisfbinfo = malloc(sisfbinfosize))) { - if(!ioctl(fd, (SISUSBFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) { - gotit = TRUE; - } else { -- xfree(mysisfbinfo); -+ free(mysisfbinfo); - mysisfbinfo = NULL; - } - } -@@ -944,7 +944,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) - - } - } -- xfree(mysisfbinfo); -+ free(mysisfbinfo); - mysisfbinfo = NULL; - } - close (fd); -@@ -1147,7 +1147,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) - #endif - - if(pSiSUSB->HWCursor) { -- if(!(pSiSUSB->USBCursorBuf = xcalloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE; -+ if(!(pSiSUSB->USBCursorBuf = calloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE; - - pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2); - if(pSiSUSB->OptUseColorCursor) pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2); -@@ -1456,8 +1456,8 @@ SISUSBMapMem(ScrnInfoPtr pScrn) - { - SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); - -- pSiSUSB->FbBase = (UChar *)pSiSUSB->FbAddress; -- pSiSUSB->IOBase = (UChar *)pSiSUSB->IOAddress; -+ pSiSUSB->FbBase = (UChar *)(uintptr_t)pSiSUSB->FbAddress; -+ pSiSUSB->IOBase = (UChar *)(uintptr_t)pSiSUSB->IOAddress; - - return TRUE; - } -@@ -1811,7 +1811,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(pSiSUSB->ShadowFB) { - pSiSUSB->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * displayWidth); -- pSiSUSB->ShadowPtr = xalloc(pSiSUSB->ShadowPitch * height); -+ pSiSUSB->ShadowPtr = malloc(pSiSUSB->ShadowPitch * height); - if(!(FBStart = pSiSUSB->ShadowPtr)) { - SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF); - SISUSBErrorLog(pScrn, "Failed to allocate shadow framebuffer\n"); -@@ -1820,7 +1820,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - #if X_BYTE_ORDER == X_BIG_ENDIAN - if(pScrn->bitsPerPixel == 16) { - /* For 16bpp, we need to swap the bytes in the framebuffer */ -- if(!(pSiSUSB->ShadowPtrSwap = xalloc(pSiSUSB->ShadowPitch * height))) { -+ if(!(pSiSUSB->ShadowPtrSwap = malloc(pSiSUSB->ShadowPitch * height))) { - SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF); - SISUSBErrorLog(pScrn, "Failed to allocate swap buffer for shadow framebuffer\n"); - return FALSE; -@@ -2238,24 +2238,24 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen) - } - - if(pSiSUSB->USBCursorBuf) { -- xfree(pSiSUSB->USBCursorBuf); -+ free(pSiSUSB->USBCursorBuf); - pSiSUSB->USBCursorBuf = NULL; - } - - if(pSiSUSB->ShadowPtr) { -- xfree(pSiSUSB->ShadowPtr); -+ free(pSiSUSB->ShadowPtr); - pSiSUSB->ShadowPtr = NULL; - } - - #if 0 - if(pSiSUSB->PreAllocMem) { -- xfree(pSiSUSB->PreAllocMem); -+ free(pSiSUSB->PreAllocMem); - pSiSUSB->PreAllocMem = NULL; - } - #endif - - if(pSiSUSB->adaptor) { -- xfree(pSiSUSB->adaptor); -+ free(pSiSUSB->adaptor); - pSiSUSB->adaptor = NULL; - pSiSUSB->ResetXv = pSiSUSB->ResetXvGamma = NULL; - } -diff --git a/src/sisusb_init.c b/src/sisusb_init.c -index ba44431..99ec519 100644 ---- a/src/sisusb_init.c -+++ b/src/sisusb_init.c -@@ -1301,10 +1301,10 @@ SiSUSBBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN i - } - } - -- if(!(new = xalloc(sizeof(DisplayModeRec)))) return first; -+ if(!(new = malloc(sizeof(DisplayModeRec)))) return first; - memset(new, 0, sizeof(DisplayModeRec)); -- if(!(new->name = xalloc(10))) { -- xfree(new); -+ if(!(new->name = malloc(10))) { -+ free(new); - return first; - } - if(!first) first = new; -diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c -index d4612b0..4d5cfa3 100644 ---- a/src/sisusb_opt.c -+++ b/src/sisusb_opt.c -@@ -228,7 +228,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if(!(pSiSUSB->Options = xalloc(sizeof(SISUSBOptions)))) return; -+ if(!(pSiSUSB->Options = malloc(sizeof(SISUSBOptions)))) return; - - memcpy(pSiSUSB->Options, SISUSBOptions, sizeof(SISUSBOptions)); - -diff --git a/src/sisusb_osdef.h b/src/sisusb_osdef.h -index 2d938ad..500bffb 100644 ---- a/src/sisusb_osdef.h -+++ b/src/sisusb_osdef.h -@@ -77,11 +77,11 @@ - - #define SIS315H - --#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v)) --#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v)) --#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v)) --#define InPortByte(p) inSISREG((IOADDRESS)(p)) --#define InPortWord(p) inSISREGW((IOADDRESS)(p)) --#define InPortLong(p) inSISREGL((IOADDRESS)(p)) -+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v)) -+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v)) -+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v)) -+#define InPortByte(p) inSISREG((unsigned long)(p)) -+#define InPortWord(p) inSISREGW((unsigned long)(p)) -+#define InPortLong(p) inSISREGL((unsigned long)(p)) - - #endif /* _SISUSB_OSDEF_H_ */ -diff --git a/src/sisusb_types.h b/src/sisusb_types.h -index 04c7a7a..9fc6b41 100644 ---- a/src/sisusb_types.h -+++ b/src/sisusb_types.h -@@ -51,6 +51,8 @@ - #ifndef _VGATYPES_ - #define _VGATYPES_ - -+#include <xf86Pci.h> -+ - #ifndef FALSE - #define FALSE 0 - #endif -@@ -93,7 +95,7 @@ typedef unsigned char BOOLEAN; - - #define SISIOMEMTYPE - --typedef IOADDRESS SISIOADDRESS; -+typedef unsigned long SISIOADDRESS; - - typedef enum _SIS_CHIP_TYPE { - SIS_VGALegacy = 0, -diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c -index 8c03d63..a9c1ee1 100644 ---- a/src/sisusb_utility.c -+++ b/src/sisusb_utility.c -@@ -34,8 +34,6 @@ - #endif - - #include "sisusb.h" --#define NEED_REPLIES --#define NEED_EVENTS - #include <X11/X.h> - #include "dixstruct.h" - -@@ -789,10 +787,10 @@ SiSUSBProcSiSCtrlQueryVersion(ClientPtr client) - rep.majorVersion = SISCTRL_MAJOR_VERSION; - rep.minorVersion = SISCTRL_MINOR_VERSION; - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swaps(&rep.majorVersion, n); -- swaps(&rep.minorVersion, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swaps(&rep.majorVersion, n); -+ _swaps(&rep.minorVersion, n); - } - WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep); - return (client->noClientException); -@@ -834,15 +832,15 @@ SiSUSBProcSiSCtrlCommand(ClientPtr client) - rep.sequenceNumber = client->sequence; - - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swapl(&rep.screen, n); -- swapl(&rep.sdc_id, n); -- swapl(&rep.sdc_command, n); -- swapl(&rep.sdc_result_header, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swapl(&rep.screen, n); -+ _swapl(&rep.sdc_id, n); -+ _swapl(&rep.sdc_command, n); -+ _swapl(&rep.sdc_result_header, n); - for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { -- swapl(&rep.sdc_parm[i], n); -- swapl(&rep.sdc_result[i], n); -+ _swapl(&rep.sdc_parm[i], n); -+ _swapl(&rep.sdc_result[i], n); - } - } - WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep); -@@ -869,7 +867,7 @@ SiSUSBSProcSiSCtrlQueryVersion(ClientPtr client) - { - REQUEST(xSiSCtrlQueryVersionReq); - register int n; -- swaps(&stuff->length, n); -+ _swaps(&stuff->length, n); - REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq); - return SiSUSBProcSiSCtrlQueryVersion(client); - } -@@ -880,14 +878,14 @@ SiSUSBSProcSiSCtrlCommand(ClientPtr client) - REQUEST(xSiSCtrlCommandReq); - register int n; - int i; -- swaps(&stuff->length, n); -- swapl(&stuff->screen, n); -- swapl(&stuff->sdc_id, n); -- swapl(&stuff->sdc_command, n); -- swapl(&stuff->sdc_result_header, n); -+ _swaps(&stuff->length, n); -+ _swapl(&stuff->screen, n); -+ _swapl(&stuff->sdc_id, n); -+ _swapl(&stuff->sdc_command, n); -+ _swapl(&stuff->sdc_result_header, n); - for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { -- swapl(&stuff->sdc_parm[i], n); -- swapl(&stuff->sdc_result[i], n); -+ _swapl(&stuff->sdc_parm[i], n); -+ _swapl(&stuff->sdc_result[i], n); - } - REQUEST_SIZE_MATCH(xSiSCtrlCommandReq); - return SiSUSBProcSiSCtrlCommand(client); -@@ -911,7 +909,7 @@ SiSUSBCtrlResetProc(ExtensionEntry* extEntry) - { - /* Called by CloseDownExtensions() */ - if(extEntry->extPrivate) { -- xfree(extEntry->extPrivate); -+ free(extEntry->extPrivate); - extEntry->extPrivate = NULL; - } - } -@@ -928,7 +926,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn) - - if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) { - -- if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1))) -+ if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1))) - return; - - if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0, -@@ -938,7 +936,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn) - StandardMinorOpcode))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to add SISCTRL extension\n"); -- xfree(myctrl); -+ free(myctrl); - return; - } - -diff --git a/src/sisusb_video.c b/src/sisusb_video.c -index bc469b0..1dbf4f1 100644 ---- a/src/sisusb_video.c -+++ b/src/sisusb_video.c -@@ -216,7 +216,7 @@ void SISUSBInitVideo(ScreenPtr pScreen) - - if(newAdaptor) size++; - -- newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*)); -+ newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - if(num_adaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr)); -@@ -234,7 +234,7 @@ void SISUSBInitVideo(ScreenPtr pScreen) - } - - if(newAdaptors) { -- xfree(newAdaptors); -+ free(newAdaptors); - } - } - -@@ -377,7 +377,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen) - XF86VideoAdaptorPtr adapt; - SISUSBPortPrivPtr pPriv; - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(SISUSBPortPrivRec) + - sizeof(DevUnion)))) - return NULL; diff --git a/extra/xf86-video-tseng/tseng-1.2.4-git.patch b/extra/xf86-video-tseng/tseng-1.2.4-git.patch deleted file mode 100644 index 082b2cb0b..000000000 --- a/extra/xf86-video-tseng/tseng-1.2.4-git.patch +++ /dev/null @@ -1,317 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 62cc318..8458c06 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,46 +20,46 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-tseng], -- 1.2.4, -+ [1.2.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-tseng) -- -+ [xf86-video-tseng]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) - - # Checks for libraries. -@@ -78,17 +78,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --# Checks for header files. --AC_HEADER_STDC -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=tseng - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 8f2454b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -+ -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -+ - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/tseng.man b/man/tseng.man -index 403782f..984c8e7 100644 ---- a/man/tseng.man -+++ b/man/tseng.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH TSENG __drivermansuffix__ __vendorversion__ -diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c -index d4fb847..2412b31 100644 ---- a/src/tseng_cursor.c -+++ b/src/tseng_cursor.c -@@ -159,7 +159,7 @@ TsengSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) - } - } - --void -+static void - TsengLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits) - { - vgaHWPtr hwp = VGAHWPTR(pScrn); -diff --git a/src/tseng_dga.c b/src/tseng_dga.c -index 70ebe23..528ba4c 100644 ---- a/src/tseng_dga.c -+++ b/src/tseng_dga.c -@@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen) - if (!pTseng->DGAnumModes) { - pMode = firstMode = pScrn->modes; - while (pMode) { -- newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec)); -+ newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec)); - if (!newmodes) { -- xfree(modes); -+ free(modes); - return FALSE; - } - modes = newmodes; -@@ -135,7 +135,7 @@ Tseng_OpenFramebuffer( - TsengPtr pTseng = TsengPTR(pScrn); - - *name = NULL; /* no special device */ -- *mem = (unsigned char*)pTseng->FbAddress; -+ *mem = (unsigned char*)(uintptr_t)pTseng->FbAddress; - *size = pTseng->FbMapSize; - *offset = 0; /* Always */ - *flags = 0; /* Root permissions OS-dependent */ -diff --git a/src/tseng_driver.c b/src/tseng_driver.c -index 445c17e..d36b62c 100644 ---- a/src/tseng_driver.c -+++ b/src/tseng_driver.c -@@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn) - pTseng = TsengPTR(pScrn); - - if (pTseng->SavedReg.RAMDAC) -- xfree(pTseng->SavedReg.RAMDAC); -+ free(pTseng->SavedReg.RAMDAC); - -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - -- xfree(devSections); -+ free(devSections); - return foundScreen; - } - -@@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if (!(pTseng->Options = xalloc(sizeof(TsengOptions)))) -+ if (!(pTseng->Options = malloc(sizeof(TsengOptions)))) - return FALSE; - memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options); -@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn) - PDEBUG(" TsengGetFbAddress\n"); - - /* base0 is the framebuffer and base1 is the PCI IO space. */ -- if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) { -+ if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "No valid Framebuffer address in PCI config space;\n"); - return FALSE; -diff --git a/src/tseng_mode.c b/src/tseng_mode.c -index f075226..a3ff87d 100644 ---- a/src/tseng_mode.c -+++ b/src/tseng_mode.c -@@ -41,7 +41,11 @@ vgaHWWriteBank(vgaHWPtr hwp, CARD8 value) - if (hwp->MMIOBase) - MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK, value); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - outb(hwp->PIOOffset + VGA_BANK, value); -+#else -+ pci_io_write8(hwp->io, VGA_BANK, value); -+#endif - } - - CARD8 -@@ -50,7 +54,11 @@ vgaHWReadBank(vgaHWPtr hwp) - if (hwp->MMIOBase) - return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - return inb(hwp->PIOOffset + VGA_BANK); -+#else -+ return pci_io_read8(hwp->io, VGA_BANK); -+#endif - } - - #define VGA_SEGMENT 0x3CD -@@ -61,7 +69,11 @@ vgaHWWriteSegment(vgaHWPtr hwp, CARD8 value) - if (hwp->MMIOBase) - MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT, value); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - outb(hwp->PIOOffset + VGA_SEGMENT, value); -+#else -+ pci_io_write8(hwp->io, VGA_SEGMENT, value); -+#endif - } - - CARD8 -@@ -70,7 +82,11 @@ vgaHWReadSegment(vgaHWPtr hwp) - if (hwp->MMIOBase) - return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - return inb(hwp->PIOOffset + VGA_SEGMENT); -+#else -+ return pci_io_read8(hwp->io, VGA_SEGMENT); -+#endif - } - - /* -@@ -84,8 +100,12 @@ vgaHWWriteModeControl(vgaHWPtr hwp, CARD8 value) - if (hwp->MMIOBase) - MMIO_OUT8(hwp->MMIOBase, - hwp->MMIOOffset + hwp->IOBase + VGA_MODE_CONTROL, value); -- else -- outb(hwp->IOBase + hwp->PIOOffset + VGA_MODE_CONTROL, value); -+ else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ outb(hwp->PIOOffset + VGA_MODE_CONTROL, value); -+#else -+ pci_io_write8(hwp->io, VGA_MODE_CONTROL, value); -+#endif - } - - /* -@@ -110,14 +130,22 @@ vgaHWHerculesSecondPage(vgaHWPtr hwp, Bool Enable) - - MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_HERCULES, tmp); - } else { -- tmp = inb(hwp->PIOOffset + VGA_HERCULES); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ tmp = inb(hwp->PIOOffset + VGA_HERCULES); -+#else -+ tmp = pci_io_read8(hwp->io, VGA_HERCULES); -+#endif - - if (Enable) - tmp |= 0x02; - else - tmp &= ~0x02; - -- outb(hwp->PIOOffset + VGA_HERCULES, tmp); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ outb(hwp->PIOOffset + VGA_HERCULES, tmp); -+#else -+ pci_io_write8(hwp->io, VGA_HERCULES, tmp); -+#endif - } - } - -@@ -1502,7 +1530,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode) - - /* clean up */ - if (new->RAMDAC) -- xfree(new->RAMDAC); -+ free(new->RAMDAC); - - return TRUE; - } diff --git a/extra/xf86-video-vmware/git_fixes.diff b/extra/xf86-video-vmware/git_fixes.diff deleted file mode 100644 index 85894169e..000000000 --- a/extra/xf86-video-vmware/git_fixes.diff +++ /dev/null @@ -1,894 +0,0 @@ -From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Fri, 20 Apr 2012 20:24:26 +0000 -Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces - -This fixes a failed assertion in the gallium/svga driver in the -svga_texture_get_handle() function. The texture resource wasn't -getting created with the PIPE_BIND_SHARED flag so the !cachable -assertion would fail and the X session would abort. This didn't -happen with release builds. - -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c -index 2a18762..8b30e45 100644 ---- a/vmwgfx/vmwgfx_xa_surface.c -+++ b/vmwgfx/vmwgfx_xa_surface.c -@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, - - vpix->staging_format = format; - vpix->staging_remove_flags = 0; -- vpix->staging_add_flags = XA_FLAG_RENDER_TARGET; -+ vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED; - - return TRUE; - } --- -cgit v0.9.0.2-2-gbebe -From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Wed, 06 Jun 2012 08:58:01 +0000 -Subject: vmware: port vmware driver to new compat API - -This is a port of the vmware driver to the new compat API. - -Tested-by: Jakob Bornecrantz <jakob@vmware.com> -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> -Signed-off-by: Dave Airlie <airlied@redhat.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/saa/saa.c b/saa/saa.c -index 173c090..f2d68e9 100644 ---- a/saa/saa.c -+++ b/saa/saa.c -@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable) - * screen private, before calling down to the next CloseScreen. - */ - Bool --saa_close_screen(int i, ScreenPtr pScreen) -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL) - { - struct saa_screen_priv *sscreen = saa_screen(pScreen); - struct saa_driver *driver = sscreen->driver; -@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen) - - free(sscreen); - -- return (*pScreen->CloseScreen) (i, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - struct saa_driver * -diff --git a/saa/saa.h b/saa/saa.h -index c7aa3b6..4e5ced5 100644 ---- a/saa/saa.h -+++ b/saa/saa.h -@@ -44,6 +44,8 @@ - #include <damage.h> - #include <picturestr.h> - -+#include "../src/compat-api.h" -+ - #define SAA_VERSION_MAJOR 0 - #define SAA_VERSION_MINOR 1 - -@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr - saa_bitmap_to_region(PixmapPtr pPix); - - extern _X_EXPORT Bool --saa_close_screen(int i, ScreenPtr pScreen); -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL); - - extern _X_EXPORT Bool - saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC); -diff --git a/src/Makefile.am b/src/Makefile.am -index 04c9e0d..b0dd147 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -37,6 +37,7 @@ endif - vmware_drv_la_SOURCES = \ - bits2pixels.c \ - bits2pixels.h \ -+ compat-api.h \ - guest_os.h \ - includeCheck.h \ - svga_escape.h \ -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..6bc946f ---- a/dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,99 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie <airlied@redhat.com> -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS pScrn->scrnIndex, 0 -+ -+#define XF86_SCRN_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y -+ -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+#define SWITCH_MODE_ARGS(arg, m) arg, m -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS pScrn -+ -+#define XF86_SCRN_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/vmware.c b/src/vmware.c -index e3892f1..41201f1 100644 ---- a/src/vmware.c -+++ b/src/vmware.c -@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap) - pScrn->pScreen->rootDepth), - (pointer)(pVMWARE->FbBase + pScrn->fbOffset)); - -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE); -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE); - } - - vgaHWProtect(pScrn, FALSE); -@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE) - } - - static void --VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags) -+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL) - { - /* FIXME */ - } -@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn) - } - - static Bool --VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) -+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - ScreenPtr save = &pVMWARE->ScrnFuncs; - -@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) - pScrn->DriverFunc = NULL; - #endif - -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static Bool -@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1, - } - - static Bool --VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - vgaHWPtr hwp; - VMWAREPtr pVMWARE; - OptionInfoPtr options; - Bool useXinerama = TRUE; - -- /* Get the ScrnInfoRec */ -- pScrn = xf86Screens[pScreen->myNum]; - pVMWARE = VMWAREPTR(pScrn); - - -@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - VMWAREModeInit(pScrn, pScrn->currentMode, FALSE); - - /* Set the viewport if supported */ -- VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - - /* - * Setup the screen's visuals, and initialise the framebuffer -@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static Bool --VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) -- -+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - ScreenPtr pScreen = pScrn->pScreen; - - pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM + -@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) - } - - static Bool --VMWAREEnterVT(int scrnIndex, int flags) -+VMWAREEnterVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags) - } - - static void --VMWARELeaveVT(int scrnIndex, int flags) -+VMWARELeaveVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags) - } - - static void --VMWAREFreeScreen(int scrnIndex, int flags) -+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL) - { -+ SCRN_INFO_PTR(arg); - /* - * If the vgahw module is used vgaHWFreeHWRec() would be called - * here. - */ -- VMWAREFreeRec(xf86Screens[scrnIndex]); -+ VMWAREFreeRec(pScrn); - } - - static ModeStatus --VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff --git a/src/vmware.h b/src/vmware.h -index 458390a..4818e16 100644 ---- a/src/vmware.h -+++ b/src/vmware.h -@@ -177,7 +177,7 @@ typedef struct { - #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) - - static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { -- return xf86Screens[s->myNum]; -+ return xf86ScreenToScrn(s); - } - - #define MIN(a,b) ((a)<(b)?(a):(b)) -diff --git a/src/vmware_common.h b/src/vmware_common.h -index 9cd7194..5629c10 100644 ---- a/src/vmware_common.h -+++ b/src/vmware_common.h -@@ -32,6 +32,8 @@ - #include <X11/extensions/panoramiXproto.h> - #include <xf86.h> - -+#include "compat-api.h" -+ - xXineramaScreenInfo * - VMWAREParseTopologyString(ScrnInfoPtr pScrn, - const char *topology, -diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c -index 1b82ac4..7de0772 100644 ---- a/vmwgfx/vmwgfx_dri2.c -+++ b/vmwgfx/vmwgfx_dri2.c -@@ -83,7 +83,7 @@ static Bool - dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format) - { - ScreenPtr pScreen = pDraw->pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - BufferPrivatePtr private = buffer->driverPrivate; - PixmapPtr pPixmap; -@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion, - Bool - xorg_dri2_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - DRI2InfoRec dri2info; - int major, minor; -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index ed1eb8c..9959ffb 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -107,14 +107,13 @@ typedef uint8_t uint8; - */ - - static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags); --static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, -- char **argv); --static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags); --static void drv_adjust_frame(int scrnIndex, int x, int y, int flags); --static Bool drv_enter_vt(int scrnIndex, int flags); --static void drv_leave_vt(int scrnIndex, int flags); --static void drv_free_screen(int scrnIndex, int flags); --static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, -+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL); -+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL); -+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL); -+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL); -+static void drv_leave_vt(VT_FUNC_ARGS_DECL); -+static void drv_free_screen(FREE_SCREEN_ARGS_DECL); -+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, - int flags); - - extern void xorg_tracker_set_functions(ScrnInfoPtr scrn); -@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn) - * Internal function definitions - */ - --static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen); -+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL); - - /* - * Internal functions -@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, - - void xorg_flush(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - PixmapPtr pixmap = NULL; -@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen) - free(pixmaps); - } - --static void drv_block_handler(int i, pointer blockData, pointer pTimeout, -- pointer pReadmask) -+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL) - { -- ScreenPtr pScreen = screenInfo.screens[i]; -- modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]); -+ SCREEN_PTR(arg); -+ modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); - - vmwgfx_swap(ms, pScreen, BlockHandler); -- pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); -+ pScreen->BlockHandler(BLOCKHANDLER_ARGS); - vmwgfx_swap(ms, pScreen, BlockHandler); - - vmwgfx_flush_dri2(pScreen); -@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout, - static Bool - drv_create_screen_resources(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - Bool ret; - -@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen) - if (!ret) - return ret; - -- drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - -- return drv_enter_vt(pScreen->myNum, 1); -+ return drv_enter_vt(VT_FUNC_ARGS); - } - - static Bool -@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn) - static Bool - vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) - static Bool - vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors, - - - static Bool --drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+drv_screen_init(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - VisualPtr visual; - -@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static void --drv_adjust_frame(int scrnIndex, int x, int y, int flags) -+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86OutputPtr output = config->output[config->compat_output]; - xf86CrtcPtr crtc = output->crtc; -@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags) - } - - static void --drv_free_screen(int scrnIndex, int flags) -+drv_free_screen(FREE_SCREEN_ARGS_DECL) - { -- drv_free_rec(xf86Screens[scrnIndex]); -+ SCRN_INFO_PTR(arg); -+ drv_free_rec(pScrn); - } - - static void --drv_leave_vt(int scrnIndex, int flags) -+drv_leave_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - modesettingPtr ms = modesettingPTR(pScrn); - - vmwgfx_cursor_bypass(ms->fd, 0, 0); -@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags) - * This gets called when gaining control of the VT, and from ScreenInit(). - */ - static Bool --drv_enter_vt(int scrnIndex, int flags) -+drv_enter_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - if (!drv_set_master(pScrn)) - return FALSE; -@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags) - } - - static Bool --drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags) -+drv_switch_mode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - return xf86SetSingleMode(pScrn, mode, RR_Rotate_0); - } - - static Bool --drv_close_screen(int scrnIndex, ScreenPtr pScreen) -+drv_close_screen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - - if (ms->cursor) { -@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) - xorg_dri2_close(pScreen); - - if (pScrn->vtSema) -- pScrn->LeaveVT(scrnIndex, 0); -+ pScrn->LeaveVT(VT_FUNC_ARGS); - - pScrn->vtSema = FALSE; - -@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) - if (ms->xat) - xa_tracker_destroy(ms->xat); - -- return (*pScreen->CloseScreen) (scrnIndex, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - static ModeStatus --drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h -index 4fcfed6..f78a85f 100644 ---- a/vmwgfx/vmwgfx_driver.h -+++ b/vmwgfx/vmwgfx_driver.h -@@ -46,6 +46,7 @@ - #include <xa_tracker.h> - #include <xf86Module.h> - -+#include "../src/compat-api.h" - #ifdef DRI2 - #include <dri2.h> - #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3)) -@@ -118,9 +119,9 @@ typedef struct _modesettingRec - ScreenBlockHandlerProcPtr saved_BlockHandler; - CreateScreenResourcesProcPtr saved_CreateScreenResources; - CloseScreenProcPtr saved_CloseScreen; -- Bool (*saved_EnterVT)(int, int); -- void (*saved_LeaveVT)(int, int); -- void (*saved_AdjustFrame)(int, int, int, int); -+ Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL); - Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr); - Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr); - -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 469598a..63df3a1 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen) - struct vmwgfx_saa *vsaa = - to_vmwgfx_saa(saa_get_driver(pScreen)); - struct _WsbmListHead *list, *next; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - if (!pScrn->vtSema) - return; -@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver, - struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver); - struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap); - struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix); -- ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen); - - /* - * Make dri2 drawables up to date, or add them to the flush list -diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c -index af53379..449266b 100644 ---- a/vmwgfx/vmwgfx_tex_video.c -+++ b/vmwgfx/vmwgfx_tex_video.c -@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn, - DrawablePtr pDraw) - { - struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data; -- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn); - PixmapPtr pPixmap; - INT32 x1, x2, y1, y2; - BoxRec dstBox; -@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports) - static XF86VideoAdaptorPtr - xorg_setup_textured_adapter(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr adapt; - XF86AttributePtr attrs; -@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen) - void - xorg_xv_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL; - XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL; --- -cgit v0.9.0.2-2-gbebe -From 50c01998c7800bc02fd6656cc14efa715bf63e08 Mon Sep 17 00:00:00 2001 -From: Robert Hooker <sarvatt@ubuntu.com> -Date: Fri, 15 Jun 2012 15:56:59 +0000 -Subject: vmware: Fix up some warnings after new compat API change. - -Fixes multiple instances of these warnings on x86_64: -../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration] -../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs] -../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default] -Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180 - -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> -Signed-off-by: Robert Hooker <sarvatt@ubuntu.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/src/vmware.h b/src/vmware.h -index 4818e16..be113bb 100644 ---- a/src/vmware.h -+++ b/src/vmware.h -@@ -18,6 +18,7 @@ - #include "xf86.h" - #include "xf86_OSproc.h" - -+#include "compat-api.h" - - #include <X11/extensions/panoramiXproto.h> - --- -cgit v0.9.0.2-2-gbebe -From 46c0862d205eefa985e36a74391ca392640cb898 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Sat, 16 Jun 2012 13:43:52 +0000 -Subject: vmware: drop infoFromScreen inline in favour of new interface - -This also should fix the build regression introduced with the fix -for this macro. - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/vmware.h b/src/vmware.h -index be113bb..028dff3 100644 ---- a/src/vmware.h -+++ b/src/vmware.h -@@ -18,8 +18,6 @@ - #include "xf86.h" - #include "xf86_OSproc.h" - --#include "compat-api.h" -- - #include <X11/extensions/panoramiXproto.h> - - #ifdef XSERVER_LIBPCIACCESS -@@ -177,10 +175,6 @@ typedef struct { - - #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) - --static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { -- return xf86ScreenToScrn(s); --} -- - #define MIN(a,b) ((a)<(b)?(a):(b)) - #define MAX(a,b) ((a)>(b)?(a):(b)) - #define ABS(x) (((x) >= 0) ? (x) : -(x)) -diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c -index 2e2effb..93dacc0 100644 ---- a/src/vmwarecurs.c -+++ b/src/vmwarecurs.c -@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] = - #endif - - #include "vmware.h" -+#include "vmware_common.h" - #include "bits2pixels.h" - - static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h, -@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) - static Bool - vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n", - pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0)); -@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src ) - static Bool - vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n", - pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0)); -@@ -283,7 +284,7 @@ Bool - vmwareCursorInit(ScreenPtr pScreen) - { - xf86CursorInfoPtr infoPtr; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); - Bool ret; - - TRACEPOINT -@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen) - void - vmwareCursorCloseScreen(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - #ifdef RENDER - PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen) - void - vmwareCursorHookWrappers(ScreenPtr pScreen) - { -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); - #ifdef RENDER - PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); - #endif -@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h, - unsigned int format, unsigned long planeMask, char *pBinImage) - { - ScreenPtr pScreen = src->pScreen; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen)); - BoxRec box; - Bool hidden = FALSE; - -@@ -412,7 +413,7 @@ static void - VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) - { - ScreenPtr pScreen = pWin->drawable.pScreen; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen)); - BoxPtr pBB; - Bool hidden = FALSE; - -@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, - CARD16 width, CARD16 height) - { - ScreenPtr pScreen = pDst->pDrawable->pScreen; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); - PictureScreenPtr ps = GetPictureScreen(pScreen); - BoxRec box; - Bool hidden = FALSE; -diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c -index 71f21fe..745c71f 100644 ---- a/src/vmwarevideo.c -+++ b/src/vmwarevideo.c -@@ -39,6 +39,7 @@ - #endif - - #include "vmware.h" -+#include "vmware_common.h" - #include "xf86xv.h" - #include "fourcc.h" - #include "svga_escape.h" -@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE) - Bool - vmwareVideoInit(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL; - XF86VideoAdaptorPtr newAdaptor = NULL; - int numAdaptors; -@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen) - void - vmwareVideoEnd(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - VMWAREVideoPtr pVid; - int i; --- -cgit v0.9.0.2-2-gbebe -From e5ac80d8f72963313358e31cfb1ab98583e26f23 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Tue, 03 Jul 2012 12:50:30 +0000 -Subject: vmware: avoid warnings about shadowing 'i' - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..205ac59 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -46,7 +46,7 @@ - #define SCREEN_ARG_TYPE int - #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] - --#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv -+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv - - #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask --- -cgit v0.9.0.2-2-gbebe -From 007bed30270ca9548dfe6e359972b56cbb8e2f13 Mon Sep 17 00:00:00 2001 -From: Jakob Bornecrantz <jakob@vmware.com> -Date: Tue, 29 May 2012 21:01:14 +0000 -Subject: vmwgfx: Guard against null rotate pixmap in shadow destroy - -Reviewed-by: Thomas Hellström <thellstrom@vmware.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c -index eaf87b2..fec04c0 100644 ---- a/vmwgfx/vmwgfx_crtc.c -+++ b/vmwgfx/vmwgfx_crtc.c -@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) - static void - crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data) - { -- ScreenPtr pScreen = rotate_pixmap->drawable.pScreen; -+ ScreenPtr pScreen; - -+ if (rotate_pixmap == NULL) -+ return; -+ -+ pScreen = rotate_pixmap->drawable.pScreen; - pScreen->DestroyPixmap(rotate_pixmap); - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xfce4-smartbookmark-plugin/fix-config-write.patch b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch deleted file mode 100644 index 0f5a25f4f..000000000 --- a/extra/xfce4-smartbookmark-plugin/fix-config-write.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c ---- xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c 2012-11-19 22:24:16.000000000 +0200 -+++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c 2012-11-19 22:24:42.000000000 +0200 -@@ -365,6 +365,7 @@ static void search_create_options(XfcePa - search_apply_options_cb(search); - gtk_widget_destroy(search->opt_dialog); - xfce_panel_plugin_unblock_menu(plugin); -+ search_write_config(plugin, search); - } - - diff --git a/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch b/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch deleted file mode 100644 index 254382182..000000000 --- a/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c -+++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c -@@ -75,18 +75,27 @@ XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(smar - - static gboolean do_search(const char *url, const char *keyword) - { -+ gchar *argv[] = { "exo-open", "--launch", "WebBrowser", NULL, NULL }; -+ gchar *complete_url; -+ gboolean retval; -+ GError *error = NULL; -+ - DBG ("Do search"); -- gchar *execute; -- gboolean success; -- execute = g_strconcat("xfbrowser4 \"", url, NULL);//works better for me -- //execute = g_strconcat("x-www-browser \"", url, NULL); -- execute = g_strconcat(execute, keyword, NULL); -- execute = g_strconcat(execute, "\"", NULL); - -- success = exec_command(execute); -- g_free(execute); -+ complete_url = g_strconcat(url, keyword, NULL); -+ argv[3] = complete_url; -+ -+ retval = g_spawn_async(NULL, (gchar **)argv, NULL, -+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &error); -+ -+ g_free(complete_url); -+ -+ if (!retval) { -+ xfce_err("%s", error->message); -+ g_error_free(error); -+ } - -- return success; -+ return retval; - } diff --git a/extra/xfdesktop/avoid-duplicating-volume-icons.patch b/extra/xfdesktop/avoid-duplicating-volume-icons.patch deleted file mode 100644 index 45e18ac11..000000000 --- a/extra/xfdesktop/avoid-duplicating-volume-icons.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7b8b5cb05bd870549dee2d159e246ce58e325b7f Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evangelos@foutrelis.com> -Date: Tue, 6 Nov 2012 00:10:48 +0200 -Subject: [PATCH] Avoid duplicating volume icons - -This is a workaround for GVFS 1.14.0 which emits volume-added signals -for pre-existing volumes. ---- - src/xfdesktop-file-icon-manager.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c -index 72b6d09..e039cb8 100644 ---- a/src/xfdesktop-file-icon-manager.c -+++ b/src/xfdesktop-file-icon-manager.c -@@ -2521,6 +2521,10 @@ xfdesktop_file_icon_manager_volume_added(GVolumeMonitor *monitor, - { - XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); - -+ /* avoid duplicating volume icons -- workaround for GVFS 1.14.0 */ -+ if (g_hash_table_lookup(fmanager->priv->removable_icons, volume)) -+ return; -+ - xfdesktop_file_icon_manager_add_removable_volume(fmanager, volume); - } - --- -1.8.0 - diff --git a/extra/xfdesktop/implement-paste-on-desktop.patch b/extra/xfdesktop/implement-paste-on-desktop.patch deleted file mode 100644 index a84e6cb05..000000000 --- a/extra/xfdesktop/implement-paste-on-desktop.patch +++ /dev/null @@ -1,236 +0,0 @@ -From dd57435413a10b288153d1ae0062d37e58bcffd1 Mon Sep 17 00:00:00 2001 -From: Eric Koegel <eric.koegel@gmail.com> -Date: Sat, 17 Dec 2011 10:37:04 +0300 -Subject: [PATCH] Adds the code required to perform a paste on the on the - desktop. Fixes bug 3804. - ---- - src/xfdesktop-clipboard-manager.c | 114 ++++++++++++++++++++++++++++++------- - src/xfdesktop-file-icon-manager.c | 27 ++++++++- - 2 files changed, 120 insertions(+), 21 deletions(-) - -diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c -index 76b4bef..ed90aa0 100644 ---- a/src/xfdesktop-clipboard-manager.c -+++ b/src/xfdesktop-clipboard-manager.c -@@ -307,7 +307,6 @@ xfdesktop_clipboard_manager_owner_changed (GtkClipboard *clipboard, - } - - --#if 0 - static void - xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, - GtkSelectionData *selection_data, -@@ -318,6 +317,8 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, - GtkWindow *parent = GTK_WINDOW(gtk_widget_get_toplevel(request->widget)); - gboolean path_copy = TRUE; - GList *path_list = NULL; -+ GList *dest_file_list = NULL; -+ GList *l = NULL; - gchar *data; - - /* check whether the retrieval worked */ -@@ -340,19 +341,43 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, - } - - /* determine the path list stored with the selection */ -- path_list = thunar_vfs_path_list_from_string (data, NULL); -+ path_list = xfdesktop_file_utils_file_list_from_string (data); - } - - /* perform the action if possible */ - if (G_LIKELY (path_list != NULL)) - { -+ for (l = path_list; l; l = l->next) { -+ gchar *dest_basename = g_file_get_basename(l->data); -+ -+ if(dest_basename && *dest_basename != '\0') { -+ /* If we copy a file, we need to use the new absolute filename -+ * as the destination. If we move, we need to use the destination -+ * directory. */ -+ if(path_copy) { -+ GFile *dest_file = g_file_get_child(request->target_file, dest_basename); -+ dest_file_list = g_list_prepend(dest_file_list, dest_file); -+ } else { -+ dest_file_list = g_list_prepend(dest_file_list, request->target_file); -+ } -+ } -+ g_free(dest_basename); -+ } -+ -+ dest_file_list = g_list_reverse(dest_file_list); -+ - if (G_LIKELY (path_copy)) -- xfdesktop_file_utils_copy_into(parent, path_list, request->target_path); -- //thunar_application_copy_into (application, request->widget, path_list, request->target_path, request->new_files_closure); -- else -- xfdesktop_file_utils_move_into(parent, path_list, request->target_path); -- //thunar_application_move_into (application, request->widget, path_list, request->target_path, request->new_files_closure); -- thunar_vfs_path_list_free (path_list); -+ { -+ xfdesktop_file_utils_transfer_files(GDK_ACTION_COPY, -+ path_list, -+ dest_file_list, -+ gtk_widget_get_screen(GTK_WIDGET(parent))); -+ } else { -+ xfdesktop_file_utils_transfer_files(GDK_ACTION_MOVE, -+ path_list, -+ dest_file_list, -+ gtk_widget_get_screen(GTK_WIDGET(parent))); -+ } - - /* clear the clipboard if it contained "cutted data" - * (gtk_clipboard_clear takes care of not clearing -@@ -365,18 +390,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, - * if either the Xserver or our GTK+ version - * doesn't support the XFixes extension. - */ --#if GTK_CHECK_VERSION(2,6,0) - if (!gdk_display_supports_selection_notification (gtk_clipboard_get_display (manager->clipboard))) --#endif - { - xfdesktop_clipboard_manager_owner_changed (manager->clipboard, NULL, manager); - } - } -- else -- { -- /* tell the user that we cannot paste */ --// thunar_dialogs_show_error (request->widget, NULL, _("There is nothing on the clipboard to paste")); -- } - - /* free the request */ - if (G_LIKELY (request->widget != NULL)) -@@ -384,10 +402,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, - if (G_LIKELY (request->new_files_closure != NULL)) - g_closure_unref (request->new_files_closure); - g_object_unref (G_OBJECT (request->manager)); -- thunar_vfs_path_unref (request->target_path); -- g_free (request); -+ -+ g_list_free(dest_file_list); -+ g_list_free(path_list); - } --#endif -+ - - - static void -@@ -654,6 +673,61 @@ xfdesktop_clipboard_manager_cut_files (XfdesktopClipboardManager *manager, - gboolean - xfdesktop_clipboard_manager_get_can_paste (XfdesktopClipboardManager *manager) - { -- /* FIXME: implement */ -- return FALSE; -+ g_return_val_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager), FALSE); -+ return manager->can_paste; -+} -+ -+ -+/** -+ * thunar_clipboard_manager_paste_files: -+ * @manager : a #XfdesktopClipboardManager. -+ * @target_file : the #GFile of the folder to which the contents on the clipboard -+ * should be pasted. -+ * @widget : a #GtkWidget, on which to perform the paste or %NULL if no widget is -+ * known. -+ * @new_files_closure : a #GClosure to connect to the job's "new-files" signal, -+ * which will be emitted when the job finishes with the -+ * list of #GFile<!---->s created by the job, or -+ * %NULL if you're not interested in the signal. -+ * -+ * Pastes the contents from the clipboard associated with @manager to the directory -+ * referenced by @target_file. -+ * Code copied and adapted from thunar-clipboard-manager.c -+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org> -+ * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org> -+ **/ -+void -+xfdesktop_clipboard_manager_paste_files (XfdesktopClipboardManager *manager, -+ GFile *target_file, -+ GtkWidget *widget, -+ GClosure *new_files_closure) -+{ -+ XfdesktopClipboardPasteRequest *request; -+ -+ g_return_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager)); -+ g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget)); -+ -+ /* prepare the paste request */ -+ request = g_slice_new0 (XfdesktopClipboardPasteRequest); -+ request->manager = g_object_ref (G_OBJECT (manager)); -+ request->target_file = g_object_ref (target_file); -+ request->widget = widget; -+ -+ /* take a reference on the closure (if any) */ -+ if (G_LIKELY (new_files_closure != NULL)) -+ { -+ request->new_files_closure = new_files_closure; -+ g_closure_ref (new_files_closure); -+ g_closure_sink (new_files_closure); -+ } -+ -+ /* get notified when the widget is destroyed prior to -+ * completing the clipboard contents retrieval -+ */ -+ if (G_LIKELY (request->widget != NULL)) -+ g_object_add_weak_pointer (G_OBJECT (request->widget), (gpointer) &request->widget); -+ -+ /* schedule the request */ -+ gtk_clipboard_request_contents (manager->clipboard, manager->x_special_gnome_copied_files, -+ xfdesktop_clipboard_manager_contents_received, request); - } -diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c -index d3ca2eb..b7fada2 100644 ---- a/src/xfdesktop-file-icon-manager.c -+++ b/src/xfdesktop-file-icon-manager.c -@@ -858,6 +858,15 @@ xfdesktop_file_icon_menu_delete(GtkWidget *widget, - } - - static void -+xfdesktop_file_icon_menu_paste(GtkWidget *widget, -+ gpointer user_data) -+{ -+ XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); -+ if(widget && fmanager) -+ xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL); -+} -+ -+static void - xfdesktop_file_icon_menu_properties(GtkWidget *widget, - gpointer user_data) - { -@@ -1616,7 +1625,11 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop, - mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL); - gtk_widget_show(mi); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); -- /* FIXME: implement */ -+ if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) { -+ g_signal_connect(G_OBJECT(mi), "activate", -+ G_CALLBACK(xfdesktop_file_icon_menu_paste), -+ fmanager); -+ } else - gtk_widget_set_sensitive(mi, FALSE); - } else { - mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL); -@@ -2098,6 +2111,18 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget, - } - return TRUE; - -+ case GDK_v: -+ case GDK_V: -+ if(!(evt->state & GDK_CONTROL_MASK) -+ || (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK))) -+ { -+ return FALSE; -+ } -+ if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) { -+ xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL); -+ } -+ return TRUE; -+ - case GDK_r: - case GDK_R: - if(!(evt->state & GDK_CONTROL_MASK) --- -1.7.5.4 - diff --git a/extra/xine-ui/fix_lirc.diff b/extra/xine-ui/fix_lirc.diff deleted file mode 100644 index 93890cb5c..000000000 --- a/extra/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/extra/xine-ui/lirc-check-a89347673097.patch b/extra/xine-ui/lirc-check-a89347673097.patch deleted file mode 100644 index c1c8d2614..000000000 --- a/extra/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/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch deleted file mode 100644 index daad4f03a..000000000 --- a/extra/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/extra/xine-ui/xine-ui-0.99.6-libpng15.patch b/extra/xine-ui/xine-ui-0.99.6-libpng15.patch deleted file mode 100644 index 6a5fb5522..000000000 --- a/extra/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/extra/xine-ui/xine-ui-xdg.diff b/extra/xine-ui/xine-ui-xdg.diff deleted file mode 100644 index 959d674b2..000000000 --- a/extra/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/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch deleted file mode 100644 index e3e42d410..000000000 --- a/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 18 Oct 2012 15:11:31 +1000 -Subject: [PATCH] dix: fix zaphod screen scrossing (#54654) - -POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the -coordinates after a screen crossing are already relative to the new screen's -origin. Add that offset to the coordinates before re-setting. - -regression introduced by -commit bafbd99080be49a17be97d2cc758fbe623369945 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed Aug 8 11:34:32 2012 +1000 - - dix: work around scaling issues during WarpPointer (#53037) - -X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654> - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - dix/getevents.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 71d83c4..8b4379d 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, - coordinates were. - */ - if (flags & POINTER_SCREEN) { -- screenx = sx; -- screeny = sy; -+ scr = miPointerGetScreen(pDev); -+ screenx = sx + scr->x; -+ screeny = sy + scr->y; - } - - scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, --- -1.7.11.7 - diff --git a/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff deleted file mode 100644 index 12c110151..000000000 --- a/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff +++ /dev/null @@ -1,116 +0,0 @@ ---- xorg-server-1.12.1/exa/exa_glyphs.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_glyphs.c.new 2012-04-15 11:48:51.683214230 +0200 -@@ -686,6 +686,7 @@ - PixmapPtr pMaskPixmap = 0; - PicturePtr pMask = NULL; - ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ ExaScreenPriv(pScreen); - int width = 0, height = 0; - int x, y; - int first_xOff = list->xOff, first_yOff = list->yOff; -@@ -697,7 +698,6 @@ - ExaGlyphBuffer buffer; - - if (maskFormat) { -- ExaScreenPriv(pScreen); - GCPtr pGC; - xRectangle rect; - -@@ -719,22 +719,20 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - component_alpha = NeedsComponent(maskFormat->format); - pMask = CreatePicture(0, &pMaskPixmap->drawable, - maskFormat, CPComponentAlpha, &component_alpha, - serverClient, &error); -- if (!pMask || -- (!component_alpha && pExaScr->info->CheckComposite && -- !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))) -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; -+ -+ if (!component_alpha && pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)) - { - PictFormatPtr argbFormat; - -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- -- if (!pMask) -- return; -- - /* The driver can't seem to composite to a8, let's try argb (but - * without component-alpha) */ - FreePicture((pointer) pMask, (XID) 0); -@@ -748,15 +746,25 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - - pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0, - serverClient, &error); -- if (!pMask) { -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- return; -- } -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; - } -+ -+ if (pExaScr->info->CheckComposite && -+ (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) || -+ (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) { -+ FreePicture ((pointer) pMask, (XID) 0); -+ goto fallback; -+ } -+ - pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen); - ValidateGC(&pMaskPixmap->drawable, pGC); - rect.x = 0; -@@ -769,6 +777,13 @@ - y = -extents.y1; - } - else { -+ if (pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst))) -+ goto fallback; -+ - x = 0; - y = 0; - } -@@ -834,6 +849,10 @@ - xSrc + x - first_xOff, - ySrc + y - first_yOff, 0, 0, x, y, width, height); - FreePicture((pointer) pMask, (XID) 0); -- (*pScreen->DestroyPixmap) (pMaskPixmap); - } -+ -+ return; -+ -+fallback: -+ ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs); - } ---- xorg-server-1.12.1/exa/exa_render.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_render.c.new 2012-04-15 11:50:35.272482047 +0200 -@@ -878,7 +878,7 @@ - Bool saveMaskRepeat = pMask ? pMask->repeat : 0; - RegionRec region; - -- if (pExaScr->swappedOut) -+ if (pExaScr->fallback_counter || pExaScr->swappedOut) - goto fallback; - - /* Remove repeat in source if useless */ diff --git a/extra/xorg-xdm/LICENSE b/extra/xorg-xdm/LICENSE deleted file mode 100644 index 5f8d6fcc0..000000000 --- a/extra/xorg-xdm/LICENSE +++ /dev/null @@ -1,132 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/app/ - -Copyright 1988, 1989, 1990, 1991, 1994, 1998 -The Open Group -Copyright 2002 Sun Microsystems, Inc. All rights reserved. - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -prngc.c: -Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. -Copyright (c) 2001-2002 Damien Miller. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. 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. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - -dm_socket.h, dm_error.h, dm_auth.h -Copyright 1998 by Thomas E. Dickey <dickey@clark.net> - - All Rights Reserved - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name(s) of the above copyright -holders shall not be used in advertising or otherwise to promote the -sale, use or other dealings in this Software without prior written -authorization. - -genauth.c: -Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All -rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, and the entire permission notice in its entirety, - including the disclaimer of warranties. -2. 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. -3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF -WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. - -Makefile.am -Copyright 2005 Red Hat, Inc. - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Red Hat not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. Red Hat makes no -representations about the suitability of this software for any purpose. It -is provided "as is" without express or implied warranty. - -RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL RED HAT 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/extra/xorg-xdm/xdm-consolekit.patch b/extra/xorg-xdm/xdm-consolekit.patch deleted file mode 100644 index c52a26138..000000000 --- a/extra/xorg-xdm/xdm-consolekit.patch +++ /dev/null @@ -1,225 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -362,6 +362,20 @@ - - AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes) - -+# ConsoleKit support -+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]), -+ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes]) -+if test x"$USE_CONSOLEKIT" != xno; then -+ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector, -+ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no]) -+ if test x"$USE_CONSOLEKIT" = xyes; then -+ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) -+ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT" -+ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" -+ fi -+fi -+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes) -+ - # - # XDM - # ---- a/xdm/session.c -+++ b/xdm/session.c -@@ -66,6 +66,11 @@ - #endif - #endif /* USE_PAM */ - -+#ifdef USE_CONSOLEKIT -+#include <ck-connector.h> -+#include <dbus/dbus.h> -+#endif -+ - #ifdef __SCO__ - #include <prot.h> - #endif -@@ -472,6 +477,97 @@ - } - } - -+#ifdef USE_CONSOLEKIT -+ -+static CkConnector *connector; -+ -+static int openCKSession(struct verify_info *verify, struct display *d) -+{ -+ int ret; -+ DBusError error; -+ char *remote_host_name = ""; -+ dbus_bool_t is_local; -+ char *display_name = ""; -+ char *display_device = ""; -+ char devtmp[16]; -+ -+ if (!use_consolekit) -+ return 1; -+ -+ is_local = d->displayType.location == Local; -+ if (d->peerlen > 0 && d->peer) -+ remote_host_name = d->peer; -+ if (d->name) -+ display_name = d->name; -+ /* how can we get the corresponding tty at best...? */ -+ if (d->windowPath) { -+ display_device = strchr(d->windowPath, ':'); -+ if (display_device && display_device[1]) -+ display_device++; -+ else -+ display_device = d->windowPath; -+ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device); -+ display_device = devtmp; -+ } -+ -+ connector = ck_connector_new(); -+ if (!connector) { -+ LogOutOfMem("ck_connector"); -+ return 0; -+ } -+ -+ dbus_error_init(&error); -+ ret = ck_connector_open_session_with_parameters( -+ connector, &error, -+ "unix-user", &verify->uid, -+ "x11-display", &display_name, -+ "x11-display-device", &display_device, -+ "remote-host-name", &remote_host_name, -+ "is-local", &is_local, -+ NULL); -+ if (!ret) { -+ if (dbus_error_is_set(&error)) { -+ LogError("Dbus error: %s\n", error.message); -+ dbus_error_free(&error); -+ } else { -+ LogError("ConsoleKit error\n"); -+ } -+ LogError("console-kit-daemon not running?\n"); -+ ck_connector_unref(connector); -+ connector = NULL; -+ return 1; -+ } -+ -+ verify->userEnviron = setEnv(verify->userEnviron, -+ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector)); -+ return 1; -+} -+ -+static void closeCKSession(void) -+{ -+ DBusError error; -+ -+ if (!connector) -+ return; -+ -+ dbus_error_init(&error); -+ if (!ck_connector_close_session(connector, &error)) { -+ if (dbus_error_is_set(&error)) { -+ LogError("Dbus error: %s\n", error.message); -+ dbus_error_free(&error); -+ } else { -+ LogError("ConsoleKit close error\n"); -+ } -+ LogError("console-kit-daemon not running?\n"); -+ } -+ ck_connector_unref(connector); -+ connector = NULL; -+} -+#else -+#define openCKSession(v,d) 1 -+#define closeCKSession() -+#endif -+ - void - SessionExit (struct display *d, int status, int removeAuth) - { -@@ -486,6 +580,8 @@ - } - #endif - -+ closeCKSession(); -+ - /* make sure the server gets reset after the session is over */ - if (d->serverPid >= 2 && d->resetSignal) - kill (d->serverPid, d->resetSignal); -@@ -568,6 +664,10 @@ - #ifdef USE_PAM - if (pamh) pam_open_session(pamh, 0); - #endif -+ -+ if (!openCKSession(verify, d)) -+ return 0; -+ - switch (pid = fork ()) { - case 0: - CleanUpChild (); ---- a/include/dm.h -+++ b/include/dm.h -@@ -325,6 +325,9 @@ - extern char *prngdSocket; - extern int prngdPort; - # endif -+#ifdef USE_CONSOLEKIT -+extern int use_consolekit; -+#endif - - extern char *greeterLib; - extern char *willing; ---- a/xdm/resource.c -+++ b/xdm/resource.c -@@ -68,6 +68,9 @@ - char *prngdSocket; - int prngdPort; - #endif -+#ifdef USE_CONSOLEKIT -+int use_consolekit; -+#endif - - char *greeterLib; - char *willing; -@@ -258,6 +261,10 @@ - "false"} , - { "willing", "Willing", DM_STRING, &willing, - ""} , -+#ifdef USE_CONSOLEKIT -+{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit, -+ "true"} , -+#endif - }; - - # define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0]) -@@ -440,7 +447,11 @@ - {"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL }, - {"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL }, - {"-daemon", ".daemonMode", XrmoptionNoArg, "true" }, --{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" } -+{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }, -+#ifdef USE_CONSOLEKIT -+{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" }, -+{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" } -+#endif - }; - - static int originalArgc; ---- a/man/xdm.man -+++ b/man/xdm.man -@@ -51,6 +51,8 @@ - ] [ - .B \-session - .I session_program -+] [ -+.B \-noconsolekit - ] - .SH DESCRIPTION - .I Xdm -@@ -218,6 +220,10 @@ - .IP "\fB\-xrm\fP \fIresource_specification\fP" - Allows an arbitrary resource to be specified, as in most - X Toolkit applications. -+.IP "\fB\-noconsolekit\fP" -+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP -+resource. -+This suppresses the session management using ConsoleKit. - .SH RESOURCES - At many stages the actions of - .I xdm diff --git a/extra/xorg-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD deleted file mode 100644 index a0e22a221..000000000 --- a/extra/xorg-xlsfonts/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 156352 2012-04-17 16:02:26Z andyrtr $ -# Contributor: Jan de Groot <jgc@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=xorg-xlsfonts -pkgver=1.0.4 -pkgrel=1 -pkgdesc='List available X fonts' -url='http://xorg.freedesktop.org/' -license=('custom') -arch=('i686' 'x86_64' 'mips64el') -depends=('libx11') -makedepends=('xorg-util-macros') -source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2") -sha1sums=('6fc23537797bb1ae4945efd8c01e675edf4a4c3f') - -build() { - cd "${srcdir}/xlsfonts-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/xlsfonts-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/extra/xsnow/LICENSE b/extra/xsnow/LICENSE deleted file mode 100644 index b5645bacf..000000000 --- a/extra/xsnow/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ - Copyright - --------- - Xsnow is available freely and you may give it to other people as is, - but I retain all rights. Therefore it does not classify as 'Public - Domain' software. It *is* allowed to package Xsnow for Unix/Linux - distributions, CD-Roms etc, and to make the necessary changes to - makefiles etc. to facilitate this. - -©Copyright 1984, 1988, 1990, 1993-1995, 2000-2001 by Rick Jansen, all rights reserved. diff --git a/extra/xsnow/PKGBUILD b/extra/xsnow/PKGBUILD deleted file mode 100644 index 0a24514ab..000000000 --- a/extra/xsnow/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 122681 2011-05-06 04:34:00Z eric $ -# Maintainer: Eric BĂ©langer <eric@archlinux.org> - -pkgname=xsnow -pkgver=1.42 -pkgrel=5 -pkgdesc="Xsnow will let it snow on the root window and on windows. Santa and his reindeer will complete your festive-season feeling." -arch=('i686' 'x86_64') -url="http://dropmix.xs4all.nl/rick/Xsnow/" -license=('custom') -depends=('libxpm') -makedepends=('imake') -source=(http://dropmix.xs4all.nl/rick/Xsnow/${pkgname}-${pkgver}.tar.gz LICENSE) -md5sums=('451d8fc0a2b5393b428faa496a556036' - '60d377d8f9c0e99297160a464d4a0a9e') -sha1sums=('d63987560dac9c6341e50d270089e40d17031ce3' - 'c93e236bed35a2d5dc23202c1c615d4e146fba49') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - xmkmf - make depend - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" MANPATH=/usr/share/man install install.man - chmod 644 "${pkgdir}/usr/share/man/man1/xsnow.1x" - install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 6f5ca2bce..3d183e555 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174967 2013-01-09 16:07:11Z andyrtr $ +# $Id: PKGBUILD 177809 2013-02-09 09:19:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=288 +pkgver=289 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('b9bef1abf6e397be6fa2e5f534964d17' +md5sums=('a3209a20d3fbd7ab79a458220fa11fde' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD deleted file mode 100644 index fb0564edf..000000000 --- a/extra/xulrunner/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 172188 2012-12-01 13:10:31Z foutrelis $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -pkgname=xulrunner -pkgver=17.0.1 -pkgrel=1 -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' 'sqlite>=3.7.4' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') -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 - shared-libs.patch) -options=('!emptydirs') -replaces=('xulrunner-oss') -md5sums=('13d616028eb77de927c29b6655c832c9' - '4afe63440e2f1935ff90de15db3b70f0' - '27271ce647a83906ef7a24605e840d61' - '52e52f840a49eb1d14be1c0065b03a93') - -build() { - cd "$srcdir/mozilla-release" - cp "$srcdir/mozconfig" .mozconfig - - #fix libdir/sdkdir - fedora - patch -Np1 -i ../mozilla-pkgconfig.patch - patch -Np1 -i ../shared-libs.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,header,typelib,xpidl}.py -} diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig deleted file mode 100644 index 9756e5cee..000000000 --- a/extra/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/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch deleted file mode 100644 index 037d4aee0..000000000 --- a/extra/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/extra/xulrunner/shared-libs.patch b/extra/xulrunner/shared-libs.patch deleted file mode 100644 index 1f22b2b0d..000000000 --- a/extra/xulrunner/shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in ---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD deleted file mode 100644 index 0fc8f4c15..000000000 --- a/extra/zile/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 167747 2012-10-03 14:08:02Z eric $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Kevin Piche <kevin@archlinux.org> - -pkgname=zile -pkgver=2.4.9 -pkgrel=1 -pkgdesc="A small, fast, and powerful Emacs clone" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/zile/" -license=('GPL3') -depends=('acl' 'gc' 'ncurses') -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('f233487e2d0ce99d7670832d106d1a2503d4c925' - 'cfc6f526bd4f14e127b32f91ae3e414e58d722c3') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} |
