pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=30

Browse Source
This commit is contained in:
OBS User unknown 2009-04-07 10:53:37 +00:00 committed by Git OBS Bridge
parent f92005ebfd
commit 589bf5e841
5 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
digikam-print.diff
View File

@ -1,8 +1,8 @@
--- digikam/utilities/imageeditor/tools/imageprint.cpp
Index: digikam/utilities/imageeditor/tools/imageprint.cpp
===================================================================
--- digikam/utilities/imageeditor/tools/imageprint.cpp.orig
+++ digikam/utilities/imageeditor/tools/imageprint.cpp
@@ -149,20 +149,11 @@
int w, h; // will be set to the width and height of the printer
@@ -156,18 +156,9 @@ bool ImagePrint::printImageWithQt()
// when the orientation is decided.
w = metrics.width();
h = metrics.height();
@ -21,7 +21,7 @@
if ( m_printer.option( "app-imageeditor-scaleToFit" ) != f )
{
if ( m_printer.option( "app-imageeditor-auto-rotate" ) == t )
@@ -236,6 +227,7 @@
@@ -248,6 +239,7 @@ bool ImagePrint::printImageWithQt()
// Perform the actual drawing.
p.drawImage( QRect( x, y, size.width(), size.height()), image2Print );
@ -29,7 +29,7 @@
if ( printFilename )
{
QString fname = minimizeString( d->filename, fm, w );
@@ -244,6 +236,8 @@
@@ -256,6 +248,8 @@ bool ImagePrint::printImageWithQt()
{
int fw = fm.width( fname );
int x = (w - fw)/2;

5
digikam.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Apr 4 17:32:00 CEST 2009 - coolo@suse.de
- refresh patches to fix build
-------------------------------------------------------------------
Tue Mar 17 12:46:06 CET 2009 - wstephenson@suse.de

11
digikam.spec
View File

@ -43,7 +43,7 @@ License: GPL v2 or later
Group: Productivity/Graphics/Viewers
Summary: A KDE Photo Manager
Version: 0.9.5
Release: 1
Release: 2
%define rversion 0.9.5
Url: http://www.digikam.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -173,11 +173,10 @@ rm -rf digikam/sqlite
#%patch5 -p0
%patch7
%patch9
. /etc/opt/kde3/common_options
update_admin --no-unsermake
%build
. /etc/opt/kde3/common_options
update_admin --no-unsermake
export PKG_CONFIG_PATH=/opt/kde3/%_lib/pkgconfig
./configure $configkde --disable-final --without-included-sqlite3
make VERBOSE=1 %{?jobs:-j%jobs}
@ -260,6 +259,8 @@ rm -rf $RPM_BUILD_ROOT
/opt/kde3/share/apps/digikamimageplugins/superimpose
%changelog
* Sat Apr 04 2009 coolo@suse.de
- refresh patches to fix build
* Tue Mar 17 2009 wstephenson@suse.de
- Update to 0.9.5
* TIFF/PNG/JPEG2000 metadata can be edited or added
@ -291,7 +292,7 @@ rm -rf $RPM_BUILD_ROOT
* http://www.digikam.org/drupal/node/359
* Mon Jun 30 2008 stbinner@suse.de
- add missing %%defattr
* Fri May 16 2008 dmueller@suse.de
* Sat May 17 2008 dmueller@suse.de
- support custom whitebalance settings
* Thu May 08 2008 dmueller@suse.de
- temporarly disable autocolor/whitebalance setting
@ -526,7 +527,7 @@ rm -rf $RPM_BUILD_ROOT
- return in non-void function
* Thu Apr 15 2004 coolo@suse.de
- build without unsermake
* Wed Apr 07 2004 adrian@suse.de
* Thu Apr 08 2004 adrian@suse.de
- fix path to k3b
- remove mpeg plugin, we miss the tools anyway
* Sun Apr 04 2004 adrian@suse.de

24
external-sqlite.diff
View File

@ -1,25 +1,31 @@
--- digikam/libs/Makefile.am 2007/12/10 09:07:01 1.1
+++ digikam/libs/Makefile.am 2007/12/10 09:07:10
@@ -1,5 +1,5 @@
Index: digikam/libs/Makefile.am
===================================================================
--- digikam/libs/Makefile.am.orig
+++ digikam/libs/Makefile.am
@@ -4,6 +4,6 @@ endif
COMPILE_FIRST = sqlite2 $(SQLITE3_SUBDIR)
-SUBDIRS = sqlite2 $(SQLITE3_SUBDIR) lprof histogram levels curves whitebalance dmetadata \
+SUBDIRS = lprof histogram levels curves whitebalance dmetadata \
dimg threadimageio themeengine widgets greycstoration \
thumbbar jpegutils imageproperties dialogs
--- digikam/digikam/Makefile.am 2007-12-22 18:19:47.000000000 +0100
+++ digikam/digikam/Makefile.am 2007-12-29 14:24:03.000000000 +0100
@@ -1,6 +1,6 @@
METASOURCES = AUTO
Index: digikam/digikam/Makefile.am
===================================================================
--- digikam/digikam/Makefile.am.orig
+++ digikam/digikam/Makefile.am
@@ -5,7 +5,7 @@ if with_included_sqlite3
SQLITE3_INCLUDES = -I$(top_srcdir)/digikam/libs/sqlite3
endif
-INCLUDES = -I$(top_srcdir)/digikam/libs/sqlite2 \
+INCLUDES = \
-I$(top_srcdir)/digikam/libs/histogram \
-I$(top_srcdir)/digikam/libs/levels \
-I$(top_srcdir)/digikam/libs/curves \
@@ -105,7 +105,7 @@ libdigikam_la_LIBADD = $(LIB_KIO) \
$(LIB_KHTML) \
@@ -117,7 +117,7 @@ libdigikam_la_LIBADD = $(LIB_SQLITE3) \
$(LIBKIPI_LIBS) \
$(LIBKEXIV2_LIBS) \
$(LIB_KUTILS) \
- $(top_builddir)/digikam/libs/sqlite2/libsqlite2.la \
+ -lsqlite \

10
renamepreview.patch
View File

@ -1,6 +1,8 @@
--- digikam/utilities/cameragui/cameracontroller.cpp 2008/07/17 11:28:19 1.1
+++ digikam/utilities/cameragui/cameracontroller.cpp 2008/07/17 11:29:19
@@ -54,6 +54,7 @@
Index: digikam/utilities/cameragui/cameracontroller.cpp
===================================================================
--- digikam/utilities/cameragui/cameracontroller.cpp.orig
+++ digikam/utilities/cameragui/cameracontroller.cpp
@@ -54,6 +54,7 @@ extern "C"
#include <kmessagebox.h>
#include <kio/renamedlg.h>
#include <kstandarddirs.h>
@ -8,7 +10,7 @@
// Local includes.
@@ -935,13 +936,18 @@
@@ -938,13 +939,18 @@ void CameraController::customEvent(QCust
break;
}