diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/SoQt/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/SoQt/files')
| -rw-r--r-- | media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch | 22 | ||||
| -rw-r--r-- | media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch | 13 |
2 files changed, 35 insertions, 0 deletions
diff --git a/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch b/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch new file mode 100644 index 00000000000..f8777b037c5 --- /dev/null +++ b/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch @@ -0,0 +1,22 @@ +diff -ru soqt-1.4.1~/src/Inventor/Qt/SoQtComponent.cpp soqt-1.4.1/src/Inventor/Qt/SoQtComponent.cpp +--- soqt-1.4.1~/src/Inventor/Qt/SoQtComponent.cpp 2009-02-25 07:55:02.000000000 -0800 ++++ soqt-1.4.1/src/Inventor/Qt/SoQtComponent.cpp 2009-02-25 07:56:36.000000000 -0800 +@@ -100,10 +100,17 @@ + this->parent->removeEventFilter(this); + } + ++#if COIN_MAJOR_VERSION >= 3 ++static void delete_dict_value(SbDict::Key key, void * value) ++{ ++ delete (QCursor *)value; ++} ++#else // COIN_MAJOR_VERSION >= 3 + static void delete_dict_value(unsigned long key, void * value) + { + delete (QCursor *)value; + } ++#endif // COIN_MAJOR_VERSION < 3 + + void + SoQtComponentP::atexit_cleanup() + diff --git a/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch b/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch new file mode 100644 index 00000000000..ff55a03aed4 --- /dev/null +++ b/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch @@ -0,0 +1,13 @@ +diff -ruN SoQt-1.5.0/SoQt.pc.in my/SoQt.pc.in +--- SoQt-1.5.0/SoQt.pc.in 2010-03-02 23:57:41.000000000 +0100 ++++ my/SoQt.pc.in 2013-05-28 01:14:13.083619183 +0200 +@@ -10,7 +10,8 @@ + Version: @SOQT_VERSION@ + Requires: Coin + Conflicts: +-Libs: -L${libdir} @SOGUI_EXTRA_LDFLAGS@ @SOGUI_EXTRA_LIBS@ ++Libs: -L${libdir} -lSoQt ++Libs.private: -L${libdir} @SOGUI_EXTRA_LIBS@ + Cflags: -I${includedir} @SOGUI_EXTRA_CFLAGS@ @SOGUI_EXTRA_CPPFLAGS@ + + soqt_host=@host@ |