Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

12 files changed, 133 insertions, 17 deletions

diff --git a/extra/chromium/.footprint.i686 b/extra/chromium/.footprint.i686
index febbac02c..9bf948565 100644
--- a/extra/chromium/.footprint.i686
+++ b/extra/chromium/.footprint.i686
@@ -215,8 +215,11 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningsErrors.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/dataGrid.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devTools.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspectorCommon.css
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/networkLogView.css
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/chromium.desktop
diff --git a/extra/chromium/.footprint.x86_64 b/extra/chromium/.footprint.x86_64
index febbac02c..9bf948565 100644
--- a/extra/chromium/.footprint.x86_64
+++ b/extra/chromium/.footprint.x86_64
@@ -215,8 +215,11 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningsErrors.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/dataGrid.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devTools.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspectorCommon.css
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/networkLogView.css
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/chromium.desktop
diff --git a/extra/chromium/.md5sum.i686 b/extra/chromium/.md5sum.i686
index 50658de68..b16a25381 100644
--- a/extra/chromium/.md5sum.i686
+++ b/extra/chromium/.md5sum.i686
@@ -1,5 +1,6 @@
-9b9cc4251e2695348cee26bd053dac73  chromium-14.0.835.186.tar.bz2
+49ce2d68ce0c68dbc9175dfee97a71c9  chromium-15.0.874.106.tar.bz2
 a4c98df2c9cc60c9fe7cf6b284114e7b  chromium-gcc-4.6.patch
 b0cd6503593e3abb05beba510fa99fd0  chromium.desktop
 ade38bd8683710f4bf5ce4f006a06788  chromium.sh
+1d78eeed9aee022d542e7c095a06378c  nacl.gypi
 86eb5bc546890abba4f9cba6bf3af4ef  webrtc-r240-r242-make-pulseaudio-optional.patch
diff --git a/extra/chromium/.md5sum.x86_64 b/extra/chromium/.md5sum.x86_64
index 50658de68..b16a25381 100644
--- a/extra/chromium/.md5sum.x86_64
+++ b/extra/chromium/.md5sum.x86_64
@@ -1,5 +1,6 @@
-9b9cc4251e2695348cee26bd053dac73  chromium-14.0.835.186.tar.bz2
+49ce2d68ce0c68dbc9175dfee97a71c9  chromium-15.0.874.106.tar.bz2
 a4c98df2c9cc60c9fe7cf6b284114e7b  chromium-gcc-4.6.patch
 b0cd6503593e3abb05beba510fa99fd0  chromium.desktop
 ade38bd8683710f4bf5ce4f006a06788  chromium.sh
+1d78eeed9aee022d542e7c095a06378c  nacl.gypi
 86eb5bc546890abba4f9cba6bf3af4ef  webrtc-r240-r242-make-pulseaudio-optional.patch
diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile
index c1386ff34..7566cc947 100644
--- a/extra/chromium/Pkgfile
+++ b/extra/chromium/Pkgfile
@@ -6,25 +6,30 @@
 # Run on: gtk,dbus-glib,nss,alsa-lib,xdg-utils,bzip2,libevent,dejavu-ttf,desktop-file-utils,hicolor-icon-theme,keyutils
 
 name=chromium
-version=14.0.835.186
+version=15.0.874.106
+#14.0.835.186
 #12.0.742.100
 release=1
 source=(http://build.chromium.org/official/chromium-$version.tar.bz2
         chromium.desktop
         chromium.sh
         chromium-gcc-4.6.patch
-	webrtc-r240-r242-make-pulseaudio-optional.patch)
+	webrtc-r240-r242-make-pulseaudio-optional.patch
+	nacl.gypi)
+
 
 build() {
   cd $SRC/chromium-$version
 
+  cp ../nacl.gypi chrome/
+
   patch -Np0 -i $SRC/chromium-gcc-4.6.patch
   
   sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
     chrome/browser/ui/webui/print_preview_handler.cc
 
-  patch -d third_party/webrtc -Np1 -i \
-    $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
+#  patch -d third_party/webrtc -Np1 -i \
+#    $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
 
 ### Configure
 
@@ -33,14 +38,11 @@ build() {
     -e 's|/usr/bin/python$|\02|g' \
     -e 's|(/usr/bin/python2)\.4$|\1|g' \
     {} +
-  # There are still a lot of relative calls which need a workaround
-  mkdir "$SRC/python2-path"
-  ln -s /usr/bin/python2 "$SRC/python2-path/python"
-  export PATH="$SRC/python2-path:$PATH"
 
-  # We need to disable system_ssl until "next protocol negotiation" support is
-  # available in our nss package.
-  # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312)
+  # There are still a lot of relative calls which need a workaround
+  mkdir $SRC/python2-path
+  ln -s /usr/bin/python2 $SRC/python2-path/python
+  export PATH=$SRC/python2-path:$PATH
 
   build/gyp_chromium -f make build/all.gyp --depth=. \
     -Dno_strict_aliasing=1 \
diff --git a/extra/chromium/nacl.gypi b/extra/chromium/nacl.gypi
new file mode 100644
index 000000000..05638d6bf
--- /dev/null
+++ b/extra/chromium/nacl.gypi
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'nacl',
+      'type': 'static_library',
+    },
+  ],
+}
diff --git a/extra/iptables/Pkgfile b/extra/iptables/Pkgfile
index 9e74445e7..e965a394d 100755
--- a/extra/iptables/Pkgfile
+++ b/extra/iptables/Pkgfile
@@ -6,14 +6,15 @@
 
 name=iptables
 version=1.4.10
