summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2010-10-22 17:38:01 +0200
committersibel <lesibel@free.fr>2010-10-22 17:38:01 +0200
commitc63e6509d95f2e1ef7ca3eedeb7c568073f0933a (patch)
tree48031f46c2a47c73ebf61b3cad190f883ec9a908
parent1f058d429a07a149c462e57cdcbdc753261603eb (diff)
parentba59ac9c5ab71b286871992883c73738eb7f9b18 (diff)
downloadnutyx-extra-c63e6509d95f2e1ef7ca3eedeb7c568073f0933a.tar.gz
nutyx-extra-c63e6509d95f2e1ef7ca3eedeb7c568073f0933a.tar.bz2
nutyx-extra-c63e6509d95f2e1ef7ca3eedeb7c568073f0933a.tar.xz
nutyx-extra-c63e6509d95f2e1ef7ca3eedeb7c568073f0933a.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu
-rwxr-xr-xkde/amarok/Pkgfile7
-rw-r--r--kde/amarok/ipodcollection.patch15
-rw-r--r--kde/amarok/scanning-qt-regression.patch80
-rw-r--r--kde/amarok/splash_screen.jpgbin61490 -> 0 bytes
-rwxr-xr-xkde/gtk-kde4/Pkgfile4
-rw-r--r--kde/gtk-kde4/fix-permission.patch20
-rw-r--r--kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch98
-rw-r--r--kde/koffice/libpng14.patch11
8 files changed, 5 insertions, 230 deletions
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index 1c1d1765f..4a3b27816 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -8,9 +8,8 @@
name=amarok
version=2.3.2
release=2
-source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2
- splash_screen.jpg
- scanning-qt-regression.patch)
+source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2 \
+ http://nutyx.meticul.eu/files/patchs/$name/{splash_screen.jpg,scanning-qt-regression.patch}
build() {
cd $name-$version
@@ -26,5 +25,5 @@ build() {
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
make
make DESTDIR=$PKG install
- cp $SRC/splash_screen.jpg $PKG//usr/share/apps/amarok/images/splash_screen.jpg
+ install -m644 $SRC/splash_screen.jpg $PKG//usr/share/apps/amarok/images/splash_screen.jpg
}
diff --git a/kde/amarok/ipodcollection.patch b/kde/amarok/ipodcollection.patch
deleted file mode 100644
index 3782de803..000000000
--- a/kde/amarok/ipodcollection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: index 2507cb7..dbeb161 100644
-===================================================================
---- src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
-+++ src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
-@@ -28,6 +28,10 @@
- extern "C" {
- #include <glib-object.h> // g_type_init
- #ifdef GDK_FOUND
-+// work around compile issue with glib >= 2.25
-+#ifdef signals
-+ #undef signals
-+#endif
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #endif
- }
diff --git a/kde/amarok/scanning-qt-regression.patch b/kde/amarok/scanning-qt-regression.patch
deleted file mode 100644
index 27c6bb067..000000000
--- a/kde/amarok/scanning-qt-regression.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Jeff Mitchell <mitchell@kde.org>
-Date: Wed, 22 Sep 2010 22:15:17 +0000 (-0400)
-Subject: Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML classes...
-X-Git-Url: http://gitweb.kde.org?hp=fd2a40d970c57fa2102e95de1a60c59e37892638
-
-Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML classes don't properly check for invalid chars when writing XML, even if you tell them to.
-
-Also switch to QXmlStreamWriter, as apparently going forward it is the more supported class.
-
-BUG: 251762
----
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index 0a23a53..28c554b 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/utilities/collectionscanner/CollectionScanner.cpp
-@@ -37,13 +37,13 @@
- #include <QByteArray>
- #include <QDBusReply>
- #include <QDir>
--#include <QDomDocument>
- #include <QFile>
- #include <QtDebug>
- #include <QTextCodec>
- #include <QTextStream>
- #include <QTimer>
- #include <QThread>
-+#include <QXmlStreamWriter>
-
- //Taglib:
- #include <apetag.h>
-@@ -814,8 +814,10 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
- void
- CollectionScanner::writeElement( const QString &name, const AttributeHash &attributes )
- {
-- QDomDocument doc; // A dummy. We don't really use DOM, but SAX2
-- QDomElement element = doc.createElement( name );
-+ QString text;
-+ QXmlStreamWriter writer( &text );
-+
-+ writer.writeStartElement( name );
-
- QHashIterator<QString, QString> it( attributes );
- while( it.hasNext() )
-@@ -829,7 +831,15 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
- bool noCategory = false;
- for( unsigned i = 0; i < len; i++ )
- {
-- if( data[i].category() == QChar::NoCategory )
-+ if( data[i].category() == QChar::NoCategory ||
-+ data[i].category() == QChar::Other_Surrogate ||
-+ (
-+ data[i].unicode() < 20 &&
-+ data[i].unicode() != 9 &&
-+ data[i].unicode() != 10 &&
-+ data[i].unicode() != 13
-+ )
-+ )
- {
- noCategory = true;
- break;
-@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
-
- if( noCategory )
- continue;
--
-- element.setAttribute( it.key(), it.value() );
-+ writer.writeAttribute( it.key(), it.value() );
- }
-
-- QString text;
-- QTextStream stream( &text, QIODevice::WriteOnly );
-- element.save( stream, 0 );
-+ writer.writeEndElement();
-
-- std::cout << text.toUtf8().data() << std::endl;
-+ std::cout << text.toUtf8().data() << std::endl << std::endl;
- }
-
- // taken verbatim from Qt's sources, since it's stupidly in the QtGui module
diff --git a/kde/amarok/splash_screen.jpg b/kde/amarok/splash_screen.jpg
deleted file mode 100644
index abacee3f5..000000000
--- a/kde/amarok/splash_screen.jpg
+++ /dev/null
Binary files differ
diff --git a/kde/gtk-kde4/Pkgfile b/kde/gtk-kde4/Pkgfile
index ea1a8b758..cd1c93d14 100755
--- a/kde/gtk-kde4/Pkgfile
+++ b/kde/gtk-kde4/Pkgfile
@@ -7,8 +7,8 @@
name=gtk-kde4
version=0.9.4
release=1
-source=(http://betta.houa.org/no-site/$name\(src\)$version.tar.gz
- fix-permission.patch )
+source=(http://betta.houa.org/no-site/$name\(src\)$version.tar.gz \
+ http://nutyx.meticul.eu/files/patchs/$name/fix-permission.patch )
build() {
mv $name\(src\) $name
cd $name
diff --git a/kde/gtk-kde4/fix-permission.patch b/kde/gtk-kde4/fix-permission.patch
deleted file mode 100644
index 25204e45f..000000000
--- a/kde/gtk-kde4/fix-permission.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtk-kde4/CMakeLists.txt~ 2009-11-21 05:49:31.009714048 +0100
-+++ gtk-kde4/CMakeLists.txt 2009-11-21 05:50:23.879702352 +0100
-@@ -23,14 +23,7 @@
-
- ADD_SUBDIRECTORY(daemon)
-
--INSTALL(FILES daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR} PERMISSIONS WORLD_EXECUTE)
--INSTALL(FILES .gtkrc-2.0-kde4 DESTINATION $ENV{HOME} PERMISSIONS WORLD_READ)
--
--string(LENGTH conf len)
--IF (NOT len)
-- INSTALL(FILES daemon/gtk-kde4.desktop DESTINATION $ENV{XDG_CONFIG_DIRS}/autostart PERMISSIONS WORLD_EXECUTE)
--ELSE()
-- INSTALL(FILES daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart PERMISSIONS WORLD_EXECUTE WORLD_READ)
--ENDIF()
-+INSTALL(PROGRAMS daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR})
-+INSTALL(PROGRAMS daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart)
-
- INSTALL(SCRIPT CMakeSymlink)
-\ No newline at end of file
diff --git a/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch b/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch
deleted file mode 100644
index d380aeeb6..000000000
--- a/kde/koffice/koffice-2.1.2-gcc-4.5.0-1.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- koffice-2.1.2/filters/kword/msword-odf/texthandler.cpp 2010-03-29 15:05:58.000000000 +0200
-+++ koffice-2.1.2.new/filters/kword/msword-odf/texthandler.cpp 2010-05-07 19:02:43.000000000 +0200
-@@ -863,7 +863,7 @@
- unsigned int code = text[0].unicode();
- if ( (code & 0xFF00) == 0xF000 ) // see wv2
- code &= 0x00FF;
-- listStyleWriter.addAttribute( "text:bullet-char", QString::QString( code ).toUtf8() );
-+ listStyleWriter.addAttribute( "text:bullet-char", QString( code ).toUtf8() );
- }
- else
- kWarning(30513) << "Bullet with more than one character, not supported";
---- koffice-2.1.2/krita/ui/widgets/kis_curve_widget.cpp 2010-03-29 15:07:17.000000000 +0200
-+++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget.cpp 2010-05-07 20:14:22.000000000 +0200
-@@ -312,11 +312,11 @@
- curveY = d->m_points.at(i).y();
-
- if (i == d->m_grab_point_index) {
-- p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine));
-+ p.setPen(QPen(Qt::red, 3, Qt::SolidLine));
- p.drawEllipse(QRectF(curveX * wWidth - 2,
- wHeight - 2 - curveY * wHeight, 4, 4));
- } else {
-- p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine));
-+ p.setPen(QPen(Qt::red, 1, Qt::SolidLine));
- p.drawEllipse(QRectF(curveX * wWidth - 3,
- wHeight - 3 - curveY * wHeight, 6, 6));
- }
---- koffice-2.1.2/krita/ui/widgets/kis_curve_widget_p.h 2010-03-29 15:07:17.000000000 +0200
-+++ koffice-2.1.2.new/krita/ui/widgets/kis_curve_widget_p.h 2010-05-07 20:15:38.000000000 +0200
-@@ -439,7 +439,7 @@
- * That is not mandatory but desirable
- */
-
-- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
-+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
- p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight);
- p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight);
- p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight);
---- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp 2010-03-29 15:06:06.000000000 +0200
-+++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp 2010-05-07 20:20:28.000000000 +0200
-@@ -123,7 +123,7 @@
-
- QPixmap gradientpix(width, height);
- QPainter p(&gradientpix);
-- p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
-+ p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
- for (; *i < 256; (*i)++, col += inc) {
- p.setPen(QColor(col, col, col));
- p.drawPoint(x, y);
-@@ -138,7 +138,7 @@
- QPixmap pix(256, height);
- pix.fill();
- QPainter p(&pix);
-- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
-+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
-
- if(m_histogram)
- {
---- koffice-2.1.2/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp 2010-03-29 15:06:06.000000000 +0200
-+++ koffice-2.1.2.new/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp 2010-05-07 20:45:21.000000000 +0200
-@@ -249,7 +249,7 @@
- // Create the horizontal gradient label
- QPixmap hgradientpix(256, 1);
- QPainter hgp(&hgradientpix);
-- hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
-+ hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
- for (i = 0; i < 256; ++i) {
- hgp.setPen(QColor(i, i, i));
- hgp.drawPoint(i, 0);
-@@ -259,7 +259,7 @@
- // Create the vertical gradient label
- QPixmap vgradientpix(1, 256);
- QPainter vgp(&vgradientpix);
-- vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
-+ vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
- for (i = 0; i < 256; ++i) {
- vgp.setPen(QColor(i, i, i));
- vgp.drawPoint(0, 255 - i);
-@@ -271,7 +271,7 @@
- QPixmap pix(256, height);
- pix.fill();
- QPainter p(&pix);
-- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
-+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
-
- double highest = (double)histogram.calculations().getHighest();
- qint32 bins = histogram.producer()->numberOfBins();
---- koffice-2.1.2/krita/plugins/filters/levelfilter/kis_level_filter.cpp 2010-03-29 15:06:23.000000000 +0200
-+++ koffice-2.1.2.new/krita/plugins/filters/levelfilter/kis_level_filter.cpp 2010-05-07 20:48:49.000000000 +0200
-@@ -178,7 +178,7 @@
- pix.fill();
- QPainter p(&pix);
-
-- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
-+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
-
- double highest = (double)histogram->calculations().getHighest();
- qint32 bins = histogram->producer()->numberOfBins();
diff --git a/kde/koffice/libpng14.patch b/kde/koffice/libpng14.patch
deleted file mode 100644
index f4e8da5b1..000000000
--- a/kde/koffice/libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/kis_png_converter.cpp.old 2010-01-20 17:48:11.890898029 +0100
-+++ krita/ui/kis_png_converter.cpp 2010-01-20 17:50:13.477553307 +0100
-@@ -404,7 +404,7 @@
-
- png_byte signature[8];
- iod->peek((char*)signature, 8);
-- if (!png_check_sig(signature, 8)) {
-+ if (!png_sig_cmp(signature, 0, 8) == 0) {
- iod->close();
- return (KisImageBuilder_RESULT_BAD_FETCH);
- }