summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-11-09 10:05:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-11-09 10:05:40 +0000
commit1f03d47e921b247092a641d8403509d5a4cfd028 (patch)
treea2f266b090796fd0b2134f3fe1920d4a37a999fe /media-gfx
parentUnused patch. (diff)
downloadhistorical-1f03d47e921b247092a641d8403509d5a4cfd028.tar.gz
historical-1f03d47e921b247092a641d8403509d5a4cfd028.tar.bz2
historical-1f03d47e921b247092a641d8403509d5a4cfd028.zip
Unused patch.
Package-Manager: portage-2.2_rc48/cvs/Linux x86_64
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/kphotoalbum/Manifest1
-rw-r--r--media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch146
-rw-r--r--media-gfx/showimg/Manifest1
-rw-r--r--media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch48
4 files changed, 0 insertions, 196 deletions
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 8de55fb0c24b..8e794a8d06b1 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,4 +1,3 @@
-AUX kphotoalbum-3.1.0-exiv2.patch 5044 RMD160 757b71a9cb299edc8341c66fff75d65823402857 SHA1 2ca7313318b6d743771b32ba01a6b6d8ba2261d3 SHA256 ae8046cdf2c3e512707552d73f3d15e9980cc1a2e13a3f2046bd3580d23d2689
AUX kphotoalbum-3.1.1-desktop-files-fixes.diff 794 RMD160 65e4524bf9768adaa8538b003d14567ec046f350 SHA1 5af59f51746a3189e7fcc113cd2450fb0f38a8ae SHA256 99ffa93f5a612d470ce6885dfd170c3a7f9a44994e85848d169199ed798865af
AUX kphotoalbum-3.1.1-gcc-4.3.patch 303 RMD160 a1fce81c376728bc86fd752adab264fa937abeb1 SHA1 1b298b743ea97de98574ab29227dba0d75215ecf SHA256 ed08438cf8826e0c2523085bcc9e59661a07ca6946ffeac1649c1865248eb69e
DIST kphotoalbum-3.1.1.tar.bz2 15503061 RMD160 8bda36262a160f8f0db994698bf337ee89b95a7b SHA1 28957f177adda08caba1935e05b7e3dc20e7649e SHA256 9b21b32afc94f9ac82950abe87028896d30208373e5c35ebb248bba31ac107f0
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch b/media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch
deleted file mode 100644
index f1133c093cd9..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- kphotoalbum/src/Makefile.am 2007/12/01 00:03:03 743451
-+++ kphotoalbum/src/Makefile.am 2007/12/01 00:09:53 743452
-@@ -10,8 +10,6 @@
- if compile_with_exiv2
- EXIF_DIR = Exif
- KPHOTOALBUM_EXIV2_LIBS = Exif/libexif.la -lexiv2
--else
-- KPHOTOALBUM_EXIV2_LIBS = Exif/libexif.la
- endif
-
- if compile_with_kexidb
---- kphotoalbum/src/Settings/SettingsDialog.cpp 2007/12/01 00:03:03 743451
-+++ kphotoalbum/src/Settings/SettingsDialog.cpp 2007/12/01 00:09:53 743452
-@@ -57,6 +57,7 @@
- #ifdef HASEXIV2
- # include "Exif/Info.h"
- # include "Exif/TreeView.h"
-+# include "Exif/SyncWidget.h"
- #endif
-
- #ifdef SQLDB_SUPPORT
-@@ -65,7 +66,6 @@
- #endif
-
- #include "CategoryItem.h"
--#include "Exif/SyncWidget.h"
-
- Settings::SettingsDialog::SettingsDialog( QWidget* parent, const char* name )
- :KDialogBase( IconList, i18n( "Settings" ), Apply | Ok | Cancel, Ok, parent, name, false ), _currentCategory( QString::null ), _currentGroup( QString::null )
-@@ -435,7 +435,6 @@
- _exifForViewer->setSelected( Settings::SettingsData::instance()->exifForViewer() );
- _exifForDialog->setSelected( Settings::SettingsData::instance()->exifForDialog() );
- _iptcCharset->setCurrentItem( opt->iptcCharset() );
--#endif
-
- // Synchronization page
- _orientationRead->updatePreferred( Settings::SettingsData::instance()->orientationSyncing( false ) );
-@@ -458,6 +457,7 @@
- _catMulti[ (*it)->name() ]->setCurrentItem( opt->categorySyncingMultiValue( (*it)->name() ) );
- _catAddName[ (*it)->name() ]->setChecked( opt->categorySyncingAddName( (*it)->name() ) );
- }
-+#endif
-
- QString backend = Settings::SettingsData::instance()->backend();
- if (backend == QString::fromLatin1("xml"))
-@@ -548,7 +548,6 @@
- opt->setExifForViewer( _exifForViewer->selected() ) ;
- opt->setExifForDialog( _exifForDialog->selected() ) ;
- opt->setIptcCharset( _iptcCharset->currentItem() );
--#endif
-
- // Synchronization
- opt->setOrientationSyncing( false, _orientationRead->items() );
-@@ -559,6 +558,7 @@
- opt->setDescriptionSyncing( true, _descriptionWrite->items() );
- opt->setDateSyncing( false, _dateRead->items() );
- opt->setDateSyncing( true, _dateWrite->items() );
-+
- for (QDictIterator<Exif::SyncWidget> it( _catFieldsRead ); it.current(); ++it ) {
- opt->setCategorySyncingFields( false, it.currentKey(), it.current()->items() );
- }
-@@ -574,6 +574,7 @@
- for (QDictIterator<QCheckBox> it( _catAddName ); it.current(); ++it ) {
- opt->setCategorySyncingAddName( it.currentKey(), it.current()->isChecked() );
- }
-+#endif
-
- // SQLDB
- #ifdef SQLDB_SUPPORT
-@@ -1023,6 +1024,7 @@
-
- void Settings::SettingsDialog::createSyncPage()
- {
-+#ifdef HASEXIV2
- _syncPage = addPage( i18n("Metadata"), i18n("Metadata Synchronization"),
- KGlobal::iconLoader()->loadIcon( QString::fromLatin1( "saveas" ),
- KIcon::Desktop, 32 ) );
-@@ -1073,6 +1075,7 @@
- slotCategoryAdded( (*it)->name() );
-
- _lay->addWidget( _syncTabs );
-+#endif
- }
-
- void Settings::SettingsDialog::slotCategoryAdded( const QString& name )
-@@ -1086,6 +1089,8 @@
- QGrid* box = new QGrid( 2, Horizontal, _syncPage );
- box->setSpacing( 6 );
-
-+
-+#ifdef HASEXIV2
- const Settings::SettingsData* opt = Settings::SettingsData::instance();
-
- _catFieldsRead.replace( name, new Exif::SyncWidget( i18n("Fields to get value from"), box,
-@@ -1107,10 +1112,12 @@
- new QWidget( box );
- _catAddName.replace( name, new QCheckBox( i18n("Include category name in tag value" ), box ) );
- _syncTabs->addTab( box, name );
-+#endif
- }
-
- void Settings::SettingsDialog::slotCategoryRemoved( const QString& name )
- {
-+#ifdef HASEXIV2
- for (int i = 0; _syncTabs->page( i ); ++i )
- if ( _syncTabs->label( i ).remove( '&' ) == name ) {
- _catFieldsRead.remove( name );
-@@ -1123,6 +1130,9 @@
- delete tab;
- return;
- }
-+#else
-+ Q_UNUSED( name );
-+#endif
- }
-
- void Settings::SettingsDialog::slotCategoryRenamed( const QString& oldName, const QString& newName )
---- kphotoalbum/src/Settings/SettingsDialog.h 2007/12/01 00:03:03 743451
-+++ kphotoalbum/src/Settings/SettingsDialog.h 2007/12/01 00:09:53 743452
-@@ -21,7 +21,11 @@
- #include <kdialogbase.h>
- #include "Settings/SettingsData.h"
- #include "DB/MemberMap.h"
--#include "Exif/SyncWidget.h"
-+
-+#ifdef HASEXIV2
-+# include "Exif/SyncWidget.h"
-+#endif
-+
- class QListView;
- class KColorButton;
- class QSpinBox;
-@@ -171,11 +175,13 @@
- // Synchronization
- QTabWidget* _syncTabs;
- QWidget* _syncPage;
-+#ifdef HASEXIV2
- Exif::SyncWidget *_labelRead, *_labelWrite, *_descriptionRead, *_descriptionWrite,
- *_orientationRead, *_orientationWrite, *_dateRead, *_dateWrite;
- QDict<Exif::SyncWidget> _catFieldsRead, _catFieldsWrite;
- QDict<KComboBox> _catSuper, _catMulti;
- QDict<QCheckBox> _catAddName;
-+#endif
-
- int _backendPageIndex;
- QButtonGroup* _backendButtons;
diff --git a/media-gfx/showimg/Manifest b/media-gfx/showimg/Manifest
index 5885c76122dd..6ca0d599a086 100644
--- a/media-gfx/showimg/Manifest
+++ b/media-gfx/showimg/Manifest
@@ -1,4 +1,3 @@
-AUX showimg-0.9.5+gcc-4.3.patch 1700 RMD160 69314a70e781db6193e640304194d1901f36c23d SHA1 d5e87de38c0956e8322fafca96eca1884e938839 SHA256 54012e4a4682a8d36c67bc84d8a4f880e2534d3a4cade64e7cdd9a45853484b4
AUX showimg-0.9.5-as-needed.patch 1027 RMD160 06d412091020a7bb391c3df6f2356c525d1a54f5 SHA1 1585f168f6ddc7a7dece90ade5a11ed25d5dc26f SHA256 96a0caf6086ee675c87db6e22dc4e8a0c9cad9c41f5552573ac44c1a53abd341
AUX showimg-0.9.5-gcc-4.3.patch 2023 RMD160 8d7dd8a8ccd67096e315ce71a0e92e81dc061cb6 SHA1 1552d3e99204539d32447c62a8845a5b3621dffa SHA256 2abeaba58543cf37d1398de8f448ec3403f66b374805fbcca5367b8102f113c6
AUX showimg-0.9.5-libpqxx-2.6.9.diff 4656 RMD160 b463c4aadfbd1cef74be1a63e5172ac4f7a5ddbd SHA1 ab381f7c121d87809f85a067df01a6b9c4c9a747 SHA256 82f7ff4ac32001da364a482f405fbe3fae902c2cc1b6133541dcad4679443530
diff --git a/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch b/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch
deleted file mode 100644
index b100dd03d836..000000000000
--- a/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp
---- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp 2006-01-07 09:47:45.000000000 +0100
-+++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp 2008-04-27 21:30:03.000000000 +0200
-@@ -357,10 +357,11 @@
- #include <string.h>
- #include <string>
- #include <iostream>
- #include <assert.h>
- #include <limits.h>
-+#include <cstdlib>
- //TODO OK?
- #ifdef Q_WS_WIN
- //workaround for bug on msvc
- # undef LLONG_MIN
- #endif
-diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y
---- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y 2006-01-07 09:47:45.000000000 +0100
-+++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y 2008-04-27 21:17:31.000000000 +0200
-@@ -438,10 +438,12 @@
- #include <string.h>
- #include <string>
- #include <iostream>
- #include <assert.h>
- #include <limits.h>
-+#include <alloca.h>
-+#include <cstdlib>
- //TODO OK?
- #ifdef Q_WS_WIN
- //workaround for bug on msvc
- # undef LLONG_MIN
- #endif
-diff -NrU5 showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp showimg-0.9.5/showimg/showimg/imagelistview.cpp
---- showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp 2006-01-07 09:48:04.000000000 +0100
-+++ showimg-0.9.5/showimg/showimg/imagelistview.cpp 2008-04-27 21:17:31.000000000 +0200
-@@ -47,10 +47,13 @@
- #include "imagefileiconitem.h"
- #include "dirfileiconitem.h"
- #include "imageviewer.h"
- #include "imagemetainfo.h"
-
-+#include <cstdlib>
-+#include <climits>
-+
- #ifdef HAVE_KIPI
- #include "kipiplugins/kipipluginmanager.h"
- #endif /* HAVE_KIPI */
-
- #ifdef HAVE_LIBKEXIF