Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit kdegraphics4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 11 Jan 2008 12:08:42 +0100
  • Message-id: <20080111110842.A88C36781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdegraphics4
checked in at Fri Jan 11 12:08:42 CET 2008.

--------
--- KDE/kdegraphics4/kdegraphics4.changes 2008-01-03 16:33:44.000000000
+0100
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes
2008-01-06 14:10:39.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Jan 5 21:48:29 CET 2008 - dmueller@xxxxxxx
+
+- update to 4.0
+
+-------------------------------------------------------------------

Old:
----
desktop-files.diff
kdegraphics-3.97.2.tar.bz2

New:
----
4_0_BRANCH.diff
kdegraphics-4.0.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.Ww3219/_old 2008-01-11 12:08:23.000000000 +0100
+++ /var/tmp/diff_new_pack.Ww3219/_new 2008-01-11 12:08:23.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 3.97.2)
+# spec file for package kdegraphics4 (Version 4.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -29,13 +29,13 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
Url: http://www.kde.org
-Version: 3.97.2
+Version: 4.0
Release: 1
-%define rversion 3.97.2
+%define rversion 4.0.0
Source0: kdegraphics-%rversion.tar.bz2
Source1: _upstream
+Patch0: 4_0_BRANCH.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch0: desktop-files.diff
%kde4_runtime_requires
Suggests: libkscan4
Suggests: kde4-kcolorchooser
@@ -45,6 +45,7 @@
Suggests: kde4-ksnapshot
Suggests: kde4-okular
Suggests: kde4-gwenview
+Suggests: kde4-kgamma
Provides: kdegraphics4-devel = 3.95.1
Obsoletes: kdegraphics4-devel <= 3.95.1

@@ -60,7 +61,7 @@

%prep
%setup -q -n kdegraphics-%rversion
-%patch
+%patch0

%build
%cmake_kde4 -d build
@@ -69,15 +70,31 @@
%install
cd build
%makeinstall
+ mkdir -p
$RPM_BUILD_ROOT/usr/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/apps/gwenview.svgz
$RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/128x128/apps/gwenview.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/16x16/apps/gwenview.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/22x22/apps/gwenview.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/32x32/apps/gwenview.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/48x48/apps/gwenview.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/64x64/apps/gwenview.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/
+ cp /usr/share/icons/oxygen/128x128/apps/graphics-viewer-document.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/
+ cp /usr/share/icons/oxygen/16x16/apps/graphics-viewer-document.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/
+ cp /usr/share/icons/oxygen/22x22/apps/graphics-viewer-document.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/
+ cp /usr/share/icons/oxygen/32x32/apps/graphics-viewer-document.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/
+ cp /usr/share/icons/oxygen/48x48/apps/graphics-viewer-document.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/
+ cp /usr/share/icons/oxygen/64x64/apps/graphics-viewer-document.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/
%create_subdir_filelist -d gwenview
%create_subdir_filelist -d kamera
%create_subdir_filelist -d kcolorchooser
%create_subdir_filelist -d kolourpaint
%create_subdir_filelist -d kruler
+ %create_subdir_filelist -d kgamma
%create_subdir_filelist -d ksnapshot
%create_subdir_filelist -d libkscan -v libkscan.devel
%create_subdir_filelist -d okular -v okular.devel
cd ..
+ sed -ri s,.*/usr/share/icons/oxygen/.*/apps/gwenview.*,, filelists/gwenview
%create_exclude_filelist
%suse_update_desktop_file -r kruler Utility DesktopUtility
%suse_update_desktop_file -r ksnapshot Utility DesktopUtility
@@ -119,6 +136,31 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README

+%package -n kde4-kgamma
+Group: Productivity/Graphics/Other
+Summary: kdegraphics base package
+%kde4_runtime_requires
+
+%description -n kde4-kgamma
+This package suggests the packages which are built from the kdegraphics
+module.
+
+
+
+Authors:
+--------
+ The KDE Team <kde@xxxxxxx>
+
+%post -n kde4-kgamma
+%run_ldconfig
+
+%postun -n kde4-kgamma
+%run_ldconfig
+
+%files -n kde4-kgamma -f filelists/kgamma
+%defattr(-,root,root)
+%doc COPYING COPYING-DOCS README
+
%package -n kde4-kio_kamera
Group: Hardware/Camera
Summary: KDE I/O-Slave for Cameras
@@ -267,6 +309,7 @@
%files -n kde4-okular -f filelists/okular
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
+/usr/share/icons/hicolor/*/apps/graphics-viewer-document.*

%package -n kde4-okular-devel
Group: Productivity/Office/Other
@@ -316,6 +359,7 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
%dir /usr/share/kde4/apps/gvpart
+/usr/share/icons/hicolor/*/apps/gwenview.*

