Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-06-10 20:17:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-08 06:45:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2012-06-10 21:51:28.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 31 02:22:18 UTC 2012 - [email protected] + +- hard dependency on kdebase3-ksysguardd +- replace run_permissions with set_permissions (bnc#764100) +- initial implementation of udisks2 backend + +------------------------------------------------------------------- New: ---- gentoo-better-volumes-descriptions-492dbc40159c91a263f29ad77c94054b2d40bb25.patch kdebase-gentoo-27cc062c6b172fd6e93addb510269b360cb7eb8d.patch udisks2-makefile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.sZ018v/_old 2012-06-10 21:51:31.000000000 +0200 +++ /var/tmp/diff_new_pack.sZ018v/_new 2012-06-10 21:51:31.000000000 +0200 @@ -23,6 +23,7 @@ %endif Name: kdebase3 +PreReq: permissions BuildRequires: OpenEXR-devel BuildRequires: cups-devel BuildRequires: db-devel @@ -291,6 +292,9 @@ Patch277: printmanager-desktop-fix.patch Patch278: kdebase-trinity-sftp-fix.diff Patch279: fileshareset2-gcc47.patch +Patch280: kdebase-gentoo-27cc062c6b172fd6e93addb510269b360cb7eb8d.patch +Patch281: udisks2-makefile.patch +Patch282: gentoo-better-volumes-descriptions-492dbc40159c91a263f29ad77c94054b2d40bb25.patch %description This package contains kdebase, one of the basic packages of the K @@ -324,11 +328,14 @@ Group: System/GUI/KDE Requires: kdebase3 == %{version} Provides: kdebase3:/opt/kde3/bin/kicker -Recommends: kdebase3-ksysguardd == %{version} +Requires: kdebase3-ksysguardd %if 0%{?with_hal} > 0 Recommends: kdebase3-with-hal-enabled %else -Recommends: udisks-glue udisks +Requires: udisks-glue udisks +%if %suse_version > 1210 +Requires: udisks2 +%endif %endif %description workspace @@ -469,6 +476,11 @@ %patch0 %patch3 %patch5 +%if 0%{?with_hal} == 0 +%patch280 -p1 +%patch281 -p1 +%patch282 -p1 +%endif %patch252 -p1 # causes hangs (bnc#158239) #%patch6 @@ -667,6 +679,11 @@ sed -i 's|ksysguarddrc|ksysguardd3rc|g' ksysguard/ksysguardd/Makefile.am sed -i 's|ksysguarddrc|ksysguardd3rc|g' ksysguard/ksysguardd/Makefile.in +%if 0%{?with_hal} == 0 +sed -i 1i\ '#define COMPILE_UDISKS2BACKEND' config.h.in +sed -i 1i\ '#define COMPILE_UDISKS2BACKEND' kioslave/media/mediamanager/mediamanager.cpp +sed -i 1i\ '#define COMPILE_UDISKS2BACKEND' kioslave/media/kcmodule/managermodule.cpp +%endif %build . /etc/opt/kde3/common_options @@ -692,7 +709,8 @@ --with-kcp-pam=kcheckpass \ --with-extra-includes=/usr/include/dbus-1.0/qt3 \ --with-kss-pam=kcheckpass - do_make %{?_smp_mflags} + +do_make %{?_smp_mflags} cd ../fileshareset2 export CXXFLAGS="$CXXFLAGS -fPIE" export CFLAGS="$CXXFLAGS -fPIE" @@ -884,7 +902,12 @@ %post /sbin/ldconfig -%run_permissions +%set_permissions /opt/kde3/bin/artswrapper /opt/kde3/bin/kcheckpass /opt/kde3/bin/kdesud +%set_permissions /opt/kde3/bin/kpac_dhcp_helper /opt/kde3/bin/start_kdeinit + +%verifyscript +%verify_permissions -e /opt/kde3/bin/kcheckpass +%verify_permissions -e /opt/kde3/bin/kdesud %post kdm %{fillup_only -an windowmanager-kdebase3} @@ -906,7 +929,10 @@ fi %post -n fileshareset -%run_permissions +%set_permissions /usr/bin/filesharelist + +%verifyscript -n fileshareset +%verify_permissions -e /usr/bin/fileshareset %postun kdm %insserv_cleanup @@ -948,8 +974,8 @@ %dir /opt/kde3/share/applnk/System/ScreenSavers %dir /opt/kde3/share/applnk/apps /opt/kde3/share/applnk/apps/ScreenSavers -/etc/xdg/menus/*.menu -/etc/xdg/menus/applications-merged +%config(noreplace) /etc/xdg/menus/*.menu +%config(noreplace) /etc/xdg/menus/applications-merged %verify(not mode) %attr(2755,root,nogroup) /opt/kde3/bin/kdesud %verify(not mode) %attr(0755,root,man) /opt/kde3/bin/khc_indexbuilder /opt/kde3/env @@ -1384,8 +1410,6 @@ %files session %defattr(-,root,root) -/usr/bin/kde -/usr/bin/startkde3 /usr/share/xsessions/kde.desktop %files extra @@ -1532,6 +1556,8 @@ %exclude /usr/share/wallpapers/default_blue.* %doc %lang(en) /opt/kde3/share/doc/HTML/en/kicker /usr/share/wallpapers +/usr/bin/kde +/usr/bin/startkde3 /opt/kde3/bin/startkde /opt/kde3/bin/kdesktop /opt/kde3/bin/kdesktop_lock ++++++ gentoo-better-volumes-descriptions-492dbc40159c91a263f29ad77c94054b2d40bb25.patch ++++++ >From 492dbc40159c91a263f29ad77c94054b2d40bb25 Mon Sep 17 00:00:00 2001 From: Serghei Amelian <[email protected]> Date: Fri, 1 Jun 2012 19:53:31 +0300 Subject: [PATCH] [kioslave/media] better description for non-labeled volumes on udisks2 backend --- kioslave/media/mediamanager/udisks2backend.cpp | 39 +++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/kioslave/media/mediamanager/udisks2backend.cpp b/kioslave/media/mediamanager/udisks2backend.cpp index e2e84a1..b66bea4 100644 --- a/kioslave/media/mediamanager/udisks2backend.cpp +++ b/kioslave/media/mediamanager/udisks2backend.cpp @@ -48,6 +48,7 @@ class Property { bool toBool() const; int toInt() const; + Q_INT64 toInt64() const; QString toString() const; QStringList toStringList() const; QDBusObjectPath toObjectPath() const; @@ -99,6 +100,7 @@ class Object : public QDBusProxy { QString m_device; QString m_label; QString m_fsType; + Q_INT64 m_size; // filesystem interface bool m_filesystem; @@ -149,6 +151,19 @@ inline QString qDBusByteListToString(const QDBusData &data) } +QString qHumanReadableSize(Q_INT64 size) +{ + const char *units[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB" }; + int mod = 1024; + + int i; + for(i = 0; size > mod && i < 5; i++) + size /= mod; + + return QString("%1%2").arg(size).arg(units[i]); +} + + /***** class Property ******************************/ @@ -173,6 +188,14 @@ int Property::toInt() const } +Q_INT64 Property::toInt64() const +{ + if(QDBusData::UInt64 == m_data.type()) + return m_data.toUInt64(); + return m_data.toInt64(); +} + + QString Property::toString() const { if(QDBusData::List == m_data.type()) @@ -285,6 +308,7 @@ Medium *Object::createMountableMedium() Q_ASSERT(drive); QString name = (m_label.isEmpty() ? QString(m_device).section('/', -1, -1) : m_label); + QString label = m_label; QString mimeType; QString iconName; @@ -297,16 +321,22 @@ Medium *Object::createMountableMedium() mimeType = "media/dvd"; else mimeType = "media/cdrom"; + if(label.isEmpty()) + label = i18n("Optical Media"); } // removable media else if(drive->m_removable) { mimeType = "media/removable"; + if(label.isEmpty()) + label = i18n("Removable Media"); } // other media else { mimeType = "media/hdd"; + if(label.isEmpty()) + label = i18n("Hard Disk"); } if("thumb" == drive->m_media) @@ -331,8 +361,11 @@ Medium *Object::createMountableMedium() if(!iconName.isEmpty()) iconName += (m_mounted ? "_mount" : "_unmount"); + if(m_label.isEmpty()) + label = QString("%1 %2 (%3)").arg(qHumanReadableSize(m_size)).arg(label).arg(name); + Medium *medium = new Medium(path(), name); - medium->setLabel(name); + medium->setLabel(label); medium->mountableState(m_device, m_mountPoint, m_fsType, m_mounted); medium->setMimeType(mimeType); medium->setIconName(iconName); @@ -435,6 +468,10 @@ void Object::propertiesChanged(const QString &interface, const QDBusDataMap<QStr } else if("IdType" == propertyName) m_fsType = propertyValue.toString(); + else if("Size" == propertyName) { + m_size = propertyValue.toInt64(); + mediumNeedUpdate = true; + } } // properties of filesystem -- 1.7.10 ++++++ kdebase-gentoo-27cc062c6b172fd6e93addb510269b360cb7eb8d.patch ++++++ ++++ 925 lines (skipped) ++++++ udisks2-makefile.patch ++++++ diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.am kdebase-3.5.10/kioslave/media/mediamanager/Makefile.am --- kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.am 2005-09-10 12:25:36.000000000 +0400 +++ kdebase-3.5.10/kioslave/media/mediamanager/Makefile.am 2012-06-01 04:36:13.045367760 +0400 @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) -kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel +kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel udisks2backend.cpp kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB) diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.in kdebase-3.5.10/kioslave/media/mediamanager/Makefile.in --- kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.in 2008-08-20 20:01:47.000000000 +0400 +++ kdebase-3.5.10/kioslave/media/mediamanager/Makefile.in 2012-06-01 04:51:12.110384379 +0400 @@ -60,13 +60,13 @@ ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) \ $(LINUXCDPOLLING_LIB) am_kded_mediamanager_la_OBJECTS = mediamanager.lo medialist.lo \ - backendbase.lo fstabbackend.lo removablebackend.lo \ + backendbase.lo fstabbackend.lo udisks2backend.lo removablebackend.lo \ mediadirnotify.lo #>- kded_mediamanager_la_OBJECTS = $(am_kded_mediamanager_la_OBJECTS) #>+ 6 kded_mediamanager_la_final_OBJECTS = kded_mediamanager_la.all_cpp.lo kded_mediamanager_la_nofinal_OBJECTS = mediamanager.lo medialist.lo \ - backendbase.lo fstabbackend.lo removablebackend.lo \ + backendbase.lo fstabbackend.lo udisks2backend.lo removablebackend.lo \ mediadirnotify.lo mediamanager_skel.lo mediadirnotify_skel.lo @KDE_USE_FINAL_FALSE@kded_mediamanager_la_OBJECTS = $(kded_mediamanager_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kded_mediamanager_la_OBJECTS = $(kded_mediamanager_la_final_OBJECTS) @@ -508,9 +508,9 @@ @include_media_linuxcdpolling_TRUE@liblinuxcdpolling_la_SOURCES = linuxcdpolling.cpp @include_media_linuxcdpolling_TRUE@liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) -#>- kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel +#>- kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp udisks2backend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel #>+ 1 -kded_mediamanager_la_SOURCES=mediamanager.cpp medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp +kded_mediamanager_la_SOURCES=mediamanager.cpp medialist.cpp backendbase.cpp fstabbackend.cpp udisks2backend.cpp removablebackend.cpp mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB) servicesdir = $(kde_servicesdir)/kded @@ -891,6 +891,13 @@ mocs: fstabbackend.moc #>+ 3 +udisks2backend.moc: $(srcdir)/udisks2backend.h + $(MOC) $(srcdir)/udisks2backend.h -o udisks2backend.moc + +#>+ 2 +mocs: udisks2backend.moc + +#>+ 3 halbackend.moc: $(srcdir)/halbackend.h $(MOC) $(srcdir)/halbackend.h -o halbackend.moc @@ -913,10 +920,10 @@ #>+ 3 clean-metasources: - -rm -f removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc + -rm -f removablebackend.moc mediamanager.moc fstabbackend.moc udisks2backend.moc halbackend.moc linuxcdpolling.moc medialist.moc #>+ 2 -KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am +KDE_DIST=fstabbackend.h udisks2backend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am #>+ 5 clean-idl: @@ -966,11 +973,11 @@ #>+ 11 -kded_mediamanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mediamanager.cpp $(srcdir)/medialist.cpp $(srcdir)/backendbase.cpp $(srcdir)/fstabbackend.cpp $(srcdir)/removablebackend.cpp $(srcdir)/mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp removablebackend.moc mediamanager.moc fstabbackend.moc medialist.moc +kded_mediamanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mediamanager.cpp $(srcdir)/medialist.cpp $(srcdir)/backendbase.cpp $(srcdir)/fstabbackend.cpp $(srcdir)/udisks2backend.cpp $(srcdir)/removablebackend.cpp $(srcdir)/mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp removablebackend.moc mediamanager.moc fstabbackend.moc udisks2backend.cpp medialist.moc @echo 'creating kded_mediamanager_la.all_cpp.cpp ...'; \ rm -f kded_mediamanager_la.all_cpp.files kded_mediamanager_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded_mediamanager_la.all_cpp.final; \ - for file in mediamanager.cpp medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp ; do \ + for file in mediamanager.cpp medialist.cpp backendbase.cpp fstabbackend.cpp udisks2backend.cpp removablebackend.cpp mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp ; do \ echo "#include \"$$file\"" >> kded_mediamanager_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_mediamanager_la.all_cpp.final; \ done; \ @@ -1003,6 +1010,7 @@ #>+ 15 fstabbackend.o: fstabbackend.moc +udisks2backend.o: udisks2backend.moc medialist.o: medialist.moc halbackend.lo: halbackend.moc linuxcdpolling.o: linuxcdpolling.moc @@ -1012,6 +1020,7 @@ nmcheck-am: nmcheck removablebackend.lo: removablebackend.moc fstabbackend.lo: fstabbackend.moc +udisks2backend.lo: udisks2backend.moc halbackend.o: halbackend.moc medialist.lo: medialist.moc removablebackend.o: removablebackend.moc -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