-release=1
+release=2
 source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2 \
 	rc.iptables )
 
 
 build() {
 	source /etc/blfs-bootscripts
-	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+#	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+	 wget  http://nutyx.meticul.eu/files/patchs/aaabasicfs/blfs-bootscripts-$scriptsversion.tar.bz2
         tar xvf $scripts-$scriptsversion.tar.bz2
 
 	cd $name-$version
diff --git a/extra/kdelibs/.md5sum.i686 b/extra/kdelibs/.md5sum.i686
index 7b744ff8b..a63764b50 100644
--- a/extra/kdelibs/.md5sum.i686
+++ b/extra/kdelibs/.md5sum.i686
@@ -1 +1,3 @@
+2b30cc3e382e99333e7ff388943473e9  kde-applications-menu.patch
 abe4c8f848366bcab16c57bbaeb86f1f  kdelibs-4.7.2.tar.bz2
+7941368d5a65e92bc0058f6d513dce39  kdelibs-nepomuk-unicode.diff
diff --git a/extra/kdelibs/.md5sum.x86_64 b/extra/kdelibs/.md5sum.x86_64
index 7b744ff8b..a63764b50 100644
--- a/extra/kdelibs/.md5sum.x86_64
+++ b/extra/kdelibs/.md5sum.x86_64
@@ -1 +1,3 @@
+2b30cc3e382e99333e7ff388943473e9  kde-applications-menu.patch
 abe4c8f848366bcab16c57bbaeb86f1f  kdelibs-4.7.2.tar.bz2
+7941368d5a65e92bc0058f6d513dce39  kdelibs-nepomuk-unicode.diff
diff --git a/extra/kdelibs/Pkgfile b/extra/kdelibs/Pkgfile
index d4f2aa490..0711789aa 100755
--- a/extra/kdelibs/Pkgfile
+++ b/extra/kdelibs/Pkgfile
@@ -8,11 +8,17 @@
 
 name=kdelibs
 version=4.7.2
-release=1
-source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
+release=2
+source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2
+	kde-applications-menu.patch
+	kdelibs-nepomuk-unicode.diff)
 
 build() {
 	cd $name-$version
+
+	patch -p1 -i ../kde-applications-menu.patch
+	patch -p1 -i ../kdelibs-nepomuk-unicode.diff
+
 	sed -i "s/THEME \"default\"/THEME \"Pakxe\"/" plasma/theme.cpp
 	mkdir build
 	cd build
diff --git a/extra/kdelibs/kde-applications-menu.patch b/extra/kdelibs/kde-applications-menu.patch
new file mode 100644
index 000000000..4b513298a
--- /dev/null
+++ b/extra/kdelibs/kde-applications-menu.patch
@@ -0,0 +1,22 @@
+--- 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-nepomuk-unicode.diff b/extra/kdelibs/kdelibs-nepomuk-unicode.diff
new file mode 100644
index 000000000..6a276447d
--- /dev/null
+++ b/extra/kdelibs/kdelibs-nepomuk-unicode.diff
@@ -0,0 +1,65 @@
+diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
+index 055482e..3880e13 100644
+--- a/nepomuk/query/querybuilderdata_p.h
++++ b/nepomuk/query/querybuilderdata_p.h
+@@ -32,6 +32,28 @@
+ #include "query_p.h"
+ #include "groupterm_p.h"
+
++namespace {
++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
++/// utf8 chars which use more than one char, ie. wide chars.
++/// Thus, we simply truncate each term at the first wide char.
++QStringList stripExtendedCharsHack(const QStringList& terms) {
++    QStringList newTerms;
++    foreach(const QString& term, terms) {
++        int i = 0;
++        while(i < term.length()) {
++            if(term[i].unicode() > 0x7f) {
++                break;
++            }
++            ++i;
++        }
++        if(i > 0) {
++            newTerms.append(term.left(i));
++        }
++    }
++    return newTerms;
++}
++}
++
+ namespace Nepomuk {
+     namespace Query {
+         class QueryBuilderData
+@@ -246,16 +268,23 @@ namespace Nepomuk {
+                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
+                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
+                         const QString& varName = it.key();
+-                        const QStringList& terms = it.value();
+-                        // bif:search_excerpt wants a vector of all search terms
+-                        excerptParts
+-                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
+-                            .arg( terms.join(QLatin1String("','")),
+-                                  varName );
++                        const QStringList terms = stripExtendedCharsHack(it.value());
++                        if(terms.count()) {
++                            // bif:search_excerpt wants a vector of all search terms
++                            excerptParts
++                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
++                                       .arg( terms.join(QLatin1String("','")),
++                                             varName );
++                        }
+                     }
+
+-                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
+-                        .arg(excerptParts.join(QLatin1String(",")));
++                    if(excerptParts.count()) {
++                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
++                                .arg(excerptParts.join(QLatin1String(",")));
++                    }
++                    else {
++                        return QString();
++                    }
+                 }
+                 else {
+                     return QString();