Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-02-10 17:15:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old) and /work/SRC/openSUSE:Factory/.kdebase3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2012-02-01 11:53:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2012-02-10 17:15:37.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Feb 8 16:45:34 UTC 2012 - [email protected] + +- add a konq patch from KDE3 svn + +------------------------------------------------------------------- +Wed Feb 8 12:48:59 UTC 2012 - [email protected] + +- remove qt3-devel-doc dependency + +------------------------------------------------------------------- +Tue Feb 7 22:37:05 UTC 2012 - [email protected] + +- remove openmotif dependency + +------------------------------------------------------------------- New: ---- kdebase-svn-konq-move.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.3QksyS/_old 2012-02-10 17:15:40.000000000 +0100 +++ /var/tmp/diff_new_pack.3QksyS/_new 2012-02-10 17:15:40.000000000 +0100 @@ -35,13 +35,10 @@ BuildRequires: mDNSResponder-devel BuildRequires: openldap2 BuildRequires: openldap2-devel -BuildRequires: openmotif -BuildRequires: openmotif-devel BuildRequires: openslp-devel BuildRequires: openssh BuildRequires: pam-devel BuildRequires: pcsc-lite-devel -BuildRequires: qt3-devel-doc BuildRequires: samba-client BuildRequires: unsermake BuildRequires: utempter @@ -276,6 +273,7 @@ Patch267: kdebase-pardus-fix-autosuspend.patch Patch268: systemd-shutdown.patch Patch269: kdebase-slackware-kicker.diff +Patch270: kdebase-svn-konq-move.patch %description This package contains kdebase, one of the basic packages of the K @@ -617,6 +615,7 @@ %patch267 -p1 %patch268 -p1 %patch269 -p4 +%patch270 -p4 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png @@ -638,7 +637,6 @@ PARANOIA="--with-cdparanoia" %endif LDAP="--with-ldap" -MOTIF_INCLUDE="/usr/include" X_SERVER=/usr/bin/X RUN_KAPPFINDER=no \ ./configure \ @@ -647,8 +645,6 @@ $LDAP \ $FLAGS \ $XINERAMA \ - --with-motif-libraries=/usr/%{_lib}/ \ - --with-motif-includes=$MOTIF_INCLUDE \ --with-samba-libs \ --with-pam=xdm \ --with-kdm-xconsole \ ++++++ kdebase-svn-konq-move.patch ++++++ --- branches/KDE/3.5/kdebase/libkonq/konq_operations.cc 2007/05/14 10:09:27 664555 +++ branches/KDE/3.5/kdebase/libkonq/konq_operations.cc 2010/10/15 20:04:22 1186318 @@ -562,12 +562,26 @@ return; } + bool enableLinking = true; // for now, but see below + + // We don't want to offer "move" for temp files. They might come from + // kmail using a tempfile for attachments, or ark using a tempdir for + // extracting an archive -- in all cases, we can't implement a real move, + // it's just a copy of the tempfile [and the source app will delete it later]. + // https://www.intevation.de/roundup/kolab/issue2026 + if (url.isLocalFile() && url.path().startsWith(locateLocal("tmp", QString::null))) { + sMoving = false; + sDeleting = false; + enableLinking = false; + } + QPopupMenu popup; if (!mlst.isEmpty() && (sMoving || (sReading && sDeleting)) && !linkOnly ) popup.insertItem(SmallIconSet("goto"), i18n( "&Move Here" ) + "\t" + KKey::modFlagLabel( KKey::SHIFT ), 2 ); if ( sReading && !linkOnly) popup.insertItem(SmallIconSet("editcopy"), i18n( "&Copy Here" ) + "\t" + KKey::modFlagLabel( KKey::CTRL ), 1 ); - popup.insertItem(SmallIconSet("www"), i18n( "&Link Here" ) + "\t" + KKey::modFlagLabel( (KKey::ModFlag)( KKey::CTRL|KKey::SHIFT ) ), 3 ); + if (enableLinking) + popup.insertItem(SmallIconSet("www"), i18n( "&Link Here" ) + "\t" + KKey::modFlagLabel( (KKey::ModFlag)( KKey::CTRL|KKey::SHIFT ) ), 3 ); if (bSetWallpaper) popup.insertItem(SmallIconSet("background"), i18n( "Set as &Wallpaper" ), 4 ); popup.insertSeparator(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
