[Pkg-kde-commits] rev 2069 - people/chrsmrtn/packages/gwenview/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-10-20 13:00:50 +0000 (Thu, 20 Oct 2005)
New Revision: 2069

Added:
   people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff
Removed:
   people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051018.diff
Log:
Branch update, again.


Deleted: people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051018.diff

Added: people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff	2005-10-20 12:49:46 UTC (rev 2068)
+++ people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff	2005-10-20 13:00:50 UTC (rev 2069)
@@ -0,0 +1,122 @@
+--- gwenview.orig/src/configure.in.in
++++ gwenview.patched/src/configure.in.in
+@@ -49,7 +49,7 @@
+   AC_MSG_CHECKING(for assembler support for IA32 extensions)
+  
+   dnl MMX check
+-  AC_TRY_COMPILE(, [ __asm__("pxor %%mm0, %%mm0" : : : "%mm0") ],
++  AC_TRY_COMPILE(, [ __asm__("pxor %mm0, %mm0") ],
+   [
+     echo $ECHO_N "MMX yes$ECHO_C"
+     AC_DEFINE_UNQUOTED(HAVE_X86_MMX, 1, [Define to 1 if the assembler supports MMX instructions.])
+@@ -57,7 +57,7 @@
+   ], [ echo $ECHO_N "MMX no$ECHO_C" ])
+ 
+   dnl SSE check
+-  AC_TRY_COMPILE(,[ __asm__("xorps %%xmm0, %%xmm0" : : : "%xmm0") ],
++  AC_TRY_COMPILE(,[ __asm__("xorps %xmm0, %xmm0") ],
+   [
+     echo $ECHO_N ", SSE yes$ECHO_C"
+     AC_DEFINE_UNQUOTED(HAVE_X86_SSE, 1, [Define to 1 if the assembler supports SSE instructions.])
+@@ -65,7 +65,7 @@
+   ], [ echo $ECHO_N ", SSE no$ECHO_C" ])
+ 
+   dnl SSE2 check
+-  AC_TRY_COMPILE(, [ __asm__("xorpd %%xmm0, %%xmm0" : : : "%xmm0") ],
++  AC_TRY_COMPILE(, [ __asm__("xorpd %xmm0, %xmm0") ],
+   [
+     echo $ECHO_N ", SSE2 yes$ECHO_C"
+     AC_DEFINE_UNQUOTED(HAVE_X86_SSE2, 1, [Define to 1 if the assembler supports SSE2 instructions.])
+@@ -73,7 +73,7 @@
+   ], [ echo $ECHO_N ", SSE2 no$ECHO_C" ])
+  
+   dnl 3DNOW check
+-  AC_TRY_COMPILE(, [ __asm__("femms" : : ) ],
++  AC_TRY_COMPILE(, [ __asm__("femms") ],
+   [
+     echo $ECHO_N ", 3DNOW yes$ECHO_C"
+     AC_DEFINE_UNQUOTED(HAVE_X86_3DNOW, 1, [Define to 1 if the assembler supports 3DNOW instructions.])
+--- gwenview.orig/src/gvcore/imageview.h
++++ gwenview.patched/src/gvcore/imageview.h
+@@ -180,6 +180,7 @@
+ 	void slotZoomOut();
+ 	void slotResetZoom();
+ 	void setAutoZoom(bool);
++	void setLockZoom(bool);
+ 	void increaseGamma();
+ 	void decreaseGamma();
+ 	void increaseBrightness();
+--- gwenview.orig/src/gvcore/imageview.cpp
++++ gwenview.patched/src/gvcore/imageview.cpp
+@@ -357,6 +357,8 @@
+ 	d->mResetZoom->setIcon("viewmag1");
+ 
+ 	d->mLockZoom=new KToggleAction(i18n("&Lock Zoom"),"lock",0,d->mActionCollection,"view_zoom_lock");
++	connect(d->mLockZoom,SIGNAL(toggled(bool)),
++		this,SLOT(setLockZoom(bool)) );
+ 
+ 	d->mIncreaseGamma=new KAction(i18n("Increase Gamma"),0,CTRL+Key_G,
+ 		this,SLOT(increaseGamma()),d->mActionCollection,"increase_gamma");
+@@ -1215,6 +1217,7 @@
+ 	updateScrollBarMode();
+ 	d->mManualZoom = false;
+ 	if (value) {
++		d->mLockZoom->setChecked( false );
+ 		d->mZoomBeforeAuto=d->mZoom;
+ 		d->mXCenterBeforeAuto=width()/2  + contentsX() + d->mXOffset;
+ 		d->mYCenterBeforeAuto=height()/2 + contentsY() + d->mYOffset;
+@@ -1224,6 +1227,13 @@
+ 	}
+ }
+ 
++void ImageView::setLockZoom(bool value) {
++	if( value ) {
++		d->mAutoZoom->setChecked( false );
++	}
++	// don't change zoom here, keep it even if it was from some auto zoom mode
++}
++
+ void ImageView::increaseGamma() {
+ 	d->mGamma = KCLAMP( d->mGamma + 10, 10, 500 );
+ 	fullRepaint();
+--- gwenview.orig/src/app/configdialog.cpp
++++ gwenview.patched/src/app/configdialog.cpp
+@@ -80,13 +80,6 @@
+ 
+ // Two helper functions to create the config pages
+ template<class T>
+-T* addConfigPage(KDialogBase* dialog, const QString& header, const QString& name, const char* iconName) {
+-	T* content=new T;
+-	addConfigPage(dialog, content, header, name, iconName);
+-	return content;
+-}
+-
+-template<class T>
+ void addConfigPage(KDialogBase* dialog, T* content, const QString& header, const QString& name, const char* iconName) {
+ 	QFrame* page=dialog->addPage(name, header, BarIcon(iconName, 32));
+ 	content->reparent(page, QPoint(0,0));
+@@ -95,6 +88,13 @@
+ 	layout->addStretch();
+ }
+ 
++template<class T>
++T* addConfigPage(KDialogBase* dialog, const QString& header, const QString& name, const char* iconName) {
++	T* content=new T;
++	addConfigPage(dialog, content, header, name, iconName);
++	return content;
++}
++
+ 
+ ConfigDialog::ConfigDialog(MainWindow* mainWindow)
+ : KDialogBase(
+--- gwenview.orig/NEWS
++++ gwenview.patched/NEWS
+@@ -1,3 +1,8 @@
++2005.xx.xx - v1.3.1
++- Fixes:
++ - Fix compilation with GCC 4.1
++ - Fix MMX configure check with GCC 4.x.
++
+ 2005.09.11 - v1.3.0
+ - Fixes:
+  - Keyboard shortcuts for file operations now work even if no image is selected.