Update to 0.6.1 for Qt-4.7

6 files changed, 27 insertions, 69 deletions

diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile
index 7918c3b43dba..ef915f55fd0a 100644
--- a/www/rekonq/Makefile
+++ b/www/rekonq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rekonq
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.1
 CATEGORIES=	www kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/${PORTVERSION}
 
diff --git a/www/rekonq/distinfo b/www/rekonq/distinfo
index 5ddccf5607f9..72d5d23fe751 100644
--- a/www/rekonq/distinfo
+++ b/www/rekonq/distinfo
@@ -1,3 +1,2 @@
-MD5 (rekonq-0.5.0.tar.bz2) = ffa227236b9e4aa6cca6851cc05855fb
-SHA256 (rekonq-0.5.0.tar.bz2) = a8dcf9dc81fa46a042171a29837bc1a53e0d92936afc34f6917740da7734a162
-SIZE (rekonq-0.5.0.tar.bz2) = 1155863
+SHA256 (rekonq-0.6.1.tar.bz2) = 7e9d322d26cc9f643b47f3ca7ca4be8afae626c783933c836fcf9249e045fec1
+SIZE (rekonq-0.6.1.tar.bz2) = 1246263
diff --git a/www/rekonq/files/patch-CMakeLists.txt b/www/rekonq/files/patch-CMakeLists.txt
deleted file mode 100644
index 2c26a3604a53..000000000000
--- a/www/rekonq/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./CMakeLists.txt.orig	2010-07-06 01:17:15.000000000 +0400
-+++ ./CMakeLists.txt	2010-07-06 22:29:27.282359499 +0400
-@@ -28,8 +28,6 @@
- INCLUDE(KDE4Defaults)
- INCLUDE(MacroLibrary)
- 
--FIND_PACKAGE(PkgConfig)
--PKG_CHECK_MODULES(GTK2 REQUIRED gtk+-2.0>=2.8.0)
- # ==================================================================================
- # Log messages
- 
-@@ -77,13 +75,13 @@
- 
- ##### FINAL RESULTS #####
- 
--IF(QT4_FOUND AND KDE4_FOUND AND GTK2_FOUND)
-+IF(QT4_FOUND AND KDE4_FOUND)
-     MESSAGE(STATUS " rekonq will be compiled............... YES")
-     SET(REKONQ_CAN_BE_COMPILED true)
--ELSE(QT4_FOUND AND KDE4_FOUND AND GTK2_FOUND)
-+ELSE(QT4_FOUND AND KDE4_FOUND)
-     MESSAGE(FATAL_ERROR " rekonq will NOT be compiled!")
-     SET(REKONQ_CAN_BE_COMPILED false)
--ENDIF(QT4_FOUND AND KDE4_FOUND AND GTK2_FOUND)
-+ENDIF(QT4_FOUND AND KDE4_FOUND)
- 
- MESSAGE(STATUS "")
- MESSAGE(STATUS "-----------------------------------------------------------------------")
diff --git a/www/rekonq/files/patch-src__CMakeLists.txt b/www/rekonq/files/patch-src__CMakeLists.txt
deleted file mode 100644
index bd1cc25e29c6..000000000000
--- a/www/rekonq/files/patch-src__CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/CMakeLists.txt.orig	2010-07-06 01:13:01.000000000 +0400
-+++ ./src/CMakeLists.txt	2010-07-06 22:30:12.672580660 +0400
-@@ -90,7 +90,6 @@
-                         ${CMAKE_CURRENT_BINARY_DIR}
-                         ${KDE4_INCLUDES}
-                         ${QT4_INCLUDES}
--                        ${GTK2_INCLUDE_DIRS}
- )
- 
- 
-@@ -114,7 +113,6 @@
-                         ${KDE4_KIO_LIBS}
-                         ${KDE4_KPARTS_LIBS}
-                         ${KDE4_THREADWEAVER_LIBRARIES}
--                        ${GTK2_LIBRARIES}
- )
- 
- 
diff --git a/www/rekonq/files/patch-src__main.cpp b/www/rekonq/files/patch-src__main.cpp
index b14c8c78ebad..dcc8954a3c5d 100644
--- a/www/rekonq/files/patch-src__main.cpp
+++ b/www/rekonq/files/patch-src__main.cpp
@@ -1,20 +1,11 @@
---- ./src/main.cpp.orig	2010-07-06 01:13:01.000000000 +0400
-+++ ./src/main.cpp	2010-07-06 22:29:53.933972524 +0400
-@@ -23,8 +23,6 @@
- *
- * ============================================================ */
+--- ./src/main.cpp.orig	2010-10-05 18:03:58.000000000 +0400
++++ ./src/main.cpp	2010-11-07 16:58:54.850117314 +0300
+@@ -191,7 +191,7 @@
+     }
+ #if defined(Q_WS_X11)
+     // On X11, the raster engine gives better performance than native.
+-    QApplication::setGraphicsSystem(QString::fromLatin1("raster"));
++    // QApplication::setGraphicsSystem(QString::fromLatin1("raster"));
+ #endif
+     Application app;
  
