[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2018-02-25 Thread Antonio Rojas via arch-commits
Date: Monday, February 26, 2018 @ 03:02:27
  Author: arojas
Revision: 317534

ilmbase/openexr 2.2.1 rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-26 00:32:45 UTC (rev 317533)
+++ PKGBUILD2018-02-26 03:02:27 UTC (rev 317534)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.38
 _kdeappver=17.08.3
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('x86_64')
 url='https://www.kde.org/'
@@ -39,10 +39,6 @@
   patch -p1 -i ../kdelibs-no-kdewebkit.patch
   # fix build with openSSL 1.1 (OpenMandriva)
   patch -p1 -i ../kdelibs-openssl-1.1.patch
-
-  sed -e 's/enchant)/enchant-2)/' \
-  -e 's/NAMES enchant$/NAMES enchant-2/' \
-  -i cmake/modules/FindENCHANT.cmake
 }
 
 build() {
@@ -57,7 +53,9 @@
-DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-   -DWITH_SOLID_UDISKS2=ON
+   -DWITH_SOLID_UDISKS2=ON \
+   -DENCHANT_INCLUDE_DIR=/usr/include/enchant-2 \
+   -DENCHANT_LIBRARIES=/usr/lib/libenchant-2.so
make
 }
 


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2018-01-15 Thread Felix Yan via arch-commits
Date: Monday, January 15, 2018 @ 17:58:45
  Author: felixonmars
Revision: 314808

upgpkg: kdelibs 4.14.38-3

rebuild with enchant 2.2.1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-15 17:12:38 UTC (rev 314807)
+++ PKGBUILD2018-01-15 17:58:45 UTC (rev 314808)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.38
 _kdeappver=17.08.3
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('x86_64')
 url='https://www.kde.org/'
@@ -39,6 +39,10 @@
   patch -p1 -i ../kdelibs-no-kdewebkit.patch
   # fix build with openSSL 1.1 (OpenMandriva)
   patch -p1 -i ../kdelibs-openssl-1.1.patch
+
+  sed -e 's/enchant)/enchant-2)/' \
+  -e 's/NAMES enchant$/NAMES enchant-2/' \
+  -i cmake/modules/FindENCHANT.cmake
 }
 
 build() {


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2017-11-22 Thread Antonio Rojas
Date: Wednesday, November 22, 2017 @ 11:02:22
  Author: arojas
Revision: 310556

enchant 2 rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-22 10:42:14 UTC (rev 310555)
+++ PKGBUILD2017-11-22 11:02:22 UTC (rev 310556)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.38
 _kdeappver=17.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('x86_64')
 url='https://www.kde.org/'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2017-07-10 Thread Antonio Rojas
Date: Monday, July 10, 2017 @ 21:41:46
  Author: arojas
Revision: 300053

docbook-xsl 1.79.2 rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-10 21:34:21 UTC (rev 300052)
+++ PKGBUILD2017-07-10 21:41:46 UTC (rev 300053)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.33
 _kdeappver=17.04.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD kdelibs-openssl-1.1.patch)

2017-05-11 Thread Antonio Rojas
Date: Thursday, May 11, 2017 @ 11:43:35
  Author: arojas
Revision: 295812

Build against openSSL 1.1

Added:
  kdelibs/trunk/kdelibs-openssl-1.1.patch
Modified:
  kdelibs/trunk/PKGBUILD

---+
 PKGBUILD  |   13 
 kdelibs-openssl-1.1.patch | 4007 
 2 files changed, 4015 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-11 11:36:42 UTC (rev 295811)
+++ PKGBUILD2017-05-11 11:43:35 UTC (rev 295812)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.32
 _kdeappver=17.04.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'
@@ -17,12 +17,14 @@
 'media-player-info' 'libutempter' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
 
source=("https://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
'kdelibs-no-kdewebkit.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
+'kdelibs-no-kdewebkit.patch' 'kdelibs-openssl-1.1.patch')
 sha256sums=('2133e863b21c197c75bd6a6ac60773422ef026c33acb57b8c7628a09f483bd83'
 '0eed754cf3e9f41be5ea22314bf49cf5571b421d81b8f525287830bd1b9b684e'
 '877df7357360b70d9f7d6bc8c211f82fd8b00cc2eb34e9993ff6aae20faf1cad'
 'ced10a9a83ff2a7f82edf51f6f399f8338b34ab5a589ef43637517d204843bea'
-'2df372f1bfcef1902349f9ca8820315030d39dd2bb769776b94fd3fcbf9621f5')
+'2df372f1bfcef1902349f9ca8820315030d39dd2bb769776b94fd3fcbf9621f5'
+'42f86279515bead6e9f89b1fc3ea58e0a648d41fae343de95297f995dedcdd71')
 
 prepare() {
   mkdir -p build
@@ -35,6 +37,8 @@
   patch -p1 -i ../qt4.patch
   # disable kdewebkit (Fedora)
   patch -p1 -i ../kdelibs-no-kdewebkit.patch
+  # fix build with openSSL 1.1 (OpenMandriva)
+  patch -p1 -i ../kdelibs-openssl-1.1.patch
 }
 
 build() {
@@ -49,8 +53,7 @@
-DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-   -DWITH_SOLID_UDISKS2=ON \
-   -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0
+   -DWITH_SOLID_UDISKS2=ON
make
 }
 

Added: kdelibs-openssl-1.1.patch
===
--- kdelibs-openssl-1.1.patch   (rev 0)
+++ kdelibs-openssl-1.1.patch   2017-05-11 11:43:35 UTC (rev 295812)
@@ -0,0 +1,4007 @@
+--- kdelibs-4.14.26/kio/CMakeLists.txt.omv~2016-11-14 22:38:29.427137096 
+0100
 kdelibs-4.14.26/kio/CMakeLists.txt 2016-11-14 22:39:21.476667341 +0100
+@@ -325,6 +325,7 @@ install(FILES kssl/ksslcertificatemanage
+ DESTINATION  ${DATA_INSTALL_DIR}/kconf_update)
+ 
+ kde4_add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS})
++target_link_libraries(kio -lssl -lcrypto)
+ 
+ if(NOT KIO_NO_NEPOMUK)
+   kde4_add_executable(kfilemetadatareader ${kfilemetadatareaderprocess_SRCS})
+--- kdelibs-4.14.26/kio/kssl/kopenssl.cpp.omv~ 2016-11-07 00:11:51.0 
+0100
 kdelibs-4.14.26/kio/kssl/kopenssl.cpp  2016-11-14 22:11:02.355008887 