%files -f filelists/exclude
%defattr(-,root,root)
@@ -331,6 +375,8 @@
%_kde_share_dir/services/svgpart.desktop

%changelog
+* Sat Jan 05 2008 - dmueller@xxxxxxx
+- update to 4.0
* Wed Jan 02 2008 - stbinner@xxxxxxx
- update to 3.97.2
* Sun Dec 16 2007 - dmueller@xxxxxxx

++++++ 4_0_BRANCH.diff ++++++
package: kdegraphics-4.0.0.tar.bz2
kdemod: kdegraphics
current HEAD: 759044
svn di between /tags/KDE/4.0.0 and /branches/KDE//branches/KDE/4.0
--- gwenview/app/documentview.cpp (revision 759054)
+++ gwenview/app/documentview.cpp (revision 759054)
@@ -133,7 +133,7 @@


void DocumentView::createPartForUrl(const KUrl& url) {
- QString mimeType=KMimeType::findByUrl(url)->name();
+ QString mimeType = MimeTypeUtils::urlMimeType(url);

QString library;
QVariantList partArgs;
--- gwenview/app/mainwindow.cpp (revision 759054)
+++ gwenview/app/mainwindow.cpp (revision 759054)
@@ -46,6 +46,7 @@
#include <kmountpoint.h>
#include <klocale.h>
#include <kmessagebox.h>
+#include <kprotocolmanager.h>
#include <kstatusbar.h>
#include <ktogglefullscreenaction.h>
#include <ktoolbar.h>
@@ -699,7 +700,15 @@
d->mDocumentView->setVisible(showDocument);
if (showDocument && d->mDocumentView->isEmpty()) {
openSelectedDocument();
- } else if (!showDocument && !d->mDocumentView->isEmpty()) {
+ } else if (!showDocument
+ && !d->mDocumentView->isEmpty()
+ && KProtocolManager::supportsListing(d->mDocumentView->url()))
+ {
+ // Reset the view to spare resources, but don't do it if we
can't
+ // browse the url, otherwise if the user starts Gwenview this
way:
+ // gwenview http://example.com/example.png
+ // and switch to browse mode, switching back to view mode won't
bring
+ // his image back.
d->mDocumentView->reset();
}
d->mThumbnailViewPanel->setVisible(showThumbnail);
@@ -804,6 +813,10 @@
void MainWindow::slotPartCompleted() {
Q_ASSERT(!d->mDocumentView->isEmpty());
KUrl url = d->mDocumentView->url();
+ if (!KProtocolManager::supportsListing(url)) {
+ return;
+ }
+
KUrl dirUrl = url;
dirUrl.setFileName("");
if (dirUrl.equals(d->mDirModel->dirLister()->url(),
KUrl::CompareWithoutTrailingSlash)) {
--- kgamma/kcmkgamma/kgamma.cpp (revision 759054)
+++ kgamma/kcmkgamma/kgamma.cpp (revision 759054)
@@ -243,8 +243,8 @@

QGridLayout *grid = new QGridLayout();
grid->setSpacing(8);
- grid->addWidget(frame1, 0, 2, 0, 3);
- grid->addWidget(frame2, 4, 8, 0, 3);
+ grid->addWidget(frame1, 0, 0, 2, 3);
+ grid->addWidget(frame2, 4, 0, 8, 3);
grid->addWidget(gammalabel, 1, 1, Qt::AlignRight);
grid->addWidget(redlabel, 5, 1, Qt::AlignRight);
grid->addWidget(greenlabel, 6, 1, Qt::AlignRight);
@@ -366,7 +366,7 @@
Arguments += rgamma[assign[i]] + ' ' + ggamma[assign[i]] + ' ' + \
bgamma[assign[i]] + ' ';
rootProcess->clearArguments();
- *rootProcess << "kdesu" << Arguments;
+ *rootProcess << KStandardDirs::findExe("kdesu") << Arguments;
rootProcess->start();
}
}
--- kgamma/CMakeLists.txt (revision 759054)
+++ kgamma/CMakeLists.txt (revision 759054)
@@ -4,5 +4,4 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR})

add_subdirectory( kcmkgamma )
-message(STATUS "Need to port kcmkgamma")
add_subdirectory( xf86gammacfg )
--- kruler/klineal.cpp (revision 759054)
+++ kruler/klineal.cpp (revision 759054)
@@ -22,6 +22,7 @@
#include <QPainter>
#include <QMouseEvent>
#include <QLabel>
+#include <QShortcut>

