- Add missing patch data

Approved by:	miwi (mentor)
This commit is contained in:
Kris Moore 2009-06-17 15:06:49 +00:00
parent 378c3e0451
commit d07de7baa3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=236133
3 changed files with 105 additions and 0 deletions

View File

@ -0,0 +1,48 @@
--- ./cmake/modules/FindGdk.cmake.orig 2009-03-17 04:52:18.000000000 -0400
+++ ./cmake/modules/FindGdk.cmake 2009-06-08 04:44:58.000000000 -0400
@@ -16,33 +16,23 @@
if(NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
-
- PKGCONFIG(gdk-pixbuf-2.0 _GDKIncDir _GDKLinkDir _GDKLinkFlags _GDKCflags)
-
- set(GDK_DEFINITIONS ${_GDKCflags})
+ INCLUDE(FindPkgConfig)
+ PKG_CHECK_MODULES(GDK gdk-pixbuf-2.0)
+
endif(NOT WIN32)
- FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
- ${_GDKIncDir}
- )
+ FIND_PATH(GDK_INCLUDE_DIR NAMES gdk-pixbuf/gdk-pixbuf.h
+ PATHS ${GDK_INCLUDE_DIRS} PATH_SUFFIXES gtk-2.0)
- FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0
- PATHS
- ${_GDKLinkDir}
- )
-
- if (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
- SET(GDK_FOUND TRUE)
- else (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
- SET(GDK_FOUND FALSE)
- endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+ FIND_LIBRARY(GDK_LIBRARY NAMES gdk_pixbuf-2.0 PATHS ${GDK_LIBRARY_DIRS})
include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gdk DEFAULT_MSG GDK_INCLUDE_DIR GDK_LIBRARIES )
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gdk DEFAULT_MSG GDK_INCLUDE_DIR GDK_LIBRARY)
+
+ IF(GDK_FOUND)
+ SET(GDK_LIBRARIES ${GDK_LIBRARY})
+ ENDIF(GDK_FOUND)
- MARK_AS_ADVANCED(GDK_INCLUDE_DIR GDK_LIBRARIES)
+ MARK_AS_ADVANCED(GDK_INCLUDE_DIR GDK_LIBRARY)
endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
-
-macro_bool_to_01(GDK_FOUND GDK_FOUND)

View File

@ -0,0 +1,11 @@
--- ./cmake/modules/FindGpod.cmake.orig 2009-03-17 04:52:18.000000000 -0400
+++ ./cmake/modules/FindGpod.cmake 2009-06-08 04:36:50.000000000 -0400
@@ -24,7 +24,7 @@
set(GPOD_DEFINITIONS ${PC_GPOD_CFLAGS_OTHER})
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.7.0 libgpod-1.0 OUTPUT_VARIABLE _pkgconfigDevNull RETURN_VALUE GPOD_VERSION_OKAY)
+ exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --atleast-version=0.7.0 libgpod-1.0 OUTPUT_VARIABLE _pkgconfigDevNull RETURN_VALUE GPOD_VERSION_OKAY)
endif( NOT WIN32 )

View File

@ -0,0 +1,46 @@
s/<q3dragobject.h>/<Q3DragObject>/g
s/<q3frame.h>/<Q3Frame>/g
s/<q3groupbox.h>/<Q3GroupBox>/g
s/<q3hgroupbox.h>/<Q3HGroupBox>/g
s/<q3listview.h>/<Q3ListView>/g
s/<q3popupmenu.h>/<Q3PopupMenu>/g
s/<q3process.h>/<Q3Process>/g
s/<q3progressdialog.h>/<Q3ProgressDialog>/g
s/<q3strlist.h>/<Q3StrList>/g
s/<q3textview.h>/<Q3TextView>/g
s/<q3vbox.h>/<Q3VBox>/g
s/<q3vgroupbox.h>/<Q3VGroupBox>/g
s/<qapplication.h>/<QApplication>/g
s/<qbuttongroup.h>/<QButtonGroup>/g
s/<qcheckbox.h>/<QCheckBox>/g
s/<qcolor.h>/<QColor>/g
s/<qcombobox.h>/<QComboBox>/g
s/<qcursor.h>/<QCursor>/g
s/<qdesktopwidget.h>/<QDesktopWidget>/g
s/<qdir.h>/<QDir>/g
s/<qevent.h>/<QEvent>/g
s/<qfile.h>/<QFile>/g
s/<qfileinfo.h>/<QFileInfo>/g
s/<qfont.h>/<QFont>/g
s/<qfontmetrics.h>/<QFontMetrics>/g
s/<qgroupbox.h>/<QGroupBox>/g
s/<qimage.h>/<QImage>/g
s/<qlabel.h>/<QLabel>/g
s/<qlayout.h>/<QLayout>/g
s/<qlineedit.h>/<QLineEdit>/g
s/<qmatrix.h>/<QMatrix>/g
s/<qobject.h>/<QObject>/g
s/<qpainter.h>/<QPainter>/g
s/<qpalette.h>/<QPalette>/g
s/<qpixmap.h>/<QPixmap>/g
s/<qpointer.h>/<QPointer>/g
s/<qpushbutton.h>/<QPushButton>/g
s/<qradiobutton.h>/<QRadioButton>/g
s/<qregexp.h>/<QRegExp>/g
s/<qspinbox.h>/<QSpinBox>/g
s/<qstring.h>/<QString>/g
s/<qtextcodec.h>/<QTextCodec>/g
s/<qtextstream.h>/<QTextStream>/g
s/<qtimer.h>/<QTimer>/g
s/<qtooltip.h>/<QToolTip>/g
s/<qwidget.h>/<QWidget>/g