+0100
+@@ -18,223 +18,52 @@
+ 
+ #include "kopenssl.h"
+ 
+-#include 
+ #include 
+ 
+-#ifdef KSSL_HAVE_SSL
++#if KSSL_HAVE_SSL
+ #include 
++#include 
+ #endif
+ 
+-#include 
+ #include 
+ #include 
+-#include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+-
+-#include 
+-#include 
+-
+-extern "C" {
+-#ifdef KSSL_HAVE_SSL
+-static int (*K_SSL_connect) (SSL *) = 0L;
+-static int (*K_SSL_accept)  (SSL *) = 0L;
+-static int (*K_SSL_read)(SSL *, void *, int) = 0L;
+-static int (*K_SSL_write)   (SSL *, const void *, int) = 0L;
+-static SSL *(*K_SSL_new)(SSL_CTX *) = 0L;
+-static void (*K_SSL_free)   (SSL *) = 0L;
+-static int (*K_SSL_shutdown)(SSL *) = 0L;
+-static SSL_CTX *(*K_SSL_CTX_new)(SSL_METHOD *) = 0L;
+-static void (*K_SSL_CTX_free)   (SSL_CTX *) = 0L;
+-static int (*K_SSL_set_fd)  (SSL *, int) = 0L;
+-static int (*K_SSL_pending) (SSL *) = 0L;
+-static int (*K_SSL_peek)(SSL *, void *, int) = 0L;
+-static int (*K_SSL_CTX_set_cipher_list)(SSL_CTX *, const char *) = 0L;
+-static void (*K_SSL_CTX_set_verify)(SSL_CTX *, int,
+- int (*)(int, X509_STORE_CTX *)) = 0L;
+-static int (*K_SSL_use_certificate)(SSL *, X509 *) = 0L;
+-static SSL_CIPHER *(*K_SSL_get_current_cipher)(SSL *) = 0L;
+-static long (*K_SSL_ctrl)  (SSL *,int, long, char *) = 0L;
+-static int (*K_RAND_egd)(const char *) = 0L;
+-static const char* (*K_RAND_file_name) (char *, size_t) = 0L;
+-static int (*K_RAND_load_file)  (const char *, long) = 0L;
+-static int (*K_RAND_write_file) (const char *) = 0L;
+-static SSL_METHOD * (*K_TLSv1_client_method) () = 0L;
+-static SSL_METHOD * (*K_SSLv23_client_method) () = 0L;
+-static X509 * 

[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2017-05-10 Thread Antonio Rojas
Date: Wednesday, May 10, 2017 @ 10:47:44
  Author: arojas
Revision: 295530

Early update to fix CVE-2017-8422

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-10 09:54:35 UTC (rev 295529)
+++ PKGBUILD2017-05-10 10:47:44 UTC (rev 295530)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=kdelibs
-pkgver=4.14.31
-_kdeappver=17.04.0
+pkgver=4.14.32
+_kdeappver=17.04.1
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
 
source=("https://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
'kdelibs-no-kdewebkit.patch')
-sha256sums=('c1944fbff6a5ee75d7116137730ccfe8eb72c765e71909dd79de92cf810e5101'
+sha256sums=('2133e863b21c197c75bd6a6ac60773422ef026c33acb57b8c7628a09f483bd83'
 '0eed754cf3e9f41be5ea22314bf49cf5571b421d81b8f525287830bd1b9b684e'
 '877df7357360b70d9f7d6bc8c211f82fd8b00cc2eb34e9993ff6aae20faf1cad'
 'ced10a9a83ff2a7f82edf51f6f399f8338b34ab5a589ef43637517d204843bea'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2017-02-28 Thread Antonio Rojas
Date: Tuesday, February 28, 2017 @ 19:06:41
  Author: arojas
Revision: 289740

Backport security fix

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-28 19:01:07 UTC (rev 289739)
+++ PKGBUILD2017-02-28 19:06:41 UTC (rev 289740)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.29
 _kdeappver=16.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'
@@ -17,12 +17,14 @@
 'media-player-info' 'libutempter' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
 
source=("https://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
'kdelibs-no-kdewebkit.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
'kdelibs-no-kdewebkit.patch'
+
kdelibs-sanitize-url.patch::"https://cgit.kde.org/kdelibs.git/patch/?id=1804c2fd;)
 sha1sums=('d04e3fe612cef075d2023f6cef1938ff236f19d3'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-  'ee83d517c2d8dbe611e263ef16df87f39531fe72')
+  'ee83d517c2d8dbe611e263ef16df87f39531fe72'
+  '25c65eb2dd321b45e216d8b8adae2312bff06ee5')
 
 prepare() {
   mkdir -p build
@@ -35,6 +37,8 @@
   patch -p1 -i ../qt4.patch
   # disable kdewebkit (Fedora)
   patch -p1 -i ../kdelibs-no-kdewebkit.patch
+  # Sanitize URLs before passing them to FindProxyForURL
+  patch -p1 -i ../kdelibs-sanitize-url.patch
 }
 
 build() {


[arch-commits] Commit in kdelibs/trunk (PKGBUILD kdelibs-no-kdewebkit.patch)

2017-02-07 Thread Antonio Rojas
Date: Tuesday, February 7, 2017 @ 08:19:18
  Author: arojas
Revision: 288154

Kill kdewebkit (FS#52645)

Added:
  kdelibs/trunk/kdelibs-no-kdewebkit.patch
Modified:
  kdelibs/trunk/PKGBUILD

+
 PKGBUILD   |   11 +++-
 kdelibs-no-kdewebkit.patch |  100 +++
 2 files changed, 107 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-07 07:36:34 UTC (rev 288153)
+++ PKGBUILD2017-02-07 08:19:18 UTC (rev 288154)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.28
 _kdeappver=16.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'
@@ -14,14 +14,15 @@
 depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
-'media-player-info' 'libutempter' 'qtwebkit' 'icu')
+'media-player-info' 'libutempter' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
 
source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
'kdelibs-no-kdewebkit.patch')
 sha1sums=('3921bef4c2e7ce97bf5fcef8f3db8ddf3b096d9e'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+  'ee83d517c2d8dbe611e263ef16df87f39531fe72')
 
 prepare() {
   mkdir -p build
@@ -32,6 +33,8 @@
   patch -p1 -i ../archlinux-menu.patch
   # qmake refers to Qt5
   patch -p1 -i ../qt4.patch
+  # disable kdewebkit (Fedora)
+  patch -p1 -i ../kdelibs-no-kdewebkit.patch
 }
 
 build() {

Added: kdelibs-no-kdewebkit.patch
===
--- kdelibs-no-kdewebkit.patch  (rev 0)
+++ kdelibs-no-kdewebkit.patch  2017-02-07 08:19:18 UTC (rev 288154)
@@ -0,0 +1,100 @@
+diff -up kdelibs-4.14.16/CMakeLists.txt.webkit kdelibs-4.14.16/CMakeLists.txt
+--- kdelibs-4.14.16/CMakeLists.txt.webkit  2016-01-07 00:02:22.0 
+0100
 kdelibs-4.14.16/CMakeLists.txt 2016-01-28 13:03:53.556194927 +0100
+@@ -356,7 +356,6 @@ if(NOT WINCE)
+ add_subdirectory( plasma )
+ endif(NOT WINCE)
+ add_subdirectory( kunitconversion )
+-add_subdirectory( kdewebkit )
+ add_subdirectory( includes )
+ 
+ add_subdirectory( experimental )
+diff -up kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit 
kdelibs-4.14.16/kdewidgets/CMakeLists.txt
+--- kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit   2016-01-28 
13:03:53.527196020 +0100
 kdelibs-4.14.16/kdewidgets/CMakeLists.txt  2016-01-28 13:03:53.556194927 
+0100
+@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
+ install(TARGETS kdedeprecated  DESTINATION 
${PLUGIN_INSTALL_DIR}/plugins/designer )
+   endif(NOT KDE_NO_DEPRECATED)
+ 
+-
+-  # kdewebkit widgets
+-  include_directories(
+-${CMAKE_SOURCE_DIR}/kdewebkit
+-  )
+-
+-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+-COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o 
${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp 
${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
+-MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
+-
+-  set(kdewebkitwidgets_PART_SRCS
+- classpreviews.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+-  )
+-
+-  qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp 
${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
+-
+-
+-  qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
+-
+-  kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
+-
+-  target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} 
${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
+-  if(NOT WIN32)
+-set_target_properties(kdewebkitwidgets PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${LIB_INSTALL_DIR}
+- )
+-  endif(NOT WIN32)
+-
+-  install(TARGETS kdewebkitwidgets  DESTINATION 
${PLUGIN_INSTALL_DIR}/plugins/designer )
+-
+-
+   if (QT_QT3SUPPORT_FOUND)
+ 
+  include_directories(
+diff -up kdelibs-4.14.16/plasma/CMakeLists.txt.webkit 
kdelibs-4.14.16/plasma/CMakeLists.txt
+--- kdelibs-4.14.16/plasma/CMakeLists.txt.webkit   2016-01-07 
00:02:22.0 +0100
 kdelibs-4.14.16/plasma/CMakeLists.txt  2016-01-28 13:26:55.730137496 
+0100
+@@ -11,6 +11,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
+ 

[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2016-11-22 Thread Levente Polyak
Date: Tuesday, November 22, 2016 @ 15:48:41
  Author: anthraxx
Revision: 281920

upgpkg: kdelibs 4.14.26-3 (jasper rebuild)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-22 15:31:31 UTC (rev 281919)
+++ PKGBUILD2016-11-22 15:48:41 UTC (rev 281920)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.26
 _kdeappver=16.08.3
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2016-11-10 Thread Antonio Rojas
Date: Thursday, November 10, 2016 @ 18:59:38
  Author: arojas
Revision: 280504

jasper 1.900.24 rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-10 18:58:52 UTC (rev 280503)
+++ PKGBUILD2016-11-10 18:59:38 UTC (rev 280504)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.26
 _kdeappver=16.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2016-09-10 Thread Antonio Rojas
Date: Saturday, September 10, 2016 @ 14:51:12
  Author: arojas
Revision: 276131

Drop strigi dependency

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-10 14:39:28 UTC (rev 276130)
+++ PKGBUILD2016-09-10 14:51:12 UTC (rev 276131)
@@ -6,23 +6,25 @@
 pkgname=kdelibs
 pkgver=4.14.24
 _kdeappver=16.08.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'
 license=('GPL' 'LGPL' 'FDL')
 depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
-'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
+'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libutempter' 'qtwebkit' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
 
source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
kdelibs-gcc6.patch)
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
kdelibs-gcc6.patch
+
kdelibs-no-strigi.patch::"https://quickgit.kde.org/?p=kdelibs.git=commitdiff=ba77ceb1=plain;)
 sha1sums=('1ce08be17b5c55a1b8427ce859d1b897c6dc4bc3'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-  '575e52f537e37eeaaaeb639268f9bfa394e7c58d')
+  '575e52f537e37eeaaaeb639268f9bfa394e7c58d'
+  'a15b222627c253d29ca18a042a0c5ee2c67913f6')
 
 prepare() {
   mkdir -p build
@@ -35,6 +37,8 @@
   patch -p1 -i ../qt4.patch
   # fix build with GCC 6 (Fedora)
   patch -p1 -i ../kdelibs-gcc6.patch   
+  # make strigi optional
+  patch -p1 -i ../kdelibs-no-strigi.patch
 }
 
 build() {


[arch-commits] Commit in kdelibs/trunk (PKGBUILD kdelibs.install)

2016-04-28 Thread Felix Yan
Date: Thursday, April 28, 2016 @ 09:24:06
  Author: fyan
Revision: 266408

upgpkg: kdelibs 4.14.19-2

Hooks rebuild (part 1)

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/kdelibs.install

-+
 PKGBUILD|5 ++---
 kdelibs.install |   13 -
 2 files changed, 2 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-28 07:03:54 UTC (rev 266407)
+++ PKGBUILD2016-04-28 07:24:06 UTC (rev 266408)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.19
 _kdeappver=16.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'
@@ -16,8 +16,7 @@
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libutempter' 'qtwebkit' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
-install=$pkgname.install
-source=("http://download.kde.org/unstable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
+source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
 sha1sums=('82a3db2c013d269ba850c06c9d1ac53ef6c44623'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'

Deleted: kdelibs.install
===
--- kdelibs.install 2016-04-28 07:03:54 UTC (rev 266407)
+++ kdelibs.install 2016-04-28 07:24:06 UTC (rev 266408)
@@ -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
-}


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2016-01-03 Thread Antonio Rojas
Date: Sunday, January 3, 2016 @ 13:46:34
  Author: arojas
Revision: 257482

Update to 1.0.5

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-03 12:37:33 UTC (rev 257481)
+++ PKGBUILD2016-01-03 12:46:34 UTC (rev 257482)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.15
 _kdeappver=15.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-12-16 Thread Antonio Rojas
Date: Wednesday, December 16, 2015 @ 13:44:18
  Author: arojas
Revision: 256471

Update to 4.14.15

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-16 12:39:09 UTC (rev 256470)
+++ PKGBUILD2015-12-16 12:44:18 UTC (rev 256471)
@@ -4,9 +4,9 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=kdelibs
-pkgver=4.14.14
-_kdeappver=15.08.3
-pkgrel=4
+pkgver=4.14.15
+_kdeappver=15.12.0
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -16,8 +16,8 @@
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz;
+install=$pkgname.install
+source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
 sha1sums=('7a50824fbcd2a4a72c8780da7b1425b038415419'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
@@ -28,16 +28,16 @@
mkdir -p build
cd ${pkgname}-${pkgver}
# avoid file conflict with gnome-menus
-   patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+   patch -p1 -i ../kde-applications-menu.patch
# add Archlinux menu entry
-   patch -p1 -i "${srcdir}"/archlinux-menu.patch
+   patch -p1 -i ../archlinux-menu.patch
# qmake refers to Qt5
-   patch -p1 -i "${srcdir}"/qt4.patch
+   patch -p1 -i ../qt4.patch
 }
 
 build() {
cd build
-   cmake ../${pkgname}-${pkgver} \
+   cmake ../$pkgname-$pkgver \
-DCMAKE_BUILD_TYPE=Release \
-DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
@@ -52,11 +52,11 @@
 }
 
 package() {
-   cd "${srcdir}"/build
-   make DESTDIR="${pkgdir}" install
+   cd 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
+   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
 }


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-12-06 Thread Bartłomiej Piotrowski
Date: Sunday, December 6, 2015 @ 13:56:07
  Author: bpiotrowski
Revision: 252816

C++11 ABI rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 12:51:24 UTC (rev 252815)
+++ PKGBUILD2015-12-06 12:56:07 UTC (rev 252816)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.14
 _kdeappver=15.08.3
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras
Date: Sunday, December 6, 2015 @ 10:56:36
  Author: foutrelis
Revision: 252705

C++11 ABI rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 09:45:15 UTC (rev 252704)
+++ PKGBUILD2015-12-06 09:56:36 UTC (rev 252705)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.14
 _kdeappver=15.08.3
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-11-19 Thread Antonio Rojas
Date: Thursday, November 19, 2015 @ 19:46:51
  Author: arojas
Revision: 251254

Fix taglib 1.10 detection

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-19 18:37:36 UTC (rev 251253)
+++ PKGBUILD2015-11-19 18:46:51 UTC (rev 251254)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.14
 _kdeappver=15.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,11 +18,12 @@
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 install=${pkgname}.install
 
source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
'taglib-1.10.patch')
 sha1sums=('6d40602f048bcec658e86094abc17602d63c17f0'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+  '8aba7252966f68d4b2eae2a6300031fefbea6300')
 
 prepare() {
mkdir -p build
@@ -33,6 +34,8 @@
patch -p1 -i "${srcdir}"/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i "${srcdir}"/qt4.patch
+   # Fix taglib 1.10 detection (Fedora)
+   patch -p1 -i ../taglib-1.10.patch
 }
 
 build() {


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-10-09 Thread Antonio Rojas
Date: Friday, October 9, 2015 @ 11:21:13
  Author: arojas
Revision: 248682

Update qca dependencies

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-09 09:21:01 UTC (rev 248681)
+++ PKGBUILD2015-10-09 09:21:13 UTC (rev 248682)
@@ -11,7 +11,7 @@
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
-depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt4' 'polkit-qt4'
+depends=('attica-qt4' 'libxss' 'krb5' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-09-24 Thread Antonio Rojas
Date: Friday, September 25, 2015 @ 07:54:52
  Author: arojas
Revision: 247337

Fix _kdeappver (FS#46428)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-25 03:35:56 UTC (rev 247336)
+++ PKGBUILD2015-09-25 05:54:52 UTC (rev 247337)
@@ -5,7 +5,7 @@
 
 pkgname=kdelibs
 pkgver=4.14.12
-_kdeappver=15.08.0
+_kdeappver=15.08.1
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-08-18 Thread Antonio Rojas
Date: Wednesday, August 19, 2015 @ 00:43:39
  Author: arojas
Revision: 243962

Update to 4.14.11

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-18 21:50:10 UTC (rev 243961)
+++ PKGBUILD2015-08-18 22:43:39 UTC (rev 243962)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.14.10
-_kdeappver=15.04.3
+pkgver=4.14.11
+_kdeappver=15.08.0
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('0f05d3d85d29dae45f3d7c246ae2e88ea91ab94f'
+sha1sums=('b25177d6247db8b83faed710f5e713a81c8f8e81'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-06-19 Thread Antonio Rojas
Date: Friday, June 19, 2015 @ 19:02:58
  Author: arojas
Revision: 241048

libdbusmenu-qt - libdbusmenu-qt4

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-19 17:02:21 UTC (rev 241047)
+++ PKGBUILD2015-06-19 17:02:58 UTC (rev 241048)
@@ -11,7 +11,7 @@
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
-depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'polkit-qt4'
+depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt4' 'polkit-qt4'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-06-02 Thread Antonio Rojas
Date: Tuesday, June 2, 2015 @ 08:45:17
  Author: arojas
Revision: 240011

Fix source

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-02 06:45:10 UTC (rev 240010)
+++ PKGBUILD2015-06-02 06:45:17 UTC (rev 240011)
@@ -5,7 +5,7 @@
 
 pkgname=kdelibs
 pkgver=4.14.9
-_kdeappver=15.04.1
+_kdeappver=15.04.2
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-05-08 Thread Sven-Hendrik Haase
Date: Friday, May 8, 2015 @ 21:06:30
  Author: svenstaro
Revision: 238727

upgpkg: kdelibs 4.14.7-3

rebuild for openexr 2.2

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 19:05:21 UTC (rev 238726)
+++ PKGBUILD2015-05-08 19:06:30 UTC (rev 238727)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.7
 _kdeappver=15.04.0
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'


[arch-commits] Commit in kdelibs/trunk (PKGBUILD dolphin-places.patch)

2015-04-30 Thread Antonio Rojas
Date: Thursday, April 30, 2015 @ 10:28:34
  Author: arojas
Revision: 238284

Fix disappearing bookmarks in Dolphin (FS#44186)

Added:
  kdelibs/trunk/dolphin-places.patch
Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |9 ++-
 dolphin-places.patch |  119 +
 2 files changed, 125 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-30 07:52:38 UTC (rev 238283)
+++ PKGBUILD2015-04-30 08:28:34 UTC (rev 238284)
@@ -6,7 +6,7 @@
 pkgname=kdelibs
 pkgver=4.14.7
 _kdeappver=15.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,11 +18,12 @@
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4')
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 
'dolphin-places.patch')
 sha1sums=('6de82328f692717b97ad6833109a564a7b6a0a9a'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+  'a53959b740b66054f981139430f91885657d5e94')
 
 prepare() {
mkdir build
@@ -33,6 +34,8 @@
patch -p1 -i ${srcdir}/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i ${srcdir}/qt4.patch
+# fix disappearing bookmarks in Dolphin 
https://bugs.kde.org/show_bug.cgi?id=345174
+  patch -p1 -i $srcdir/dolphin-places.patch
 }
 
 build() {

Added: dolphin-places.patch
===
--- dolphin-places.patch(rev 0)
+++ dolphin-places.patch2015-04-30 08:28:34 UTC (rev 238284)
@@ -0,0 +1,119 @@
+From: Emmanuel Pescosta emmanuelpescosta...@gmail.com
+Date: Wed, 29 Apr 2015 14:02:02 +
+Subject: Remove bookmarks syncing from KFilePlacesModel and use 
user-places.xbel only.
+X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.gita=commitdiffh=5c0a31a2f2a46aa44b8c34baae67b6951b2abcaf
+---
+Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only.
+
+FIXED-IN: 4.14.8
+BUG: 345174
+REVIEW: 123568
+---
+
+
+--- a/kfile/CMakeLists.txt
 b/kfile/CMakeLists.txt
+@@ -22,7 +22,6 @@
+   kfilewidget.cpp
+   kfileplacesitem.cpp
+   kfileplacesmodel.cpp
+-  kfileplacessharedbookmarks.cpp
+   kfileplacesview.cpp
+   kfileplaceeditdialog.cpp
+   kfilepreviewgenerator.cpp
+
+--- a/kfile/kfileplacesmodel.cpp
 b/kfile/kfileplacesmodel.cpp
+@@ -19,7 +19,6 @@
+ */
+ #include kfileplacesmodel.h
+ #include kfileplacesitem_p.h
+-#include kfileplacessharedbookmarks_p.h
+ 
+ #ifdef _WIN32_WCE
+ #include Windows.h
+@@ -61,10 +60,9 @@
+ class KFilePlacesModel::Private
+ {
+ public:
+-Private(KFilePlacesModel *self) : q(self), bookmarkManager(0), 
sharedBookmarks(0) {}
++Private(KFilePlacesModel *self) : q(self), bookmarkManager(0) {}
+ ~Private()
+ {
+-delete sharedBookmarks;
+ qDeleteAll(items);
+ }
+ 
+@@ -76,7 +74,6 @@
+ 
+ Solid::Predicate predicate;
+ KBookmarkManager *bookmarkManager;
+-KFilePlacesSharedBookmarks * sharedBookmarks;
+ 
+ void reloadAndSignal();
+ QListKFilePlacesItem * loadBookmarkList();
+@@ -93,8 +90,8 @@
+ KFilePlacesModel::KFilePlacesModel(QObject *parent)
+ : QAbstractItemModel(parent), d(new Private(this))
+ {
+-const QString file = KStandardDirs::locateLocal(data, 
kfileplaces/bookmarks.xml);
+-d-bookmarkManager = KBookmarkManager::managerForFile(file, 
kfilePlaces);
++const QString file = KStandardDirs().localxdgdatadir() + 
user-places.xbel;
++d-bookmarkManager = KBookmarkManager::managerForExternalFile(file);
+ 
+ // Let's put some places in there if it's empty. We have a corner case 
here:
+ // Given you have bookmarked some folders (which have been saved on
+@@ -145,9 +142,6 @@
+ // user-places.xbel will be filled later). (ereslibre)
+ d-bookmarkManager-saveAs(file);
+ }
+-
+-// create after, so if we have own places, they are added afterwards, in 
case of equal priorities
+-d-sharedBookmarks = new KFilePlacesSharedBookmarks(d-bookmarkManager);
+ 
+ QString predicate( StorageVolume.ignored == false AND [ 
StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]
+  OR 
+@@ -632,8 +626,6 @@
+ return false;
+ }
+ 
+-d-sharedBookmarks-updateSharedBookmarks();
+-
+ d-reloadAndSignal();
+ 
+ return true;
+@@ -660,8 +652,6 @@
+ KFilePlacesItem *item = 
static_castKFilePlacesItem*(after.internalPointer());
+ 

[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-02-03 Thread Felix Yan
Date: Wednesday, February 4, 2015 @ 04:33:17
  Author: fyan
Revision: 230412

upgpkg: kdelibs 4.14.5-1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-04 01:50:30 UTC (rev 230411)
+++ PKGBUILD2015-02-04 03:33:17 UTC (rev 230412)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.14.4
-_kdeappver=14.12.1
+pkgver=4.14.5
+_kdeappver=14.12.2
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('8e5b35ac26a3ee65331ead30d0d9f192534a02d3'
+sha1sums=('92e4b13e41f946de0d647331f31ad83f4921c99a'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2015-01-15 Thread Felix Yan
Date: Thursday, January 15, 2015 @ 10:59:42
  Author: fyan
Revision: 229027

upgpkg: kdelibs 4.14.4-1

upstream new release

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-15 09:13:37 UTC (rev 229026)
+++ PKGBUILD2015-01-15 09:59:42 UTC (rev 229027)
@@ -1,10 +1,12 @@
 # $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer: Felix Yan felixonm...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.14.3
-pkgrel=2
+pkgver=4.14.4
+_kdeappver=14.12.1
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -15,9 +17,9 @@
 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4')
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
+source=(http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('a61beafbd7ff0f5c6be54e685d197c135ba36865'
+sha1sums=('8e5b35ac26a3ee65331ead30d0d9f192534a02d3'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-11-24 Thread Felix Yan
Date: Monday, November 24, 2014 @ 11:23:57
  Author: fyan
Revision: 227045

upgpkg: kdelibs 4.14.3-2

fix dependency on grantlee (FS#42887)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-24 08:05:41 UTC (rev 227044)
+++ PKGBUILD2014-11-24 10:23:57 UTC (rev 227045)
@@ -4,16 +4,16 @@
 
 pkgname=kdelibs
 pkgver=4.14.3
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
-depends=('attica-qt4' 'libxss' 'krb5' 'grantlee-qt4' 'qca' 'libdbusmenu-qt' 
'polkit-qt4'
+depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'polkit-qt4'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4')
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-11-19 Thread Felix Yan
Date: Wednesday, November 19, 2014 @ 16:12:00
  Author: fyan
Revision: 226389

upgpkg: kdelibs 4.14.3-1

upstream new release

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-19 12:42:19 UTC (rev 226388)
+++ PKGBUILD2014-11-19 15:12:00 UTC (rev 226389)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.14.2
+pkgver=4.14.3
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('3b60a2458efec1081678f4cb0952f97c219b74b9'
+sha1sums=('a61beafbd7ff0f5c6be54e685d197c135ba36865'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-11-15 Thread Andrea Scarpino
Date: Saturday, November 15, 2014 @ 12:15:26
  Author: andrea
Revision: 226281

Avoid aliases usage in depends()

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-15 11:05:05 UTC (rev 226280)
+++ PKGBUILD2014-11-15 11:15:26 UTC (rev 226281)
@@ -9,7 +9,7 @@
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
-depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+depends=('attica-qt4' 'libxss' 'krb5' 'grantlee-qt4' 'qca' 'libdbusmenu-qt' 
'polkit-qt4'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-09-27 Thread Andrea Scarpino
Date: Saturday, September 27, 2014 @ 18:05:10
  Author: andrea
Revision: 223574

upgpkg: kdelibs 4.14.1-2

Move translations into /usr/share/locale/kde4 (see FS#41684)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-27 15:38:10 UTC (rev 223573)
+++ PKGBUILD2014-09-27 16:05:10 UTC (rev 223574)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -43,6 +43,7 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+   -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-DWITH_SOLID_UDISKS2=ON


[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-09-20 Thread Sven-Hendrik Haase
Date: Saturday, September 20, 2014 @ 18:05:29
  Author: svenstaro
Revision: 222171

upgpkg: kdelibs 4.14.1-1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-20 14:40:54 UTC (rev 222170)
+++ PKGBUILD2014-09-20 16:05:29 UTC (rev 222171)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.14.0
+pkgver=4.14.1
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('d8c56abfa101b0bd39e05ae36b7f6063d8fe360c'
+sha1sums=('b0425ed3a84fa3c1f54299baa19543669ce8ab9d'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-09-09 Thread Andrea Scarpino
Date: Tuesday, September 9, 2014 @ 14:00:18
  Author: andrea
Revision: 221277

upgpkg: kdelibs 4.14.0-2

Move locale files to /usr/share/locale/kde4 to fix co-installations with KF5

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-09 11:57:01 UTC (rev 221276)
+++ PKGBUILD2014-09-09 12:00:18 UTC (rev 221277)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -43,6 +43,7 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+   -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-DWITH_SOLID_UDISKS2=ON



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-09-09 Thread Andrea Scarpino
Date: Tuesday, September 9, 2014 @ 14:53:03
  Author: andrea
Revision: 221308

revert last commit

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-09 12:52:29 UTC (rev 221307)
+++ PKGBUILD2014-09-09 12:53:03 UTC (rev 221308)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.14.0
-pkgrel=2
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -43,7 +43,6 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-   -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-DWITH_SOLID_UDISKS2=ON



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-08-16 Thread Sven-Hendrik Haase
Date: Saturday, August 16, 2014 @ 21:59:24
  Author: svenstaro
Revision: 219785

upgpkg: kdelibs 4.14.0-1

kde 4.14.0

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-16 18:25:01 UTC (rev 219784)
+++ PKGBUILD2014-08-16 19:59:24 UTC (rev 219785)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.13.3
-pkgrel=3
+pkgver=4.14.0
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -16,14 +16,11 @@
 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' 'qt4.patch'
-'pyqt.patch' 'kdelibs-cve-2014-5033.patch')
-sha1sums=('9c0e963fa2db119ac37e15f31c05d18d3043a58e'
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
+sha1sums=('d8c56abfa101b0bd39e05ae36b7f6063d8fe360c'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-  'c7c4cb4e557c4ab07b29ea757b773497cf8b9dbe'
-  '9c808a7e382f59d730a4ced06ef88165f3d87eec')
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
 
 prepare() {
mkdir build
@@ -34,11 +31,6 @@
patch -p1 -i ${srcdir}/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i ${srcdir}/qt4.patch
-
-   # support newer PyQt build system
-   patch -p1 -i ${srcdir}/pyqt.patch
-
-   patch -p1 -i ${srcdir}/kdelibs-cve-2014-5033.patch
 }
 
 build() {



[arch-commits] Commit in kdelibs/trunk (PKGBUILD pyqt.patch)

2014-08-07 Thread Andrea Scarpino
Date: Thursday, August 7, 2014 @ 20:21:58
  Author: andrea
Revision: 219465

upgpkg: kdelibs 4.13.3-3

Update FindPyQt4 patch

Modified:
  kdelibs/trunk/PKGBUILD
  kdelibs/trunk/pyqt.patch

+
 PKGBUILD   |4 
 pyqt.patch |  252 +++
 2 files changed, 171 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-07 18:18:49 UTC (rev 219464)
+++ PKGBUILD2014-08-07 18:21:58 UTC (rev 219465)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.13.3
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -22,7 +22,7 @@
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-  'd32534d7d6dc287c80951d24caf0259ab18c9abc'
+  'c7c4cb4e557c4ab07b29ea757b773497cf8b9dbe'
   '9c808a7e382f59d730a4ced06ef88165f3d87eec')
 
 prepare() {

Modified: pyqt.patch
===
--- pyqt.patch  2014-08-07 18:18:49 UTC (rev 219464)
+++ pyqt.patch  2014-08-07 18:21:58 UTC (rev 219465)
@@ -1,97 +1,118 @@
-From: Raphael Kubo da Costa rak...@freebsd.org
-Date: Wed, 16 Jul 2014 19:29:40 +
-Subject: Make FindPyQt4 work with PyQt's new build system.
-X-Git-Tag: v4.13.90
-X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.gita=commitdiffh=a7e47438d4e3469dc9df70d613826cb360fc8d19

+Make FindPyKDE4 work with PyQt's new build system.
 Make FindPyQt4 work with PyQt's new build system.
 
 Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless
 PyQt is built using the old configure script.
 
-There is no direct replacement for it, as PyQt's new build system does
-not provide as much information as before by design. Luckily, most of
-the variables we are interested in can be obtained from PyQt's QtCore
-module itself even if its old build system is used.
+PyKDE4 itself has recently been adjusted to mimic PyQt itself and only
+install its pykdeconfig module if pyqtconfig is present. Additionally,
+information such as SIP flags and the directory where PyKDE's SIP files
+are installed are now also provided in the
+PyKDE4.kdecore.PYKDE_CONFIGURATION dict.
 
-The only exception is pyqt_sip_dir, which cannot be determined at all if
-pyqtconfig is not available. In this case, the most we can do is guess
-the default path like QScintilla2 does, and fail if it does not exist.
-The user then needs to specify it manually via CMake with something like
--DPYQT4_SIP_DIR=/usr/share/sip/PyQt4. To this effect, all variables set
-by FindPyQt4.cmake have been made cache variables, which means their
-values can be overriden by the user, thus ignoring the contents read via
-FindPyQt.py.
+This commit completely rewrites FindPyKDE4.py to make it look like
+FindPyQt.cmake after commit a7e4743: most of the information used by
+FindPyKDE4.cmake is fetched from PyKDE4.kdecore, and we first try to
+obtain the SIP flags and directory from pykdeconfig and, if it fails, we
+use PYKDE_CONFIGURATION.
 
-BUG:  337462
-FIXED-IN: 4.14.0
-REVIEW:   119302

+Furthermore, FindPyKDE4.py now only prints the variables that are
+actually consumed by FindPyKDE4.cmake -- it is not possible to obtain
+all the data provided by pykdeconfig in PYKDE_CONFIGURATION. We've also
+stopped reading and setting PYKDE4_VERSION_TAG, since PyKDE4 stopped
+setting a KDE tag in 2008 (and its value was 3_92_0 at the time).
 
+CCBUG: 327633
+REVIEW: 119454
 
 a/cmake/modules/FindPyQt4.cmake
-+++ b/cmake/modules/FindPyQt4.cmake
-@@ -9,16 +9,20 @@
- # Find the installed version of PyQt4. FindPyQt4 should only be called after
- # Python has been found.
- #
--# This file defines the following variables:
-+# This file defines the following variables, which can also be overriden by
-+# users:
- #
- # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
- # suitable for comparison as a string
- #
- # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
- #
--# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files.
-+# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files.
- #
--# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files.
-+# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be 
unset
-+# if PyQt4 was built using its new build system and pyqtconfig.py is not
-+# present on the system, as in this case its value cannot be determined
-+# automatically.
- #
- # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
+BUG: 337462
+FIXED-IN: 4.14.0
+REVIEW: 119302
+--- kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake~ 2014-08-06 
21:54:27.564432282 +
 kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake  2014-08-06 
21:54:43.417702615 +
+@@ -25,7 +25,6 @@
+ STRING(REGEX 

[arch-commits] Commit in kdelibs/trunk (PKGBUILD kdelibs-cve-2014-5033.patch)

2014-07-30 Thread Sven-Hendrik Haase
Date: Wednesday, July 30, 2014 @ 22:11:02
  Author: svenstaro
Revision: 218409

upgpkg: kdelibs 4.13.3-2

Fix CVE-2014-5033

Added:
  kdelibs/trunk/kdelibs-cve-2014-5033.patch
Modified:
  kdelibs/trunk/PKGBUILD

-+
 PKGBUILD|9 ++---
 kdelibs-cve-2014-5033.patch |   36 
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-30 20:01:32 UTC (rev 218408)
+++ PKGBUILD2014-07-30 20:11:02 UTC (rev 218409)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.13.3
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -17,12 +17,13 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
-'pyqt.patch')
+'pyqt.patch' 'kdelibs-cve-2014-5033.patch')
 sha1sums=('9c0e963fa2db119ac37e15f31c05d18d3043a58e'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-  'd32534d7d6dc287c80951d24caf0259ab18c9abc')
+  'd32534d7d6dc287c80951d24caf0259ab18c9abc'
+  '9c808a7e382f59d730a4ced06ef88165f3d87eec')
 
 prepare() {
mkdir build
@@ -36,6 +37,8 @@
 
# support newer PyQt build system
patch -p1 -i ${srcdir}/pyqt.patch
+
+   patch -p1 -i ${srcdir}/kdelibs-cve-2014-5033.patch
 }
 
 build() {

Added: kdelibs-cve-2014-5033.patch
===
--- kdelibs-cve-2014-5033.patch (rev 0)
+++ kdelibs-cve-2014-5033.patch 2014-07-30 20:11:02 UTC (rev 218409)
@@ -0,0 +1,36 @@
+--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
 b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+@@ -144,7 +144,7 @@
+ 
+ Action::AuthStatus Polkit1Backend::actionStatus(const QString action)
+ {
+-PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
++PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
+ PolkitQt1::Authority::Result r = 
PolkitQt1::Authority::instance()-checkAuthorizationSync(action, subject,
+   
PolkitQt1::Authority::None);
+ switch (r) {
+@@ -160,21 +160,12 @@
+ 
+ QByteArray Polkit1Backend::callerID() const
+ {
+-QByteArray a;
+-QDataStream s(a, QIODevice::WriteOnly);
+-s  QCoreApplication::applicationPid();
+-
+-return a;
++return QDBusConnection::systemBus().baseService().toUtf8();
+ }
+ 
+ bool Polkit1Backend::isCallerAuthorized(const QString action, QByteArray 
callerID)
+ {
+-QDataStream s(callerID, QIODevice::ReadOnly);
+-qint64 pid;
+-
+-s  pid;
+-
+-PolkitQt1::UnixProcessSubject subject(pid);
++PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
+ PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
+ 
+ PolkitResultEventLoop e;
+



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-07-18 Thread Sven-Hendrik Haase
Date: Friday, July 18, 2014 @ 13:24:58
  Author: svenstaro
Revision: 217047

upgpkg: kdelibs 4.13.3-1

upstream release 4.13.3

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-18 11:24:10 UTC (rev 217046)
+++ PKGBUILD2014-07-18 11:24:58 UTC (rev 217047)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.13.2
-pkgrel=3
+pkgver=4.13.3
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,7 +18,7 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
 'CVE-2014-3494.patch')
-sha1sums=('c540edeb7da23f5a8feacb4d775bce43f2060a96'
+sha1sums=('9c0e963fa2db119ac37e15f31c05d18d3043a58e'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-06-10 Thread Andreas Radke
Date: Tuesday, June 10, 2014 @ 19:50:05
  Author: andyrtr
Revision: 214788

upgpkg: kdelibs 4.13.2-2

giflib rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-10 17:48:35 UTC (rev 214787)
+++ PKGBUILD2014-06-10 17:50:05 UTC (rev 214788)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -30,6 +30,8 @@
patch -p1 -i ${srcdir}/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i ${srcdir}/qt4.patch
+   # fix build with giflib 5.1.0
+   sed -i /DGifCloseFile/s:file:, NULL:g 
khtml/imload/decoders/gifloader.cpp
 }
 
 build() {



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-06-08 Thread Sven-Hendrik Haase
Date: Monday, June 9, 2014 @ 05:01:08
  Author: svenstaro
Revision: 214401

upgpkg: kdelibs 4.13.2-1

upstream release 4.12.2

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-09 00:50:25 UTC (rev 214400)
+++ PKGBUILD2014-06-09 03:01:08 UTC (rev 214401)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.13.1
-pkgrel=3
+pkgver=4.13.2
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -16,13 +16,11 @@
 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' 'qt4.patch'
-'fix-cifs-mount.patch')
-sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec'
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
+sha1sums=('c540edeb7da23f5a8feacb4d775bce43f2060a96'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-  '26bbebeaf3f882d84030fd9b39b7b4c9debbbeec')
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
 
 prepare() {
cd ${pkgname}-${pkgver}
@@ -32,8 +30,6 @@
patch -p1 -i ${srcdir}/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i ${srcdir}/qt4.patch
-
-   patch -p1 -i ${srcdir}/fix-cifs-mount.patch
 }
 
 build() {



[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-cifs-mount.patch)

2014-05-26 Thread Andrea Scarpino
Date: Monday, May 26, 2014 @ 10:53:32
  Author: andrea
Revision: 213594

upgpkg: kdelibs 4.13.1-3

Fix CIFS mount (FS#40475)

Added:
  kdelibs/trunk/fix-cifs-mount.patch
Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 fix-cifs-mount.patch |   49 +
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-25 20:34:12 UTC (rev 213593)
+++ PKGBUILD2014-05-26 08:53:32 UTC (rev 213594)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.13.1
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -16,11 +16,13 @@
 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' 'qt4.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
+'fix-cifs-mount.patch')
 sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+  '26bbebeaf3f882d84030fd9b39b7b4c9debbbeec')
 
 prepare() {
cd ${pkgname}-${pkgver}
@@ -30,6 +32,8 @@
patch -p1 -i ${srcdir}/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i ${srcdir}/qt4.patch
+
+   patch -p1 -i ${srcdir}/fix-cifs-mount.patch
 }
 
 build() {

Added: fix-cifs-mount.patch
===
--- fix-cifs-mount.patch(rev 0)
+++ fix-cifs-mount.patch2014-05-26 08:53:32 UTC (rev 213594)
@@ -0,0 +1,49 @@
+commit 9a8426ae2ed35ac900b89a623618fc158d24ee6a
+Author: Tomáš Trnka tomastr...@gmx.com
+Date:   Sun May 25 16:12:36 2014 +0200
+
+Revert Avoid unnecessary automounting in 
KDiskFreeSpaceInfo::freeSpaceInfo
+
+This reverts commit 6246e99b43f3d1a9e15d563fbb5e173ed50ba5e5.
+
+It breaks KIO on CIFS mounts as the check for automounts copied over
+from frameworks/kfileitem.cpp isDirectoryMounted() apparently matches
+CIFS as well (and for some weird reason KIO checks for available space
+before trying to copy files).
+
+We'll probably have to return to v1 of the abovementioned commit, i.e.
+checking for autofs explicitly. However, more testing is apparently
+necessary to avoid further nasty surprises.
+
+REVIEW: 117044
+BUG: 334776
+FIXED-IN: 4.13.2
+
+diff --git a/kio/kfile/kdiskfreespaceinfo.cpp 
b/kio/kfile/kdiskfreespaceinfo.cpp
+index 5c1fa72..f11eb09 100644
+--- a/kio/kfile/kdiskfreespaceinfo.cpp
 b/kio/kfile/kdiskfreespaceinfo.cpp
+@@ -33,7 +33,6 @@
+ #include QtCore/QDir
+ #include windows.h
+ #else
+-#include QtCore/QFileInfo
+ #include sys/statvfs.h
+ #endif
+ 
+@@ -131,15 +130,6 @@ KDiskFreeSpaceInfo KDiskFreeSpaceInfo::freeSpaceInfo( 
const QString path )
+ #else
+ struct statvfs statvfs_buf;
+ 
+-// Ignore autofs mountpoints as statvfs would trigger (expensive) 
automounting
+-// This also matches special filesystems like /proc where free space 
has no meaning
+-if (mp) {
+-QFileInfo fi(info.d-mountPoint);
+-if (fi.isDir()  fi.size() == 0) {
+-return info;
+-}
+-}
+-
+ // Prefer mountPoint if available, so that it even works with 
non-existing files.
+ const QString pathArg = info.d-mountPoint.isEmpty() ? path : 
info.d-mountPoint;
+ if (!statvfs(QFile::encodeName(pathArg).constData(), statvfs_buf)) {



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-05-15 Thread Tobias Powalowski
Date: Thursday, May 15, 2014 @ 15:45:14
  Author: tpowa
Revision: 212815

upgpkg: kdelibs 4.13.1-2

rebuild against latest openexr

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-15 13:18:58 UTC (rev 212814)
+++ PKGBUILD2014-05-15 13:45:14 UTC (rev 212815)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-05-14 Thread Sven-Hendrik Haase
Date: Wednesday, May 14, 2014 @ 21:50:26
  Author: svenstaro
Revision: 212426

upgpkg: kdelibs 4.13.1-1

upstream release 4.13.1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-14 18:53:07 UTC (rev 212425)
+++ PKGBUILD2014-05-14 19:50:26 UTC (rev 212426)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.13.0
+pkgver=4.13.1
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('8f2cccbadc869a7c5e7371d45ce2a767b98a9f6a'
+sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-03-31 Thread Sven-Hendrik Haase
Date: Monday, March 31, 2014 @ 11:54:32
  Author: svenstaro
Revision: 209267

upgpkg: kdelibs 4.12.4-1

kde 4.12.4 release

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-31 08:02:13 UTC (rev 209266)
+++ PKGBUILD2014-03-31 09:54:32 UTC (rev 209267)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.12.3
+pkgver=4.12.4
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('57a9685d9c05f9304b0037f578bc13ca3371e74d'
+sha1sums=('267510230af1750d9dd2bd77b5d2d94d444c95a3'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-02-04 Thread Sven-Hendrik Haase
Date: Tuesday, February 4, 2014 @ 14:47:15
  Author: svenstaro
Revision: 205088

upgpkg: kdelibs 4.12.2-1

upstream release 4.12.2

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-04 13:28:01 UTC (rev 205087)
+++ PKGBUILD2014-02-04 13:47:15 UTC (rev 205088)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.12.1
+pkgver=4.12.2
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('b6c1b22a0fc3c9789d29ffef4d24b41afdf357bb'
+sha1sums=('05e324af3752953ca637c2a51d989155f9f6bb8a'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2014-01-13 Thread Sven-Hendrik Haase
Date: Tuesday, January 14, 2014 @ 08:33:57
  Author: svenstaro
Revision: 203682

upgpkg: kdelibs 4.12.1-1

upstream release 4.12.1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-14 06:49:49 UTC (rev 203681)
+++ PKGBUILD2014-01-14 07:33:57 UTC (rev 203682)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.12.0
+pkgver=4.12.1
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('a510f9dc2675c5656af00a92f81b747129ff70d1'
+sha1sums=('b6c1b22a0fc3c9789d29ffef4d24b41afdf357bb'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-12-06 Thread Sven-Hendrik Haase
Date: Friday, December 6, 2013 @ 13:14:11
  Author: svenstaro
Revision: 200864

upgpkg: kdelibs 4.11.4-1

KDE 4.11.4

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-06 12:13:46 UTC (rev 200863)
+++ PKGBUILD2013-12-06 12:14:11 UTC (rev 200864)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.11.3
+pkgver=4.11.4
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('42bda7ca352b3f700af91262636380aa71d07519'
+sha1sums=('6f7f378ce46ddcf2ee4b7810afc42725a82024c3'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-11-05 Thread Andrea Scarpino
Date: Tuesday, November 5, 2013 @ 21:44:40
  Author: andrea
Revision: 198988

phonon - phonon-qt4

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-05 20:37:24 UTC (rev 198987)
+++ PKGBUILD2013-11-05 20:44:40 UTC (rev 198988)
@@ -12,7 +12,7 @@
 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' 'udisks2' 'libxcursor' 'phonon'
+'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 install=${pkgname}.install



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-11-04 Thread Andrea Scarpino
Date: Monday, November 4, 2013 @ 16:20:16
  Author: andrea
Revision: 198795

Mistake

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-04 15:15:56 UTC (rev 198794)
+++ PKGBUILD2013-11-04 15:20:16 UTC (rev 198795)
@@ -13,7 +13,7 @@
 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
-'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'herqq')
+'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-10-01 Thread Sven-Hendrik Haase
Date: Tuesday, October 1, 2013 @ 17:12:48
  Author: svenstaro
Revision: 195493

upgpkg: kdelibs 4.11.2-1

kde 4.11.2 release

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-01 13:18:26 UTC (rev 195492)
+++ PKGBUILD2013-10-01 15:12:48 UTC (rev 195493)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.11.1
+pkgver=4.11.2
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('db938479fe1599f9f1ac497de48ad8de692ac6c9'
+sha1sums=('f9aec4ec00389067e6d2ea37f5042c926c07fd6a'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-07-29 Thread Andrea Scarpino
Date: Monday, July 29, 2013 @ 20:37:46
  Author: andrea
Revision: 191727

upgpkg: kdelibs 4.10.5-2

giflib rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-29 18:18:07 UTC (rev 191726)
+++ PKGBUILD2013-07-29 18:37:46 UTC (rev 191727)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.5
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-05-10 Thread Andrea Scarpino
Date: Friday, May 10, 2013 @ 19:08:02
  Author: andrea
Revision: 185044

Fix a crash when closing various apps (FS#35171) (KDEBUG#319137)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-10 16:49:05 UTC (rev 185043)
+++ PKGBUILD2013-05-10 17:08:02 UTC (rev 185044)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.3
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,12 +18,14 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
-'security-fix.patch')
+'security-fix.patch'
+'fix-xfreepixmap-call.patch')
 sha1sums=('aa154998e227121be82f5b04442e908e7dece01b'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-  '506562009a667f18481be0d2c5035b181fce38bb')
+  '506562009a667f18481be0d2c5035b181fce38bb'
+  '556c5473219d8208ec920f46c08bf61fda5b60d9')
 
 build() {
cd ${pkgname}-${pkgver}
@@ -36,6 +38,8 @@
 
# KDEBUG#319428
patch -p1 -i ${srcdir}/security-fix.patch
+   # KDEBUG#319137
+   patch -p1 -i ${srcdir}/fix-xfreepixmap-call.patch
   
cd ../
 



[arch-commits] Commit in kdelibs/trunk (PKGBUILD security-fix.patch)

2013-05-09 Thread Andrea Scarpino
Date: Thursday, May 9, 2013 @ 09:57:09
  Author: andrea
Revision: 184819

upgpkg: kdelibs 4.10.3-1

Don't show passwords contained in HTTP URLs in error messages

Added:
  kdelibs/trunk/security-fix.patch
Modified:
  kdelibs/trunk/PKGBUILD

+
 PKGBUILD   |   10 --
 security-fix.patch |   32 
 2 files changed, 40 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-09 07:44:41 UTC (rev 184818)
+++ PKGBUILD2013-05-09 07:57:09 UTC (rev 184819)
@@ -17,11 +17,13 @@
 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' 'qt4.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
+'security-fix.patch')
 sha1sums=('aa154998e227121be82f5b04442e908e7dece01b'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+  '506562009a667f18481be0d2c5035b181fce38bb')
 
 build() {
cd ${pkgname}-${pkgver}
@@ -31,6 +33,10 @@
patch -p1 -i ${srcdir}/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i ${srcdir}/qt4.patch
+
+   # KDEBUG#319428
+   patch -p1 -i ${srcdir}/security-fix.patch
+  
cd ../
 
mkdir build

Added: security-fix.patch
===
--- security-fix.patch  (rev 0)
+++ security-fix.patch  2013-05-09 07:57:09 UTC (rev 184819)
@@ -0,0 +1,32 @@
+commit 65d736dab592bced4410ccfa4699de89f78c96ca
+Author: Grégory Oestreicher g...@kamago.net
+Date:   Wed May 8 23:16:00 2013 +0200
+
+Don't show passwords contained in HTTP URLs in error messages
+BUG: 319428
+
+diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
+index 2d139a9..129fc7b 100644
+--- a/kioslave/http/http.cpp
 b/kioslave/http/http.cpp
+@@ -3056,7 +3056,7 @@ try_again:
+ ; // Ignore error
+ } else {
+ if (!sendErrorPageNotification()) {
+-error(ERR_INTERNAL_SERVER, m_request.url.url());
++error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl());
+ return false;
+ }
+ }
+@@ -3072,9 +3072,9 @@ try_again:
+ // Tell that we will only get an error page here.
+ if (!sendErrorPageNotification()) {
+ if (m_request.responseCode == 403)
+-error(ERR_ACCESS_DENIED, m_request.url.url());
++error(ERR_ACCESS_DENIED, m_request.url.prettyUrl());
+ else
+-error(ERR_DOES_NOT_EXIST, m_request.url.url());
++error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl());
+ return false;
+ }
+ } else if (m_request.responseCode = 301  m_request.responseCode= 303) 
{



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-05-09 Thread Andrea Scarpino
Date: Thursday, May 9, 2013 @ 10:05:42
  Author: andrea
Revision: 184821

upgpkg: kdelibs 4.10.3-2

Bump pkgrel

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-09 07:57:22 UTC (rev 184820)
+++ PKGBUILD2013-05-09 08:05:42 UTC (rev 184821)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-05-07 Thread Andrea Scarpino
Date: Tuesday, May 7, 2013 @ 15:26:35
  Author: andrea
Revision: 184468

KDE 4.10.3

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-07 12:45:41 UTC (rev 184467)
+++ PKGBUILD2013-05-07 13:26:35 UTC (rev 184468)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.10.2
-pkgrel=4
+pkgver=4.10.3
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85'
+sha1sums=('aa154998e227121be82f5b04442e908e7dece01b'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-04-28 Thread Andrea Scarpino
Date: Sunday, April 28, 2013 @ 09:41:56
  Author: andrea
Revision: 183835

upgpkg: kdelibs 4.10.2-4

libpng rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-28 07:37:57 UTC (rev 183834)
+++ PKGBUILD2013-04-28 07:41:56 UTC (rev 183835)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.2
-pkgrel=3
+pkgrel=4
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-04-21 Thread Andrea Scarpino
Date: Sunday, April 21, 2013 @ 11:43:18
  Author: andrea
Revision: 183303

upgpkg: kdelibs 4.10.2-3

docboox-xsl rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-21 06:02:20 UTC (rev 183302)
+++ PKGBUILD2013-04-21 09:43:18 UTC (rev 183303)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-04-16 Thread Eric Bélanger
Date: Wednesday, April 17, 2013 @ 04:15:31
  Author: eric
Revision: 183050

upgpkg: kdelibs 4.10.2-2

Rebuild against openexr 2.0.0

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-17 02:02:04 UTC (rev 183049)
+++ PKGBUILD2013-04-17 02:15:31 UTC (rev 183050)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-04-03 Thread Sven-Hendrik Haase
Date: Thursday, April 4, 2013 @ 05:32:27
  Author: svenstaro
Revision: 181384

upgpkg: kdelibs 4.10.2-1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-04 03:27:53 UTC (rev 181383)
+++ PKGBUILD2013-04-04 03:32:27 UTC (rev 181384)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.10.1
-pkgrel=2
+pkgver=4.10.2
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
+sha1sums=('2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'ed1f57ee661e5c7440efcaba7e51d2554709701c')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD qt4.patch)

2013-03-07 Thread Andrea Scarpino
Date: Thursday, March 7, 2013 @ 18:47:07
  Author: andrea
Revision: 179600

upgpkg: kdelibs 4.10.1-2

qmake refers to Qt5

Added:
  kdelibs/trunk/qt4.patch
Modified:
  kdelibs/trunk/PKGBUILD

---+
 PKGBUILD  |9 ++---
 qt4.patch |   11 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-07 17:46:37 UTC (rev 179599)
+++ PKGBUILD2013-03-07 17:47:07 UTC (rev 179600)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -17,10 +17,11 @@
 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')
+'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
 sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-  '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+  '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+  'ed1f57ee661e5c7440efcaba7e51d2554709701c')
 
 build() {
cd ${pkgname}-${pkgver}
@@ -28,6 +29,8 @@
patch -p1 -i ${srcdir}/kde-applications-menu.patch
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
+   # qmake refers to Qt5
+   patch -p1 -i ${srcdir}/qt4.patch
cd ../
 
mkdir build

Added: qt4.patch
===
--- qt4.patch   (rev 0)
+++ qt4.patch   2013-03-07 17:47:07 UTC (rev 179600)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~2013-03-07 
16:57:29.735552097 +
 kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 
+
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+   
[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin
+   [HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin
+   
[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-03-04 Thread Andrea Scarpino
Date: Monday, March 4, 2013 @ 12:09:00
  Author: andrea
Revision: 179135

KDE 4.10.1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-04 08:06:34 UTC (rev 179134)
+++ PKGBUILD2013-03-04 11:09:00 UTC (rev 179135)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.10.0
-pkgrel=4
+pkgver=4.10.1
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('093bfd214511bae7fda88242413c6ed4ff0b18f0'
+sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 



[arch-commits] Commit in kdelibs/trunk (PKGBUILD use-qmake4-for-qt4.patch)

2013-02-27 Thread Andrea Scarpino
Date: Thursday, February 28, 2013 @ 00:08:32
  Author: andrea
Revision: 178874

upgpkg: kdelibs 4.10.0-4

We cannot use this, but -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake4 as cmake arg

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/use-qmake4-for-qt4.patch

--+
 PKGBUILD |   12 +++-
 use-qmake4-for-qt4.patch |   11 ---
 2 files changed, 3 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-27 22:38:50 UTC (rev 178873)
+++ PKGBUILD2013-02-27 23:08:32 UTC (rev 178874)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -17,23 +17,17 @@
 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'
-'use-qmake4-for-qt4.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch')
 sha1sums=('093bfd214511bae7fda88242413c6ed4ff0b18f0'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-  '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'ceb41e4bb8eb2b3612d011d68199b1d5b9dd3151')
+  '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
 build() {
-   . /etc/profile.d/qt4.sh
-
cd ${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
-   # Do not look for 'qmake' as this could referer to the qt5 version
-   patch -p1 -i ${srcdir}/use-qmake4-for-qt4.patch
cd ../
 
mkdir build

Deleted: use-qmake4-for-qt4.patch
===
--- use-qmake4-for-qt4.patch2013-02-27 22:38:50 UTC (rev 178873)
+++ use-qmake4-for-qt4.patch2013-02-27 23:08:32 UTC (rev 178874)
@@ -1,11 +0,0 @@
 kdelibs-4.10.0/cmake/modules/FindQt4.cmake~2013-02-24 
15:26:19.081415233 +
-+++ kdelibs-4.10.0/cmake/modules/FindQt4.cmake 2013-02-24 15:26:45.531216103 
+
-@@ -446,7 +446,7 @@
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
-   
[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin
-   [HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin
-   
[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin



[arch-commits] Commit in kdelibs/trunk (PKGBUILD use-qmake4-for-qt4.patch)

2013-02-25 Thread Andrea Scarpino
Date: Monday, February 25, 2013 @ 17:39:09
  Author: andrea
Revision: 178547

upgpkg: kdelibs 4.10.0-3

Do not look for 'qmake' as this could referer to the qt5 version

Added:
  kdelibs/trunk/use-qmake4-for-qt4.patch
Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   19 ---
 use-qmake4-for-qt4.patch |   11 +++
 2 files changed, 23 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 16:33:39 UTC (rev 178546)
+++ PKGBUILD2013-02-25 16:39:09 UTC (rev 178547)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -12,25 +12,30 @@
 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' 'udisks2' 'libxcursor' 'phonon' 'qtwebkit'
-'media-player-info' 'libxtst' 'libutempter')
+'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
+'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
 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')
+'kde-applications-menu.patch' 'archlinux-menu.patch'
+'use-qmake4-for-qt4.patch')
 sha1sums=('093bfd214511bae7fda88242413c6ed4ff0b18f0'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-  '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+  '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+  'ceb41e4bb8eb2b3612d011d68199b1d5b9dd3151')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   . /etc/profile.d/qt4.sh
 
+   cd ${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
+   # Do not look for 'qmake' as this could referer to the qt5 version
+   patch -p1 -i ${srcdir}/use-qmake4-for-qt4.patch
+   cd ../
 
-   cd ${srcdir}
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \

Added: use-qmake4-for-qt4.patch
===
--- use-qmake4-for-qt4.patch(rev 0)
+++ use-qmake4-for-qt4.patch2013-02-25 16:39:09 UTC (rev 178547)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.0/cmake/modules/FindQt4.cmake~2013-02-24 
15:26:19.081415233 +
 kdelibs-4.10.0/cmake/modules/FindQt4.cmake 2013-02-24 15:26:45.531216103 
+
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+   
[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin
+   [HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin
+   
[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2013-02-07 Thread Eric Bélanger
Date: Thursday, February 7, 2013 @ 21:38:16
  Author: eric
Revision: 177595

upgpkg: kdelibs 4.10.0-2

Rebuild to fix reference to docbook-xsl (close FS#33751)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-07 20:35:13 UTC (rev 177594)
+++ PKGBUILD2013-02-07 20:38:16 UTC (rev 177595)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-12-27 Thread Andrea Scarpino
Date: Thursday, December 27, 2012 @ 05:10:17
  Author: andrea
Revision: 173890

upgpkg: kdelibs 4.9.4-4

Build with libutempter support (FS#33207)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-27 06:04:37 UTC (rev 173889)
+++ PKGBUILD2012-12-27 10:10:17 UTC (rev 173890)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -13,7 +13,7 @@
 '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')
+'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;



[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-crash-on-open-with.patch)

2012-12-06 Thread Andrea Scarpino
Date: Thursday, December 6, 2012 @ 09:03:01
  Author: andrea
Revision: 172900

Fix crash on Open With

Added:
  kdelibs/trunk/fix-crash-on-open-with.patch
Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 fix-crash-on-open-with.patch |   19 +++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-06 13:49:38 UTC (rev 172899)
+++ PKGBUILD2012-12-06 14:03:01 UTC (rev 172900)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,11 +18,13 @@
 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')
+'0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch'
+'fix-crash-on-open-with.patch')
 sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'f5d203932f67ab6d87c794e9cb78a3b1a22ef747')
+  'f5d203932f67ab6d87c794e9cb78a3b1a22ef747'
+  '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,7 +34,9 @@
# 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

Added: fix-crash-on-open-with.patch
===
--- fix-crash-on-open-with.patch(rev 0)
+++ fix-crash-on-open-with.patch2012-12-06 14:03:01 UTC (rev 172900)
@@ -0,0 +1,19 @@
+commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
+Author: David Faure fa...@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());



[arch-commits] Commit in kdelibs/trunk (PKGBUILD use-pythondontwritebytecode.patch)

2012-11-09 Thread Andrea Scarpino
Date: Friday, November 9, 2012 @ 16:01:24
  Author: andrea
Revision: 170700

Fix a regression in 'Save As' (FS#32560)

Modified:
  kdelibs/trunk/PKGBUILD
  kdelibs/trunk/use-pythondontwritebytecode.patch

---+
 PKGBUILD  |   11 ++--
 use-pythondontwritebytecode.patch |   91 +++-
 2 files changed, 56 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-09 20:50:42 UTC (rev 170699)
+++ PKGBUILD2012-11-09 21:01:24 UTC (rev 170700)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,11 +18,13 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
-'use-pythondontwritebytecode.patch')
+'use-pythondontwritebytecode.patch'
+'fix-save-path.patch')
 sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  '08c20f4aaad076264402a1d84c559d75b37c66d3')
+  '1138e78f15faa7221669ea81e313c595000cc953'
+  'e3d2621bd1451fe7f45a454af970fae108614ddd')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,8 +34,9 @@
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
 
-   # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+   # Fixed upstream
patch -p1 -i ${srcdir}/use-pythondontwritebytecode.patch
+   patch -p1 -i ${srcdir}/fix-save-path.patch

cd ${srcdir}
mkdir build

Modified: use-pythondontwritebytecode.patch
===
--- use-pythondontwritebytecode.patch   2012-11-09 20:50:42 UTC (rev 170699)
+++ use-pythondontwritebytecode.patch   2012-11-09 21:01:24 UTC (rev 170700)
@@ -1,6 +1,18 @@
 kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~2012-11-06 
10:32:38.564034292 +
-+++ kdelibs-4.9.3/cmake/modules/PythonMacros.cmake 2012-11-06 
10:35:51.829341102 +
-@@ -23,53 +23,55 @@
+From: Arfrever Frehtes Taifersar Arahesis arfre...@apache.org
+Date: Wed, 07 Nov 2012 19:08:01 +
+Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
+X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.gitamp;a=commitdiffamp;h=5a3cedacdb6485f7551090467cffb2cdf150b05a
+---
+Respect PYTHONDONTWRITEBYTECODE environmental variable.
+
+BUG: 276151
+REVIEW: 107228
+---
+
+
+--- a/cmake/modules/PythonMacros.cmake
 b/cmake/modules/PythonMacros.cmake
+@@ -23,54 +23,56 @@
# Install the source file.
INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
  
@@ -9,13 +21,23 @@
 -  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
 -  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
 -  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
++  # Byte compile and install the .pyc file.
++  IF($ENV{PYTHONDONTWRITEBYTECODE} STREQUAL )
++GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+ 
 -  if(WIN32)
 -string(REGEX REPLACE .:/ / _basepath ${_basepath})
 -  endif(WIN32)
--
++if(WIN32)
++string(REGEX REPLACE .:/ / _basepath ${_basepath})
++endif(WIN32)
+ 
 -  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--
++SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+ 
 -  # Python 3.2 changed the pyc file location
 -  IF(PYTHON_SHORT_VERSION GREATER 3.1)
 -# To get the right version for suffix
@@ -24,11 +46,21 @@
 -  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
 -SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
 -  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
--
++# Python 3.2 changed the pyc file location
++IF(PYTHON_SHORT_VERSION GREATER 3.1)
++# To get the right version for suffix
++STRING(REPLACE .  _suffix ${PYTHON_SHORT_VERSION})
++SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
++ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
++SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
+ 
 -  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
++FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+ 
 -  SET(_message Byte-compiling ${_bin_py})
--
++SET(_message Byte-compiling ${_bin_py})
+ 
 -  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 -  IF(_abs_bin_py STREQUAL ${_absfilename})# Don't copy the 

[arch-commits] Commit in kdelibs/trunk (PKGBUILD use-pythondontwritebytecode.patch)

2012-11-06 Thread Andrea Scarpino
Date: Tuesday, November 6, 2012 @ 08:29:39
  Author: andrea
Revision: 170347

KDE 4.9.3

Modified:
  kdelibs/trunk/PKGBUILD
  kdelibs/trunk/use-pythondontwritebytecode.patch

---+
 PKGBUILD  |   10 ++---
 use-pythondontwritebytecode.patch |   62 +---
 2 files changed, 49 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-06 13:15:12 UTC (rev 170346)
+++ PKGBUILD2012-11-06 13:29:39 UTC (rev 170347)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.9.2
-pkgrel=3
+pkgver=4.9.3
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -19,10 +19,10 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b'
+sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')
+  '08c20f4aaad076264402a1d84c559d75b37c66d3')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -33,7 +33,7 @@
patch -p1 -i ${srcdir}/archlinux-menu.patch
 
# Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
-   patch -p0 -i ${srcdir}/use-pythondontwritebytecode.patch
+   patch -p1 -i ${srcdir}/use-pythondontwritebytecode.patch

cd ${srcdir}
mkdir build

Modified: use-pythondontwritebytecode.patch
===
--- use-pythondontwritebytecode.patch   2012-11-06 13:15:12 UTC (rev 170346)
+++ use-pythondontwritebytecode.patch   2012-11-06 13:29:39 UTC (rev 170347)
@@ -1,8 +1,8 @@
 cmake/modules/PythonMacros.cmake
-+++ cmake/modules/PythonMacros.cmake
-@@ -23,40 +23,42 @@
+--- kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~2012-11-06 
10:32:38.564034292 +
 kdelibs-4.9.3/cmake/modules/PythonMacros.cmake 2012-11-06 
10:35:51.829341102 +
+@@ -23,53 +23,55 @@
# Install the source file.
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
  
 -  # Byte compile and install the .pyc file.
 -  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
@@ -15,11 +15,19 @@
 -  endif(WIN32)
 -
 -  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
 -
+-  # Python 3.2 changed the pyc file location
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-# To get the right version for suffix
+-STRING(REPLACE .  _suffix ${PYTHON_SHORT_VERSION})
+-SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
+-  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
+-SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
+-
 -  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
 -
--  SET(_message -DMESSAGE=Byte-compiling ${_bin_py})
+-  SET(_message Byte-compiling ${_bin_py})
 -
 -  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 -  IF(_abs_bin_py STREQUAL ${_absfilename})# Don't copy the file onto 
itself.
@@ -38,7 +46,13 @@
 -  DEPENDS ${_absfilename}
 -)
 -  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+  # Byte compile and install the .pyc file.
+-
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
+-  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
+-  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
+-  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
++  # Byte compile and install the .pyc file.   
 +  IF($ENV{PYTHONDONTWRITEBYTECODE} STREQUAL )
 +GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
 +GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
@@ -46,35 +60,47 @@
 +GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
 +
 +if(WIN32)
-+  string(REGEX REPLACE .:/ / _basepath ${_basepath})
++string(REGEX REPLACE .:/ / _basepath ${_basepath})
 +endif(WIN32)
 +
 +SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
 +
++# Python 3.2 changed the pyc file location
++IF(PYTHON_SHORT_VERSION GREATER 3.1)
++# To get the right version for suffix
++STRING(REPLACE .  _suffix ${PYTHON_SHORT_VERSION})
++SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
++ELSE(PYTHON_SHORT_VERSION GREATER 

[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-10-20 Thread Andrea Scarpino
Date: Saturday, October 20, 2012 @ 06:02:56
  Author: andrea
Revision: 169397

upgpkg: kdelibs 4.9.2-3

todo rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-20 10:00:06 UTC (rev 169396)
+++ PKGBUILD2012-10-20 10:02:56 UTC (rev 169397)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -14,7 +14,7 @@
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
 'media-player-info' 'libxtst')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+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'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-10-13 Thread Allan McRae
Date: Saturday, October 13, 2012 @ 04:16:14
  Author: allan
Revision: 168533

upgpkg: kdelibs 4.9.2-2

openexr-1.7.1 rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-13 06:58:16 UTC (rev 168532)
+++ PKGBUILD2012-10-13 08:16:14 UTC (rev 168533)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-10-02 Thread Andrea Scarpino
Date: Tuesday, October 2, 2012 @ 05:09:06
  Author: andrea
Revision: 167425

KDE 4.9.2

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-02 09:05:08 UTC (rev 167424)
+++ PKGBUILD2012-10-02 09:09:06 UTC (rev 167425)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0'
+sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-09-03 Thread Andrea Scarpino
Date: Monday, September 3, 2012 @ 17:48:13
  Author: andrea
Revision: 165921

KDE 4.9.1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-03 21:19:53 UTC (rev 165920)
+++ PKGBUILD2012-09-03 21:48:13 UTC (rev 165921)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.9.0
-pkgrel=4
+pkgver=4.9.1
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -19,7 +19,7 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46'
+sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-08-05 Thread Andrea Scarpino
Date: Sunday, August 5, 2012 @ 08:10:43
  Author: andrea
Revision: 164789

upgpkg: kdelibs 4.9.0-4

Rebuilt with soprano from [testing]

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-05 11:49:39 UTC (rev 164788)
+++ PKGBUILD2012-08-05 12:10:43 UTC (rev 164789)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-08-04 Thread Andrea Scarpino
Date: Saturday, August 4, 2012 @ 14:47:16
  Author: andrea
Revision: 164759

upgpkg: kdelibs 4.9.0-3

libxtst isn't installed if you choice the phonon-gstreamer backend (FS#31008)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-04 18:44:17 UTC (rev 164758)
+++ PKGBUILD2012-08-04 18:47:16 UTC (rev 164759)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -13,7 +13,7 @@
 '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')
+'media-player-info' 'libxtst')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-08-01 Thread Andrea Scarpino
Date: Wednesday, August 1, 2012 @ 11:06:16
  Author: andrea
Revision: 164627

upgpkg: kdelibs 4.9.0-2

New tarball

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-01 14:43:52 UTC (rev 164626)
+++ PKGBUILD2012-08-01 15:06:16 UTC (rev 164627)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -19,7 +19,7 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('80a8d6db7989132e5c41b15f6d6620c5775dfb19'
+sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-06-30 Thread Andrea Scarpino
Date: Saturday, June 30, 2012 @ 11:30:51
  Author: andrea
Revision: 162798

upgpkg: kdelibs 4.8.4-4

docbook-xsl rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-30 14:35:56 UTC (rev 162797)
+++ PKGBUILD2012-06-30 15:30:51 UTC (rev 162798)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.4
-pkgrel=3
+pkgrel=4
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-06-19 Thread Andrea Scarpino
Date: Tuesday, June 19, 2012 @ 04:17:58
  Author: andrea
Revision: 162049

upgpkg: kdelibs 4.8.4-3

attica rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-19 07:36:41 UTC (rev 162048)
+++ PKGBUILD2012-06-19 08:17:58 UTC (rev 162049)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.4
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-application-crashes.patch)

2012-06-14 Thread Andrea Scarpino
Date: Thursday, June 14, 2012 @ 03:09:35
  Author: andrea
Revision: 161782

upgpkg: kdelibs 4.8.4-2

Fix applications crashes (FS#30190)

Added:
  kdelibs/trunk/fix-application-crashes.patch
Modified:
  kdelibs/trunk/PKGBUILD

---+
 PKGBUILD  |   11 ++--
 fix-application-crashes.patch |   49 
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-13 23:17:07 UTC (rev 161781)
+++ PKGBUILD2012-06-14 07:09:35 UTC (rev 161782)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,11 +18,13 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
-'use-pythondontwritebytecode.patch')
+'use-pythondontwritebytecode.patch'
+'fix-application-crashes.patch')
 sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')
+  'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
+  'c271c712bf202f517015b597d61cfe1aed0db82b')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,6 +37,9 @@
# Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
patch -p0 -i ${srcdir}/use-pythondontwritebytecode.patch
 
+   # KDEBUG 301453
+   patch -p1 -i ${srcdir}/fix-application-crashes.patch
+
cd ${srcdir}
mkdir build
cd build

Added: fix-application-crashes.patch
===
--- fix-application-crashes.patch   (rev 0)
+++ fix-application-crashes.patch   2012-06-14 07:09:35 UTC (rev 161782)
@@ -0,0 +1,49 @@
+From: Vishesh Handa m...@vhanda.in
+Date: Wed, 13 Jun 2012 21:26:31 +
+Subject: Revert Always rec-connect if forced (ie. when Nepomuk server 
restarts)
+X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.gitamp;a=commitdiffamp;h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d
+---
+Revert Always rec-connect if forced (ie. when Nepomuk server restarts)
+
+This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
+
+This is done so that 4.8.x works with Soprano 2.7.6
+---
+
+
+--- a/nepomuk/core/nepomukmainmodel.cpp
 b/nepomuk/core/nepomukmainmodel.cpp
+@@ -94,7 +94,7 @@ public:
+ 
+ // we may get disconnected from the server but we don't want to try
+ // to connect every time the model is requested
+-if ( forced || (!m_socketConnectFailed  
!localSocketClient.isConnected()) ) {
++if ( !m_socketConnectFailed  !localSocketClient.isConnected() ) {
+ delete localSocketModel;
+ localSocketModel = 0;
+ QString socketName = KGlobal::dirs()-locateLocal( socket, 
nepomuk-socket );
+
+From: Vishesh Handa m...@vhanda.in
+Date: Wed, 13 Jun 2012 21:25:32 +
+Subject: Revert Disconnect before re-connecting. Soprano does not do that for 
us.
+X-Git-Url: 
http://quickgit.kde.org/?p=kdelibs.gitamp;a=commitdiffamp;h=76e0376d7582cfe5b898c56bf3779ca2279dace8
+---
+Revert Disconnect before re-connecting. Soprano does not do that for us.
+
+This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
+
+This is being done so that KDE 4.8.x works with Soprano 2.7.6
+---
+
+
+--- a/nepomuk/core/nepomukmainmodel.cpp
 b/nepomuk/core/nepomukmainmodel.cpp
+@@ -97,7 +97,6 @@ public:
+ if ( forced || (!m_socketConnectFailed  
!localSocketClient.isConnected()) ) {
+ delete localSocketModel;
+ localSocketModel = 0;
+-localSocketClient.disconnect();
+ QString socketName = KGlobal::dirs()-locateLocal( socket, 
nepomuk-socket );
+ kDebug()  Connecting to local socket  socketName;
+ if ( localSocketClient.connect( socketName ) ) {
+



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-06-07 Thread Andrea Scarpino
Date: Thursday, June 7, 2012 @ 02:38:07
  Author: andrea
Revision: 160936

New tarball

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-07 06:29:24 UTC (rev 160935)
+++ PKGBUILD2012-06-07 06:38:07 UTC (rev 160936)
@@ -19,7 +19,7 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('0d0410e36badc5efebe65d5bfa2a7d2f3cbceb3b'
+sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD use-pythondontwritebytecode.patch)

2012-06-06 Thread Andrea Scarpino
Date: Wednesday, June 6, 2012 @ 12:13:42
  Author: andrea
Revision: 160813

KDE 4.8.4

Modified:
  kdelibs/trunk/PKGBUILD
  kdelibs/trunk/use-pythondontwritebytecode.patch

---+
 PKGBUILD  |8 
 use-pythondontwritebytecode.patch |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-06 15:26:42 UTC (rev 160812)
+++ PKGBUILD2012-06-06 16:13:42 UTC (rev 160813)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.8.3
-pkgrel=3
+pkgver=4.8.4
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -19,10 +19,10 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('50633efa4ea2a133e51bf55286ff754c46f2eae2'
+sha1sums=('0d0410e36badc5efebe65d5bfa2a7d2f3cbceb3b'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  'a1e35760d5b4e29471ad357c963a343c67200f32')
+  'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

Modified: use-pythondontwritebytecode.patch
===
--- use-pythondontwritebytecode.patch   2012-06-06 15:26:42 UTC (rev 160812)
+++ use-pythondontwritebytecode.patch   2012-06-06 16:13:42 UTC (rev 160813)
@@ -25,14 +25,14 @@
 -  IF(_abs_bin_py STREQUAL ${_absfilename})# Don't copy the file onto 
itself.
 -ADD_CUSTOM_COMMAND(
 -  TARGET compile_python_files
--  COMMAND ${CMAKE_COMMAND} -E echo ${message}
+-  COMMAND ${CMAKE_COMMAND} -E echo ${_message}
 -  COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 -  DEPENDS ${_absfilename}
 -)
 -  ELSE(_abs_bin_py STREQUAL ${_absfilename})
 -ADD_CUSTOM_COMMAND(
 -  TARGET compile_python_files
--  COMMAND ${CMAKE_COMMAND} -E echo ${message} 
+-  COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
 -  COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
 -  COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 -  DEPENDS ${_absfilename}
@@ -60,14 +60,14 @@
 +IF(_abs_bin_py STREQUAL ${_absfilename})# Don't copy the file onto 
itself.
 +  ADD_CUSTOM_COMMAND(
 +TARGET compile_python_files
-+COMMAND ${CMAKE_COMMAND} -E echo ${message}
++COMMAND ${CMAKE_COMMAND} -E echo ${_message}
 +COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 +DEPENDS ${_absfilename}
 +  )
 +ELSE(_abs_bin_py STREQUAL ${_absfilename})
 +  ADD_CUSTOM_COMMAND(
 +TARGET compile_python_files
-+COMMAND ${CMAKE_COMMAND} -E echo ${message}
++COMMAND ${CMAKE_COMMAND} -E echo ${_message}
 +COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
 +COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 +DEPENDS ${_absfilename}



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-06-03 Thread Andrea Scarpino
Date: Sunday, June 3, 2012 @ 06:02:50
  Author: andrea
Revision: 160657

upgpkg: kdelibs 4.8.3-3

Disable HUPnP support to fix crashes (FS30106)

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-03 09:29:44 UTC (rev 160656)
+++ PKGBUILD2012-06-03 10:02:50 UTC (rev 160657)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,7 +13,7 @@
 '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' 'herqq')
+'media-player-info')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
@@ -46,7 +46,8 @@
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DEFAULT_HOME='.kde4' \
-   -DWITH_FAM=OFF
+   -DWITH_FAM=OFF \
+   -DWITH_HUpnp=OFF
make
 }
 



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-05-26 Thread Andrea Scarpino
Date: Saturday, May 26, 2012 @ 03:40:36
  Author: andrea
Revision: 159699

upgpkg: kdelibs 4.8.3-2

libudev rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-26 06:51:40 UTC (rev 159698)
+++ PKGBUILD2012-05-26 07:40:36 UTC (rev 159699)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -12,7 +12,8 @@
 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')
+'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
+'media-player-info' 'herqq')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-05-03 Thread Andrea Scarpino
Date: Thursday, May 3, 2012 @ 02:39:50
  Author: andrea
Revision: 158125

do not bump pkgrel

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-03 06:38:01 UTC (rev 158124)
+++ PKGBUILD2012-05-03 06:39:50 UTC (rev 158125)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.2
-pkgrel=2
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-05-03 Thread Andrea Scarpino
Date: Thursday, May 3, 2012 @ 09:20:07
  Author: andrea
Revision: 158132

KDE 4.8.3

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-03 13:15:53 UTC (rev 158131)
+++ PKGBUILD2012-05-03 13:20:07 UTC (rev 158132)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.8.2
+pkgver=4.8.3
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('f844ae0877880563361144d9577706064c3483e7'
+sha1sums=('50633efa4ea2a133e51bf55286ff754c46f2eae2'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   'a1e35760d5b4e29471ad357c963a343c67200f32')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-04-02 Thread Andrea Scarpino
Date: Monday, April 2, 2012 @ 08:16:32
  Author: andrea
Revision: 155359

xz is already satisfied

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-02 12:14:35 UTC (rev 155358)
+++ PKGBUILD2012-04-02 12:16:32 UTC (rev 155359)
@@ -9,10 +9,10 @@
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+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')
+'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install



[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-kmail-crash.patch)

2012-03-30 Thread Andrea Scarpino
Date: Friday, March 30, 2012 @ 12:11:55
  Author: andrea
Revision: 154655

KDE 4.8.2

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/fix-kmail-crash.patch

---+
 PKGBUILD  |   11 ++-
 fix-kmail-crash.patch |   71 
 2 files changed, 3 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-30 15:54:01 UTC (rev 154654)
+++ PKGBUILD2012-03-30 16:11:55 UTC (rev 154655)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,12 +18,10 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
-'fix-kmail-crash.patch'
 'use-pythondontwritebytecode.patch')
-sha1sums=('da4e13f63ac340619351e9a2f4211cce8ec4fdf8'
+sha1sums=('f844ae0877880563361144d9577706064c3483e7'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  '081b0663480568359120b573d26abb91e1a348c0'
   'a1e35760d5b4e29471ad357c963a343c67200f32')
 
 build() {
@@ -34,9 +32,6 @@
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
 
-   # Upstream (FS#28907)
-   patch -p1 -i ${srcdir}/fix-kmail-crash.patch
-
# Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
patch -p0 -i ${srcdir}/use-pythondontwritebytecode.patch
 

Deleted: fix-kmail-crash.patch
===
--- fix-kmail-crash.patch   2012-03-30 15:54:01 UTC (rev 154654)
+++ fix-kmail-crash.patch   2012-03-30 16:11:55 UTC (rev 154655)
@@ -1,71 +0,0 @@
-commit 979b0436510e7807c054e79c40c3753834ac2863
-Author: Sebastian Trueg tr...@kde.org
-Date:   Thu Mar 15 09:14:35 2012 +0100
-
-Thread-safe ResourceWatcher handling.
-
-We simply perform all RW operations in the manager thread.
-
-BUG: 295474
-FIXED-IN: 4.8.2
-
-diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
-index abe55ea..9d45228 100644
 a/nepomuk/core/resourcedata.cpp
-+++ b/nepomuk/core/resourcedata.cpp
-@@ -175,7 +175,8 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
- if( !m_uri.isEmpty() ) {
- m_rm-m_initializedData.remove( m_uri );
- if( m_rm-m_watcher  m_addedToWatcher ) {
--m_rm-m_watcher-removeResource(Resource::fromResourceUri(m_uri));
-+// See load() for an explanation of the QMetaObject call
-+QMetaObject::invokeMethod(m_rm-m_watcher, removeResource, 
Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
- m_addedToWatcher = false;
- }
- }
-@@ -393,16 +394,23 @@ bool Nepomuk::ResourceData::load()
- m_cache.clear();
- 
- if(!m_rm-m_watcher) {
-+//
-+// The ResourceWatcher is not thread-safe. Thus, we need to 
ensure the safety ourselves.
-+// We do that by simply handling all RW related operations in the 
manager thread.
-+// This also means to invoke methods on the watcher through 
QMetaObject to make sure they
-+// get queued in case of calls between different threads.
-+//
- m_rm-m_watcher = new ResourceWatcher(m_rm-m_manager);
-+m_rm-m_watcher-moveToThread(m_rm-m_manager-thread());
- QObject::connect( m_rm-m_watcher, 
SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-   m_rm-m_manager, 
SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) 
);
- QObject::connect( m_rm-m_watcher, 
SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-   m_rm-m_manager, 
SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, 
QVariant)) );
- m_rm-m_watcher-addResource( 
Nepomuk::Resource::fromResourceUri(m_uri) );
--m_rm-m_watcher-start();
-+QMetaObject::invokeMethod(m_rm-m_watcher, start, 
Qt::AutoConnection);
- }
- else {
--m_rm-m_watcher-addResource( 
Nepomuk::Resource::fromResourceUri(m_uri) );
-+QMetaObject::invokeMethod(m_rm-m_watcher, addResource, 
Qt::AutoConnection, Q_ARG(Nepomuk::Resource, 
Nepomuk::Resource::fromResourceUri(m_uri)) );
- }
- m_addedToWatcher = true;
- 
-diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
-index 06b9622..92b12f5 100644
 a/nepomuk/core/resourcewatcher.h
-+++ b/nepomuk/core/resourcewatcher.h
-@@ -93,6 +93,7 @@ namespace Nepomuk {
-  */
- virtual ~ResourceWatcher();

[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-03-06 Thread Andrea Scarpino
Date: Tuesday, March 6, 2012 @ 13:28:13
  Author: andrea
Revision: 152325

Path has been changed; new kdepim tarball

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-06 18:14:19 UTC (rev 152324)
+++ PKGBUILD2012-03-06 18:28:13 UTC (rev 152325)
@@ -16,7 +16,7 @@
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz;
+source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
 'kde-applications-menu.patch' 'archlinux-menu.patch')
 sha1sums=('da4e13f63ac340619351e9a2f4211cce8ec4fdf8'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-knotify-filepath.patch)

2012-03-04 Thread Andrea Scarpino
Date: Sunday, March 4, 2012 @ 06:07:21
  Author: andrea
Revision: 151932

KDE 4.8.1

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/fix-knotify-filepath.patch

+
 PKGBUILD   |   17 ++---
 fix-knotify-filepath.patch |   13 -
 2 files changed, 6 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-04 11:06:51 UTC (rev 151931)
+++ PKGBUILD2012-03-04 11:07:21 UTC (rev 151932)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.8.0
-pkgrel=3
+pkgver=4.8.1
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,13 +16,11 @@
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'kde-applications-menu.patch' 'archlinux-menu.patch'
-'fix-knotify-filepath.patch')
-sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
+source=(http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz;
+'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('da4e13f63ac340619351e9a2f4211cce8ec4fdf8'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-  '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-  '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
+  '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,9 +30,6 @@
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
 
-   # https://bugs.kde.org/show_bug.cgi?id=285028
-   patch -p1 -i ${srcdir}/fix-knotify-filepath.patch
-
cd ${srcdir}
mkdir build
cd build

Deleted: fix-knotify-filepath.patch
===
--- fix-knotify-filepath.patch  2012-03-04 11:06:51 UTC (rev 151931)
+++ fix-knotify-filepath.patch  2012-03-04 11:07:21 UTC (rev 151932)
@@ -1,13 +0,0 @@
-diff --git a/knotify/config/knotifyconfigactionswidget.cpp 
b/knotify/config/knotifyconfigactionswidget.cpp
-index 88d18b6..0e76658 100644
 a/knotify/config/knotifyconfigactionswidget.cpp
-+++ b/knotify/config/knotifyconfigactionswidget.cpp
-@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
-   KUrl soundURL = m_ui.Sound_select-url();
-   if ( soundURL.isRelative() )
-   {
--  QString soundString = soundURL.toLocalFile();
-+  QString soundString = m_ui.Sound_select-text();
-   // we need a way to get the application name in order to ba 
able to do this :
-   /*QString search = 
QString(%1/sounds/%2).arg(config-appname).arg(soundFile);
-   search = KGlobal::mainComponent().dirs()-findResource(data, 
search);



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-02-06 Thread Andrea Scarpino
Date: Monday, February 6, 2012 @ 12:49:28
  Author: andrea
Revision: 149297

upgpkg: kdelibs 4.8.0-3

pcre rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-06 17:34:12 UTC (rev 149296)
+++ PKGBUILD2012-02-06 17:49:28 UTC (rev 149297)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-01-25 Thread Andrea Scarpino
Date: Wednesday, January 25, 2012 @ 15:33:35
  Author: andrea
Revision: 147276

KDE 4.8.0

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 16:46:28 UTC (rev 147275)
+++ PKGBUILD2012-01-25 20:33:35 UTC (rev 147276)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.7.97
+pkgver=4.8.0
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -16,10 +16,10 @@
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install
-source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'fix-knotify-filepath.patch')
-sha1sums=('aded65a18f5320d988d9da6da15cd16af9c1aa43'
+sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   '3312f6005aa56a9b992c74008fe5b314f1c8ffba')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-01-25 Thread Andrea Scarpino
Date: Wednesday, January 25, 2012 @ 18:44:20
  Author: andrea
Revision: 147616

libpng/libtiff rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 23:42:53 UTC (rev 147615)
+++ PKGBUILD2012-01-25 23:44:20 UTC (rev 147616)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2012-01-04 Thread Andrea Scarpino
Date: Wednesday, January 4, 2012 @ 08:15:25
  Author: andrea
Revision: 145949

KDE 4.8RC2

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-04 13:12:26 UTC (rev 145948)
+++ PKGBUILD2012-01-04 13:15:25 UTC (rev 145949)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.7.95
-pkgrel=4
+pkgver=4.7.97
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -19,7 +19,7 @@
 
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 'kde-applications-menu.patch' 'archlinux-menu.patch'
 'fix-knotify-filepath.patch')
-sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
+sha1sums=('aded65a18f5320d988d9da6da15cd16af9c1aa43'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
   '3312f6005aa56a9b992c74008fe5b314f1c8ffba')



[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-knotify-filepath.patch)

2011-12-29 Thread Andrea Scarpino
Date: Thursday, December 29, 2011 @ 08:52:33
  Author: andrea
Revision: 145731

Fix filepath in KNotify (FS#27757)

Added:
  kdelibs/trunk/fix-knotify-filepath.patch
Modified:
  kdelibs/trunk/PKGBUILD

+
 PKGBUILD   |   11 ---
 fix-knotify-filepath.patch |   13 +
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-29 13:52:20 UTC (rev 145730)
+++ PKGBUILD2011-12-29 13:52:33 UTC (rev 145731)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.7.95
-pkgrel=3
+pkgrel=4
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -17,10 +17,12 @@
 replaces=('kdelibs-experimental')
 install=${pkgname}.install
 
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'kde-applications-menu.patch' 'archlinux-menu.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch'
+'fix-knotify-filepath.patch')
 sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-  '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+  '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+  '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,6 +32,9 @@
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
 
+   # https://bugs.kde.org/show_bug.cgi?id=285028
+   patch -p1 -i ${srcdir}/fix-knotify-filepath.patch
+
cd ${srcdir}
mkdir build
cd build

Added: fix-knotify-filepath.patch
===
--- fix-knotify-filepath.patch  (rev 0)
+++ fix-knotify-filepath.patch  2011-12-29 13:52:33 UTC (rev 145731)
@@ -0,0 +1,13 @@
+diff --git a/knotify/config/knotifyconfigactionswidget.cpp 
b/knotify/config/knotifyconfigactionswidget.cpp
+index 88d18b6..0e76658 100644
+--- a/knotify/config/knotifyconfigactionswidget.cpp
 b/knotify/config/knotifyconfigactionswidget.cpp
+@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
+   KUrl soundURL = m_ui.Sound_select-url();
+   if ( soundURL.isRelative() )
+   {
+-  QString soundString = soundURL.toLocalFile();
++  QString soundString = m_ui.Sound_select-text();
+   // we need a way to get the application name in order to ba 
able to do this :
+   /*QString search = 
QString(%1/sounds/%2).arg(config-appname).arg(soundFile);
+   search = KGlobal::mainComponent().dirs()-findResource(data, 
search);



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2011-12-26 Thread Andrea Scarpino
Date: Monday, December 26, 2011 @ 06:57:58
  Author: andrea
Revision: 145654

upgpkg: kdelibs 4.7.95-3

Attica rebuild

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-26 11:44:57 UTC (rev 145653)
+++ PKGBUILD2011-12-26 11:57:58 UTC (rev 145654)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.7.95
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2011-12-23 Thread Andrea Scarpino
Date: Friday, December 23, 2011 @ 03:36:39
  Author: andrea
Revision: 145565

upgpkg: kdelibs 4.7.95-2

qtwebkit does not require phonon anymore

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-23 08:24:59 UTC (rev 145564)
+++ PKGBUILD2011-12-23 08:36:39 UTC (rev 145565)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.7.95
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -12,7 +12,7 @@
 depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
-'upower' 'udisks' 'libxcursor' 'qtwebkit')
+'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2011-12-21 Thread Andrea Scarpino
Date: Thursday, December 22, 2011 @ 02:57:59
  Author: andrea
Revision: 145351

KDE 4.8RC1

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-22 07:57:39 UTC (rev 145350)
+++ PKGBUILD2011-12-22 07:57:59 UTC (rev 145351)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.7.90
-pkgrel=2
+pkgver=4.7.95
+pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('888a37f78cd44d16101c244f86576a39adc89bb6'
+sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2011-12-19 Thread Andrea Scarpino
Date: Monday, December 19, 2011 @ 16:39:09
  Author: andrea
Revision: 145240

upgpkg: kdelibs 4.7.90-2

add qtwebkit dependence

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 21:37:25 UTC (rev 145239)
+++ PKGBUILD2011-12-19 21:39:09 UTC (rev 145240)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.7.90
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -12,7 +12,7 @@
 depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
-'phonon' 'upower' 'udisks' 'libxcursor')
+'upower' 'udisks' 'libxcursor' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2011-12-07 Thread Andrea Scarpino
Date: Wednesday, December 7, 2011 @ 03:22:02
  Author: andrea
Revision: 144493

KDE 4.8beta2

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-07 06:47:26 UTC (rev 144492)
+++ PKGBUILD2011-12-07 08:22:02 UTC (rev 144493)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kdelibs
-pkgver=4.7.80
+pkgver=4.7.90
 pkgrel=1
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('0dac96f3d7445bde8e2e7066986ca5656d441b02'
+sha1sums=('888a37f78cd44d16101c244f86576a39adc89bb6'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2011-11-23 Thread Andrea Scarpino
Date: Wednesday, November 23, 2011 @ 03:35:08
  Author: andrea
Revision: 143205

New tarball

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-23 08:34:23 UTC (rev 143204)
+++ PKGBUILD2011-11-23 08:35:08 UTC (rev 143205)
@@ -18,7 +18,7 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('f2fb780794ec49687009d9367f895470aecb23ad'
+sha1sums=('0dac96f3d7445bde8e2e7066986ca5656d441b02'
   '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
   '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
@@ -53,7 +53,4 @@
# 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
-
-   # kactivities conflcits
-   rm ${pkgdir}/usr/lib/libkactivities.so*
 }



[arch-commits] Commit in (kdelibs/trunk/PKGBUILD kdemultimedia/trunk/PKGBUILD)

2011-11-21 Thread Andrea Scarpino
Date: Monday, November 21, 2011 @ 20:22:09
  Author: andrea
Revision: 143052

Remove pkgconfig from makedepends(); Add two new kdeplasma-addons packages

Modified:
  kdelibs/trunk/PKGBUILD
  kdemultimedia/trunk/PKGBUILD

--+
 kdelibs/trunk/PKGBUILD   |2 +-
 kdemultimedia/trunk/PKGBUILD |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: kdelibs/trunk/PKGBUILD
===
--- kdelibs/trunk/PKGBUILD  2011-11-22 00:57:07 UTC (rev 143051)
+++ kdelibs/trunk/PKGBUILD  2011-11-22 01:22:09 UTC (rev 143052)
@@ -13,7 +13,7 @@
 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
 'phonon' 'upower' 'udisks' 'libxcursor')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install
 
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;

Modified: kdemultimedia/trunk/PKGBUILD
===
--- kdemultimedia/trunk/PKGBUILD2011-11-22 00:57:07 UTC (rev 143051)
+++ kdemultimedia/trunk/PKGBUILD2011-11-22 01:22:09 UTC (rev 143052)
@@ -16,8 +16,8 @@
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
-'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
+ 'pulseaudio' 'libmusicbrainz3')
 
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2;
 'mplayerthumbs.config')
 sha1sums=('44b9adf781fcbebe1214fc87b006bf13ddd8b702'



[arch-commits] Commit in kdelibs/trunk (PKGBUILD)

2011-11-02 Thread Andrea Scarpino
Date: Wednesday, November 2, 2011 @ 14:31:06
  Author: andrea
Revision: 141884

upgpkg: kdelibs 4.7.3-2

Qt 4.8 + qtwebkit

Modified:
  kdelibs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-02 18:26:37 UTC (rev 141883)
+++ PKGBUILD2011-11-02 18:31:06 UTC (rev 141884)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Core Libraries
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,7 +13,7 @@
 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 
'grantlee'
 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-'docbook-xsl')
+'docbook-xsl' 'qtwebkit')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
 'hspell')
 replaces=('kdelibs-experimental')



  1   2   >