Packman Build Service PMBS

File qx11grab.patch of Package qx11grab (Revision 6)

Currently displaying revision 6 , Show latest

--- a/modules/CheckingGNUCXX.cmake
+++ b/modules/CheckingGNUCXX.cmake
@@ -17,9 +17,9 @@ MACRO_ENSURE_VERSION ("4.6.0" "${_gcc_ve
 MACRO_ENSURE_VERSION ("4.7.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_7)
 
 IF (CMAKE_SYSTEM_NAME MATCHES Linux)
-  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith")
-  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security -Wctor-dtor-privacy -fexceptions")
-  ADD_DEFINITIONS (-D_BSD_SOURCE -DQT_NO_EXCEPTIONS)
+# SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith")
+# SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security -Wctor-dtor-privacy -fexceptions")
+  ADD_DEFINITIONS ( -DQT_NO_EXCEPTIONS)
 ENDIF (CMAKE_SYSTEM_NAME MATCHES Linux)
 
 # gcc under Windows
--- a/modules/FindPulse.cmake
+++ b/modules/FindPulse.cmake
@@ -45,9 +45,6 @@ PKG_CHECK_MODULES (PULSE libpulse${PULSE
 # Optional - pulseaudio library target
 #=============================================================================
 IF (PULSE_FOUND)
-  INCLUDE (MacroEnsureVersion)
-  ## from pulse version 1.1 to 2.0 the pulsecommon library was moved in a sub directory
-  MACRO_ENSURE_VERSION_RANGE (${PULSE_MIN_VERSION} ${PULSE_VERSION} "1.9" PULSE_OLD_API)
 
   IF (NOT PULSE_OLD_API)
     MESSAGE (STATUS "  search pulseaudio linker target for pulse>=${PULSE_VERSION}")
--- a/src/avoptions/avoptions.cpp
+++ b/src/avoptions/avoptions.cpp
@@ -178,9 +178,9 @@ namespace QX11Grab
   {
     QList<FFOption> list;
     avcodec_register_all();
-    for ( int i = 0; i < PIX_FMT_NB; i++ )
+    for ( int i = 0; i < AV_PIX_FMT_NB; i++ )
     {
-      const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ static_cast<PixelFormat> ( i ) ];
+      const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_get( static_cast<AVPixelFormat> ( i ) );
       if ( ! pix_desc->name )
         continue;
 
--- a/src/messanger/messanger.cpp
+++ b/src/messanger/messanger.cpp
@@ -120,7 +120,7 @@ bool Messanger::notify_send ( const QStr
   args << QString::fromUtf8 ( "\"%1\"" ).arg ( title );
   args << QString::fromUtf8 ( "\"%1\"" ).arg ( body );
   QProcess process ( this );
-  return process.startDetached ( "notify-send", args );
+  return process.startDetached ( NOTIFYSEND_BINARY, args );
 #endif
 
   return false;
--- a/svg/CMakeLists.txt
+++ b/svg/CMakeLists.txt
@@ -20,7 +20,7 @@ SET (_position_templates
 
 FILE (MAKE_DIRECTORY ${ARCHIVE_OUTPUT_PATH})
 FOREACH(tpl ${_position_templates})
-  EXECUTE_PROCESS (COMMAND ${INKSCAPE_BINARY} --export-png=${ARCHIVE_OUTPUT_PATH}/${tpl}.png --without-gui --vacuum-defs --export-dpi=72 --export-width=48 --export-height=48 --export-background=ffffffff ${CMAKE_CURRENT_SOURCE_DIR}/${tpl}.svg)
+  EXECUTE_PROCESS (COMMAND convert -density 1200 -resize 48x48 ${CMAKE_CURRENT_SOURCE_DIR}/${tpl}.svg ${ARCHIVE_OUTPUT_PATH}/${tpl}.png)
   INSTALL (FILES
     ${ARCHIVE_OUTPUT_PATH}/${tpl}.png
     DESTINATION share/pixmaps/qx11grab/