#include <kconfig.h>
#include <kcursor.h>
@@ -137,6 +138,12 @@
oriMenu->addAction(KIcon("kruler-west"), i18nc("Turn Kruler West", "&West"),
this, SLOT(setWest()), Qt::Key_W);
oriMenu->addAction(KIcon("object-rotate-right"), i18n("&Turn Right"), this,
SLOT(turnRight()), Qt::Key_R);
oriMenu->addAction(KIcon("object-rotate-left"), i18n("Turn &Left"), this,
SLOT(turnLeft()), Qt::Key_L);
+ new QShortcut( Qt::Key_N, this, SLOT(setNorth()));
+ new QShortcut(Qt::Key_E,this,SLOT(setEast()));
+ new QShortcut(Qt::Key_S,this, SLOT(setSouth()));
+ new QShortcut(Qt::Key_W,this, SLOT(setWest()));
+ new QShortcut(Qt::Key_R,this, SLOT(turnRight()));
+ new QShortcut(Qt::Key_L,this, SLOT(turnLeft()));
oriMenu->setTitle(i18n("&Orientation"));
mMenu->addMenu(oriMenu);
mLenMenu = new KMenu(this);
@@ -144,20 +151,32 @@
mLenMenu->addAction(i18nc("Make Kruler Height Medium", "&Medium"), this,
SLOT(setMediumLength()), Qt::CTRL+Qt::Key_M);
mLenMenu->addAction(i18nc("Make Kruler Height Tall", "&Tall"), this,
SLOT(setTallLength()), Qt::CTRL+Qt::Key_T);
mFullScreenAction = mLenMenu->addAction(i18n("&Full Screen Width"), this,
SLOT(setFullLength()), Qt::CTRL+Qt::Key_F);
+ new QShortcut(Qt::CTRL+Qt::Key_S,this, SLOT(setShortLength()));
+ new QShortcut(Qt::CTRL+Qt::Key_M,this, SLOT(setMediumLength()));
+ new QShortcut(Qt::CTRL+Qt::Key_T,this, SLOT(setTallLength()));
+ new QShortcut(Qt::CTRL+Qt::Key_F,this, SLOT(setFullLength()));
mLenMenu->setTitle(i18n("&Length"));
mMenu->addMenu(mLenMenu);
mMenu->addAction(KIcon("preferences-desktop-color"), i18n("&Choose
Color..."), this, SLOT(choseColor()), Qt::CTRL+Qt::Key_C);
mMenu->addAction(KIcon("preferences-desktop-font"), i18n("Choose &Font..."),
this, SLOT(choseFont()), Qt::Key_F);
+ new QShortcut(Qt::CTRL+Qt::Key_C,this, SLOT(choseColor()));
+ new QShortcut(Qt::Key_F,this, SLOT(choseFont()));
mMenu->addSeparator();
mMenu->addMenu((new KHelpMenu(this, KGlobal::mainComponent().aboutData(),
true))->menu());
mMenu->addSeparator();
mMenu->addAction(KIcon("application-exit"), KStandardGuiItem::quit().text(),
kapp, SLOT(quit()), Qt::CTRL+Qt::Key_Q);
+ new QShortcut(Qt::CTRL+Qt::Key_Q,this, SLOT(slotQuit()));
mLastClickPos = geometry().topLeft()+QPoint(width()/2, height()/2);
}

KLineal::~KLineal(){
}

+void KLineal::slotQuit()
+{
+ kapp->quit();
+}
+
void KLineal::move(int x, int y) {
move(QPoint(x, y));
}
--- kruler/klineal.h (revision 759054)
+++ kruler/klineal.h (revision 759054)
@@ -97,5 +97,6 @@
void choseFont();
void restoreColor();
void saveSettings();
+ void slotQuit();
};
#endif
--- kolourpaint/pixmapfx/kpPixmapFX_ScreenDepth.cpp (revision
759054)
+++ kolourpaint/pixmapfx/kpPixmapFX_ScreenDepth.cpp (revision
759054)
@@ -82,7 +82,7 @@

// Even though we support 15-bit truecolor, we're more ambitious and
// ask for 24-bit since it's safer (see kpPixmapFX::WarnAboutLossInfo).
- return ki18n ("<qt><p>This effect does not support the current screen
depth of %1bpp."
+ return ki18n ("<qt><p>This effect does not support the current screen
depth of %1bpp.</p>"
"<p>To avoid this issue, please change your screen depth to
24bpp"
" and then restart KolourPaint.</p></qt>")
.subs (QPixmap::defaultDepth ()).toString ();

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
+


++++++ kdegraphics-3.97.2.tar.bz2 -> kdegraphics-4.0.0.tar.bz2 ++++++
++++ 2356 lines of diff (skipped)



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread