Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=a8ae791f53daf65adb666d958cbd4d45e92e6ac1

commit a8ae791f53daf65adb666d958cbd4d45e92e6ac1
Author: Devil505 <devil505li...@gmail.com>
Date:   Wed Jan 26 21:02:15 2011 +0100

kdelibs-4.6.0-1-i686
* removing useless patches

diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 08b4585..11392c8 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -12,10 +12,7 @@ Finclude kde
depends=()
## for now
makedepends=("${makedepends[@]}" "krb5" "libqttest>=$_F_kde_qtver" 
"docbook-xsl" "shared-desktop-ontologies>=0.5")
-source=($source \
-       cmake-print-c-cxx-flags.patch)
-sha1sums=('6ea3fc69f98fa91c5159ccd743d4d548e801c7bc' \
-          'bc22788b4dc93121c583dcefa1903ab63c3135b8')
+sha1sums=('6ea3fc69f98fa91c5159ccd743d4d548e801c7bc')

## conflicts kdebase-workspace<=4.3.5

diff --git a/source/kde/kdelibs/cmake-print-c-cxx-flags.patch 
b/source/kde/kdelibs/cmake-print-c-cxx-flags.patch
deleted file mode 100644
index f3b95e0..0000000
--- a/source/kde/kdelibs/cmake-print-c-cxx-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur kdelibs-4.4.0/cmake/modules/FindKDE4Internal.cmake 
kdelibs-4.4.0-cmake-print-flags/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.4.0/cmake/modules/FindKDE4Internal.cmake 2010-01-20 
00:15:16.000000000 +0100
-+++ kdelibs-4.4.0-cmake-print-flags/cmake/modules/FindKDE4Internal.cmake       
2010-02-10 15:50:35.000000000 +0100
-@@ -1084,8 +1084,10 @@
-
-    if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-      set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long 
-std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration 
-Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security 
-Wmissing-format-attribute -fno-common")
-+     message(STATUS "CFLAGS: ${CMAKE_C_FLAGS}")
-      # As off Qt 4.6.x we need to override the new exception macros if we 
want compile with -fno-exceptions
-      set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor 
-Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W 
-Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS 
-fno-check-new -fno-common")
-+     message(STATUS " CXXFLAGS: ${CMAKE_CXX_FLAGS}")
-      add_definitions (-D_BSD_SOURCE)
-    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-
diff --git a/source/kde/kdelibs/default-fonts.patch 
b/source/kde/kdelibs/default-fonts.patch
deleted file mode 100644
index 9dcfc87..0000000
--- a/source/kde/kdelibs/default-fonts.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur kdelibs-4.3.4/kdeui/kernel/kglobalsettings.cpp 
kdelibs-4.3.4-p/kdeui/kernel/kglobalsettings.cpp
---- kdelibs-4.3.4/kdeui/kernel/kglobalsettings.cpp     2009-10-30 
13:26:22.000000000 +0100
-+++ kdelibs-4.3.4-p/kdeui/kernel/kglobalsettings.cpp   2010-01-19 
11:18:12.000000000 +0100
-@@ -94,6 +94,7 @@
-         WindowTitleFont,
-         TaskbarFont ,
-         SmallestReadableFont,
-+      DesktopFont,
-         FontTypesCount
-     };
-
-@@ -381,7 +382,7 @@
-
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
- static const char GeneralId[] =      "General";
--static const char DefaultFont[] =    "Sans Serif";
-+static const char DefaultFont[] =    "DejaVu Sans";
- #ifdef Q_WS_MAC
- static const char DefaultMacFont[] = "Lucida Grande";
- #endif
-@@ -394,14 +395,15 @@
-     { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
-     { GeneralId, "menuFont",    DefaultMacFont, 13, -1, QFont::SansSerif },
- #else
--    { GeneralId, "font",        DefaultFont, 10, -1, QFont::SansSerif },
--    { GeneralId, "fixed",       "Monospace", 10, -1, QFont::TypeWriter },
--    { GeneralId, "toolBarFont", DefaultFont,  8, -1, QFont::SansSerif },
--    { GeneralId, "menuFont",    DefaultFont, 10, -1, QFont::SansSerif },
--#endif
--    { "WM",      "activeFont",           DefaultFont,  9, QFont::Bold, 
QFont::SansSerif },// inconsistency
--    { GeneralId, "taskbarFont",          DefaultFont, 10, -1, 
QFont::SansSerif },
--    { GeneralId, "smallestReadableFont", DefaultFont,  8, -1, 
QFont::SansSerif }
-+    { GeneralId, "font",        DefaultFont, 10, -1},
-+    { GeneralId, "fixed",       "DejaVu Sans Mono", 10, -1},
-+    { GeneralId, "toolBarFont", DefaultFont,  10, -1},
-+    { GeneralId, "menuFont",    DefaultFont, 11, -1},
-+#endif
-+    { "WM",      "activeFont",           DefaultFont,  10, QFont::Bold},// 
inconsistency
-+    { GeneralId, "taskbarFont",          DefaultFont, 10, -1},
-+    { GeneralId, "smallestReadableFont", DefaultFont,  8, -1},
-+    { GeneralId, "desktopFont",        DefaultFont,  9, -1}
- };
-
- QFont KGlobalSettingsData::font( FontTypes fontType )
-@@ -462,6 +464,7 @@
-     // most preferred last
-     static const char* const PreferredFontNames[] =
-     {
-+      "DejaVu Sans",
-         "Arial",
-         "Sans Serif",
-         "Verdana",
diff --git a/source/kde/kdelibs/kdelibs4-no-rpath.patch 
b/source/kde/kdelibs/kdelibs4-no-rpath.patch
deleted file mode 100644
index fb7db2e..0000000
--- a/source/kde/kdelibs/kdelibs4-no-rpath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath 
kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath       
2010-02-02 08:56:04.117624211 -0600
-+++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake        2010-02-02 
09:51:15.752373945 -0600
-@@ -947,10 +947,19 @@ if (UNIX)
-       set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
-    else (APPLE)
-       # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by 
cmake when compiling
--      set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
-+      # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
-+      message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: 
${CMAKE_SYSTEM_LIBRARY_PATH}")
-+      message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
-+      list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} 
_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
-+      message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: 
${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
-+      if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
-+        message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
-+        list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
-+      endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
-+
-       set(CMAKE_SKIP_BUILD_RPATH FALSE)
-       set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-    endif (APPLE)
- endif (UNIX)
-
diff --git a/source/kde/kdelibs/konq-is-frugalware.patch 
b/source/kde/kdelibs/konq-is-frugalware.patch
deleted file mode 100644
index 50509d4..0000000
--- a/source/kde/kdelibs/konq-is-frugalware.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding 
kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp
---- kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding        2008-01-04 
18:00:15.000000000 -0600
-+++ kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp 2008-03-07 14:49:46.000000000 
-0600
-@@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManag
-
- // DEFAULT USERAGENT STRING
- #define CFG_DEFAULT_UAGENT(X) \
--QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like 
Gecko)") \
-+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like 
Gecko) Frugalware Linux") \
-         
.arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
-
- #define PRIVATE_DATA \
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to