--// workaround for recent flashplugins
--#include <gtk/gtk.h>
- 
- // version include
- #include "../version.h"
-@@ -45,8 +43,6 @@
- 
- extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
- {
--    // just a hackisch workaround for recent flashplugins
--    gtk_init(&argc, &argv);
- 
-     KAboutData about("rekonq",
-                      0,
diff --git a/www/rekonq/pkg-plist b/www/rekonq/pkg-plist
index 93e6ba203234..6a1ab8db0713 100644
--- a/www/rekonq/pkg-plist
+++ b/www/rekonq/pkg-plist
@@ -4,6 +4,7 @@ share/applications/kde4/rekonq.desktop
 share/apps/rekonq/defaultbookmarks.xbel
 share/apps/rekonq/htmls/home.html
 share/apps/rekonq/htmls/rekonqinfo.html
+share/apps/rekonq/opensearch/google.xml
 share/apps/rekonq/pics/bg.png
 share/apps/rekonq/pics/bg2.png
 share/apps/rekonq/pics/busywidget.gif
@@ -12,6 +13,7 @@ share/apps/rekonq/pics/category.png
 share/apps/rekonq/pics/loading.mng
 share/apps/rekonq/pics/tile.gif
 share/apps/rekonq/pics/webkit-icon.png
+share/apps/rekonq/rekonqui.rc
 share/config.kcfg/rekonq.kcfg
 share/doc/HTML/en/rekonq/automatic_filters.png
 share/doc/HTML/en/rekonq/cache.png
@@ -34,24 +36,36 @@ share/icons/hicolor/128x128/apps/rekonq.png
 share/icons/hicolor/16x16/apps/rekonq.png
 share/icons/hicolor/32x32/apps/rekonq.png
 share/icons/hicolor/64x64/apps/rekonq.png
+share/locale/ca/LC_MESSAGES/rekonq.mo
 share/locale/cs/LC_MESSAGES/rekonq.mo
 share/locale/da/LC_MESSAGES/rekonq.mo
 share/locale/de/LC_MESSAGES/rekonq.mo
+share/locale/el/LC_MESSAGES/rekonq.mo
 share/locale/en_GB/LC_MESSAGES/rekonq.mo
 share/locale/es/LC_MESSAGES/rekonq.mo
 share/locale/et/LC_MESSAGES/rekonq.mo
 share/locale/fr/LC_MESSAGES/rekonq.mo
 share/locale/hu/LC_MESSAGES/rekonq.mo
 share/locale/it/LC_MESSAGES/rekonq.mo
+share/locale/ja/LC_MESSAGES/rekonq.mo
+share/locale/ko/LC_MESSAGES/rekonq.mo
 share/locale/lt/LC_MESSAGES/rekonq.mo
+share/locale/nb/LC_MESSAGES/rekonq.mo
 share/locale/nds/LC_MESSAGES/rekonq.mo
+share/locale/nl/LC_MESSAGES/rekonq.mo
 share/locale/pt/LC_MESSAGES/rekonq.mo
 share/locale/pt_BR/LC_MESSAGES/rekonq.mo
 share/locale/ru/LC_MESSAGES/rekonq.mo
+share/locale/sl/LC_MESSAGES/rekonq.mo
+share/locale/sr/LC_MESSAGES/rekonq.mo
+share/locale/sr@ijekavian/LC_MESSAGES/rekonq.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/rekonq.mo
+share/locale/sr@latin/LC_MESSAGES/rekonq.mo
 share/locale/sv/LC_MESSAGES/rekonq.mo
 share/locale/uk/LC_MESSAGES/rekonq.mo
 share/locale/zh_CN/LC_MESSAGES/rekonq.mo
 @dirrm share/doc/HTML/en/rekonq
 @dirrm share/apps/rekonq/pics
+@dirrm share/apps/rekonq/opensearch
 @dirrm share/apps/rekonq/htmls
 @dirrm share/apps/rekonq