[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.3.3-2-3-gb45f8fd

[Ralf Jung]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gtk2-engines-oxygen.git;a=commitdiff;h=b45f8fd

The following commit has been merged in the master branch:
commit b45f8fde8c39d3b726612c138650e124ea479ec9
Author: Ralf Jung <post at ralfj.de>
Date:   Wed Oct 30 08:59:31 2013 +0100

    update patches for new upstream version
---
 debian/changelog                                   |   10 +++
 debian/patches/dont-build-demos.patch              |    2 +-
 ...open-instead-of-g_spawn_command_line_sync.patch |   70 --------------------
 debian/patches/series                              |    1 -
 4 files changed, 11 insertions(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56e5354..54ef9bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gtk2-engines-oxygen (1.4.0-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * New upstream release.
+  * Refresh dont-build-demos.patch.
+  * Drop popen-instead-of-g_spawn_command_line_sync.patch, no
+    longer needed.
+
+ -- Ralf Jung <post at ralfj.de>  Wed, 30 Oct 2013 08:58:18 +0100
+
 gtk2-engines-oxygen (1.3.3-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/dont-build-demos.patch b/debian/patches/dont-build-demos.patch
index 3d189ea..b1c299c 100644
--- a/debian/patches/dont-build-demos.patch
+++ b/debian/patches/dont-build-demos.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -198,5 +198,7 @@ configure_file( config.h.cmake ${CMAKE_B
+@@ -200,5 +200,7 @@
  add_subdirectory( src )
  add_subdirectory( rc )
  add_subdirectory( special-icons )
diff --git a/debian/patches/popen-instead-of-g_spawn_command_line_sync.patch b/debian/patches/popen-instead-of-g_spawn_command_line_sync.patch
deleted file mode 100644
index 963618a..0000000
--- a/debian/patches/popen-instead-of-g_spawn_command_line_sync.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Ralf Jung <post at ralfj.de>
-Subject: Use popen instead of g_spawn_command_line_sync
-Last-Update: 2012-05-19
-Forwarded: Committed upstream as a515ab45, 592490ea, 878b0e62 and fbc7f891
---- a/src/oxygenqtsettings.cpp
-+++ b/src/oxygenqtsettings.cpp
-@@ -209,6 +209,33 @@
-     }
- 
-     //_________________________________________________________
-+    bool QtSettings::runCommand( const std::string& command, char*& result ) const
-+    {
-+
-+        if( FILE* fp = popen( command.c_str(), "r" ) )
-+        {
-+
-+            // read command output. Make sure that the buffer is large enough to read the entire
-+            // output, by multiplying its initial size by two as long as the last character is not '
'
-+            // note that the allocated string must be freed by the calling method
-+            gulong bufSize=512;
-+            size_t currentOffset=0;
-+            result= static_cast<char*>(g_malloc(bufSize));
-+            while( fgets( result+currentOffset, bufSize-currentOffset, fp ) && result[strlen(result)-1] != '
' )
-+            {
-+                currentOffset = bufSize-1;
-+                bufSize *= 2;
-+                result = static_cast<char*>( g_realloc( result, bufSize ) );
-+            }
-+
-+            pclose(fp);
-+            return true;
-+
-+        } else return false;
-+
-+    }
-+
-+    //_________________________________________________________
-     bool QtSettings::loadKdeGlobals( void )
-     {
- 
-@@ -268,7 +295,7 @@
- 
-         // load icon install prefix
-         gchar* path = 0L;
--        if( g_spawn_command_line_sync( "kde4-config --path config", &path, 0L, 0L, 0L ) && path )
-+        if( runCommand( "kde4-config --path config", path ) && path )
-         {
- 
-             out.split( path );
-@@ -298,7 +325,7 @@
-         // load icon install prefix
-         PathList out;
-         char* path = 0L;
--        if( g_spawn_command_line_sync( "kde4-config --path icon", &path, 0L, 0L, 0L ) && path )
-+        if( runCommand( "kde4-config --path icon", path ) && path )
-         {
-             out.split( path );
-             g_free( path );
---- a/src/oxygenqtsettings.h
-+++ b/src/oxygenqtsettings.h
-@@ -348,6 +348,9 @@
- 
-         protected:
- 
-+        //! read output from a command - replacement for not always working g_spawn_command_line_sync()
-+        bool runCommand( const std::string& command, char*& result ) const;
-+
-         //! kdeglobals settings
-         /*! returns true if changed */
-         bool loadKdeGlobals( void );
diff --git a/debian/patches/series b/debian/patches/series
index 9b5e1ac..625ddbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 dont-build-demos.patch
-popen-instead-of-g_spawn_command_line_sync.patch

-- 
gtk2-engines-oxygen packaging