Date: Thu, 1 Aug 2013 20:14:57 GMT From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r255425 - in soc2013/jmuniz: . KPackageKit/KPackageKit-0.6.3.3/kpackagekit KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files PackageKit-Setter PackageKit-qt4/PackageKit-qt4-0.6.11/pa... Message-ID: <201308012014.r71KEv04099717@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmuniz Date: Thu Aug 1 20:14:56 2013 New Revision: 255425 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255425 Log: Flood of commits Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-AddRm-AddRmKCM.ui soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-AddRm-BrowseView.ui soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-Updater-UpdateKCM.ui soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/Makefile.am soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/default-dialog soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-backends-ports-ruby__packagekit_backend.rb soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-backends-ports-ruby__packagekit_prints.rb soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-backends-ports_pk-backend-ports.c soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-data_pk-upgrade-distro.sh soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-etc_Vendor.conf soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-src_pk-lsof.c soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-src_plugins_pk-lsof.c soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-src_plugins_pk-self-test.c soc2013/jmuniz/Patch_Overlays/ soc2013/jmuniz/Patch_Overlays/KPackageKit-0.6.3.3/ soc2013/jmuniz/Patch_Overlays/KPackageKit-0.6.3.3/AddRm/ soc2013/jmuniz/Patch_Overlays/KPackageKit-0.6.3.3/AddRm/AddRmKCM.ui (contents, props changed) soc2013/jmuniz/Patch_Overlays/KPackageKit-0.6.3.3/AddRm/BrowseView.ui (contents, props changed) soc2013/jmuniz/Patch_Overlays/KPackageKit-0.6.3.3/Updater/ soc2013/jmuniz/Patch_Overlays/KPackageKit-0.6.3.3/Updater/UpdateKCM.ui (contents, props changed) soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/Makefile.am soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/Makefile.in soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/Makefile.am soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/Makefile.in soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/pk-backend-pkgng.c soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/pkgngBackend.rb (contents, props changed) soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/ruby_packagekit/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/ruby_packagekit/Makefile.am soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/ruby_packagekit/Makefile.in soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/ruby_packagekit/enums.rb soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/pkgng/ruby_packagekit/prints.rb soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/ports/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/ports/pk-backend-ports.c soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/backends/ports/portsBackend.rb (contents, props changed) soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/configure (contents, props changed) soc2013/jmuniz/Patch_Overlays/PackageKit-0.6.11/configure.ac soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/.deps/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/.deps/libpk_backend_ports_la-pk-backend-ports.Plo soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/Makefile soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/Makefile.am soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/Makefile.in soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/helpers/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/helpers/Makefile.am soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/helpers/default-dialog soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/pk-backend-ports.c soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/portsBackend.rb (contents, props changed) soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ruby_packagekit/ soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ruby_packagekit/Makefile soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ruby_packagekit/Makefile.am soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ruby_packagekit/Makefile.in soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ruby_packagekit/backend.rb soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ruby_packagekit/enums.rb soc2013/jmuniz/Patch_Overlays/PackageKit-0.8.9/backends/ports/ruby_packagekit/prints.rb soc2013/jmuniz/Patch_Overlays/gnome-packagekit-2.32.0/ soc2013/jmuniz/Patch_Overlays/gnome-packagekit-2.32.0/data/ soc2013/jmuniz/Patch_Overlays/gnome-packagekit-2.32.0/data/gpk-application.ui (contents, props changed) soc2013/jmuniz/Patch_Overlays/gnome-packagekit-2.32.0/data/gpk-update-viewer.ui (contents, props changed) soc2013/jmuniz/Patch_Overlays/gnome-packagekit-2.32.0/src/ soc2013/jmuniz/Patch_Overlays/gnome-packagekit-2.32.0/src/gpk-application.c soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-data_gpk-application.ui soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-data_gpk-update-viewer.ui Modified: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/Makefile soc2013/jmuniz/PackageKit-Setter/pk-setter soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/Makefile soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-descr soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist soc2013/jmuniz/TODO soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/Makefile Modified: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/Makefile ============================================================================== --- soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/Makefile Thu Aug 1 19:37:11 2013 (r255424) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/Makefile Thu Aug 1 20:14:56 2013 (r255425) @@ -15,7 +15,6 @@ COMMENT= KDE interface for PackageKit LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= packagekit-qt.14:${PORTSDIR}/ports-mgmt/packagekit-qt4 Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-AddRm-AddRmKCM.ui ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-AddRm-AddRmKCM.ui Thu Aug 1 20:14:56 2013 (r255425) @@ -0,0 +1,71 @@ +--- AddRm/AddRmKCM.ui 2011-01-03 12:58:18.000000000 -0500 ++++ AddRM/AddRmKCM.ui 2013-08-01 02:30:03.000000000 -0400 +@@ -6,8 +6,8 @@ + <rect> + <x>0</x> + <y>0</y> +- <width>411</width> +- <height>322</height> ++ <width>433</width> ++ <height>320</height> + </rect> + </property> + <property name="sizePolicy"> +@@ -29,6 +29,18 @@ + <property name="margin"> + <number>0</number> + </property> ++ <item row="2" column="1"> ++ <widget class="QTreeWidget" name="treeWidget"> ++ <attribute name="headerVisible"> ++ <bool>false</bool> ++ </attribute> ++ <column> ++ <property name="text"> ++ <string notr="true">1</string> ++ </property> ++ </column> ++ </widget> ++ </item> + <item row="0" column="0" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> +@@ -56,7 +68,7 @@ + </item> + <item> + <widget class="KLineEdit" name="searchKLE"> +- <property name="clickMessage"> ++ <property name="clickMessage" stdset="0"> + <string>Search packages</string> + </property> + <property name="showClearButton" stdset="0"> +@@ -129,8 +141,11 @@ + </item> + </layout> + </item> +- <item row="1" column="0" colspan="2"> ++ <item row="2" column="0"> + <widget class="QStackedWidget" name="stackedWidget"> ++ <property name="currentIndex"> ++ <number>2</number> ++ </property> + <widget class="QWidget" name="pageHome"> + <layout class="QGridLayout" name="gridLayout_3"> + <property name="margin"> +@@ -198,6 +213,16 @@ + </widget> + </widget> + </item> ++ <item row="1" column="1"> ++ <widget class="QLabel" name="label"> ++ <property name="text"> ++ <string>Select Target System(s)</string> ++ </property> ++ <property name="alignment"> ++ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> ++ </property> ++ </widget> ++ </item> + </layout> + <action name="actionFindName"> + <property name="text"> Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-AddRm-BrowseView.ui ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-AddRm-BrowseView.ui Thu Aug 1 20:14:56 2013 (r255425) @@ -0,0 +1,264 @@ +--- AddRm/BrowseView.ui 2011-01-03 12:58:18.000000000 -0500 ++++ AddRM/BrowseView.ui 2013-08-01 02:23:58.000000000 -0400 +@@ -6,8 +6,8 @@ + <rect> + <x>0</x> + <y>0</y> +- <width>442</width> +- <height>328</height> ++ <width>580</width> ++ <height>326</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout"> +@@ -17,7 +17,140 @@ + <property name="margin"> + <number>0</number> + </property> +- <item row="0" column="0"> ++ <item row="2" column="0"> ++ <widget class="QTreeView" name="packageView"> ++ <property name="contextMenuPolicy"> ++ <enum>Qt::CustomContextMenu</enum> ++ </property> ++ <property name="editTriggers"> ++ <set>QAbstractItemView::NoEditTriggers</set> ++ </property> ++ <property name="alternatingRowColors"> ++ <bool>true</bool> ++ </property> ++ <property name="iconSize"> ++ <size> ++ <width>40</width> ++ <height>24</height> ++ </size> ++ </property> ++ <property name="verticalScrollMode"> ++ <enum>QAbstractItemView::ScrollPerPixel</enum> ++ </property> ++ <property name="rootIsDecorated"> ++ <bool>false</bool> ++ </property> ++ <property name="itemsExpandable"> ++ <bool>false</bool> ++ </property> ++ <property name="expandsOnDoubleClick"> ++ <bool>false</bool> ++ </property> ++ <attribute name="headerVisible"> ++ <bool>false</bool> ++ </attribute> ++ </widget> ++ </item> ++ <item row="1" column="1"> ++ <widget class="QLabel" name="label"> ++ <property name="layoutDirection"> ++ <enum>Qt::LeftToRight</enum> ++ </property> ++ <property name="text"> ++ <string>Select Target System(s)</string> ++ </property> ++ <property name="alignment"> ++ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> ++ </property> ++ </widget> ++ </item> ++ <item row="1" column="0"> ++ <widget class="QFrame" name="installedF"> ++ <layout class="QHBoxLayout" name="horizontalLayout"> ++ <property name="spacing"> ++ <number>0</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QPushButton" name="exportInstalledPB"> ++ <property name="enabled"> ++ <bool>false</bool> ++ </property> ++ <property name="text"> ++ <string>Export Installed Package List...</string> ++ </property> ++ <property name="flat"> ++ <bool>true</bool> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QPushButton" name="importInstalledPB"> ++ <property name="text"> ++ <string>Install Packages from List...</string> ++ </property> ++ <property name="flat"> ++ <bool>true</bool> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <spacer name="horizontalSpacer"> ++ <property name="orientation"> ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ <item row="3" column="0"> ++ <widget class="PackageDetails" name="packageDetails" native="true"> ++ <property name="maximumSize"> ++ <size> ++ <width>16777215</width> ++ <height>0</height> ++ </size> ++ </property> ++ </widget> ++ </item> ++ <item row="2" column="1"> ++ <widget class="QTreeView" name="targetView"> ++ <property name="contextMenuPolicy"> ++ <enum>Qt::CustomContextMenu</enum> ++ </property> ++ <property name="editTriggers"> ++ <set>QAbstractItemView::NoEditTriggers</set> ++ </property> ++ <property name="iconSize"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ <property name="verticalScrollMode"> ++ <enum>QAbstractItemView::ScrollPerPixel</enum> ++ </property> ++ <property name="rootIsDecorated"> ++ <bool>false</bool> ++ </property> ++ <property name="uniformRowHeights"> ++ <bool>true</bool> ++ </property> ++ <attribute name="headerVisible"> ++ <bool>false</bool> ++ </attribute> ++ </widget> ++ </item> ++ <item row="0" column="0" colspan="2"> + <widget class="QFrame" name="categoryF"> + <property name="frameShape"> + <enum>QFrame::HLine</enum> +@@ -111,6 +244,9 @@ + <height>16777215</height> + </size> + </property> ++ <property name="layoutDirection"> ++ <enum>Qt::LeftToRight</enum> ++ </property> + <property name="autoRaise"> + <bool>true</bool> + </property> +@@ -122,98 +258,6 @@ + </layout> + </widget> + </item> +- <item row="1" column="0"> +- <widget class="QFrame" name="installedF"> +- <layout class="QHBoxLayout" name="horizontalLayout"> +- <property name="spacing"> +- <number>0</number> +- </property> +- <property name="margin"> +- <number>0</number> +- </property> +- <item> +- <widget class="QPushButton" name="exportInstalledPB"> +- <property name="enabled"> +- <bool>false</bool> +- </property> +- <property name="text"> +- <string>Export Installed Package List...</string> +- </property> +- <property name="flat"> +- <bool>true</bool> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QPushButton" name="importInstalledPB"> +- <property name="text"> +- <string>Install Packages from List...</string> +- </property> +- <property name="flat"> +- <bool>true</bool> +- </property> +- </widget> +- </item> +- <item> +- <spacer name="horizontalSpacer"> +- <property name="orientation"> +- <enum>Qt::Horizontal</enum> +- </property> +- <property name="sizeHint" stdset="0"> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </item> +- </layout> +- </widget> +- </item> +- <item row="2" column="0"> +- <widget class="QTreeView" name="packageView"> +- <property name="contextMenuPolicy"> +- <enum>Qt::CustomContextMenu</enum> +- </property> +- <property name="editTriggers"> +- <set>QAbstractItemView::NoEditTriggers</set> +- </property> +- <property name="alternatingRowColors"> +- <bool>true</bool> +- </property> +- <property name="iconSize"> +- <size> +- <width>40</width> +- <height>24</height> +- </size> +- </property> +- <property name="verticalScrollMode"> +- <enum>QAbstractItemView::ScrollPerPixel</enum> +- </property> +- <property name="rootIsDecorated"> +- <bool>false</bool> +- </property> +- <property name="itemsExpandable"> +- <bool>false</bool> +- </property> +- <property name="expandsOnDoubleClick"> +- <bool>false</bool> +- </property> +- <attribute name="headerVisible"> +- <bool>false</bool> +- </attribute> +- </widget> +- </item> +- <item row="3" column="0"> +- <widget class="PackageDetails" name="packageDetails" native="true"> +- <property name="maximumSize"> +- <size> +- <width>16777215</width> +- <height>0</height> +- </size> +- </property> +- </widget> +- </item> + </layout> + </widget> + <customwidgets> Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-Updater-UpdateKCM.ui ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/files/patch-Updater-UpdateKCM.ui Thu Aug 1 20:14:56 2013 (r255425) @@ -0,0 +1,95 @@ +--- Updater/UpdateKCM.ui 2011-01-03 12:58:18.000000000 -0500 ++++ Updater/UpdateKCM.ui 2013-08-01 02:33:58.000000000 -0400 +@@ -6,8 +6,8 @@ + <rect> + <x>0</x> + <y>0</y> +- <width>454</width> +- <height>449</height> ++ <width>469</width> ++ <height>447</height> + </rect> + </property> + <property name="locale"> +@@ -82,8 +82,8 @@ + <rect> + <x>0</x> + <y>0</y> +- <width>448</width> +- <height>94</height> ++ <width>227</width> ++ <height>96</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout"/> +@@ -97,16 +97,6 @@ + </property> + </widget> + </item> +- <item row="5" column="0" colspan="2"> +- <widget class="KpkUpdateDetails" name="updateDetails" native="true"> +- <property name="maximumSize"> +- <size> +- <width>16777215</width> +- <height>0</height> +- </size> +- </property> +- </widget> +- </item> + <item row="3" column="0"> + <widget class="QPushButton" name="checkUpdatesPB"> + <property name="text"> +@@ -130,6 +120,53 @@ + </property> + </spacer> + </item> ++ <item row="5" column="0" colspan="2"> ++ <widget class="KpkUpdateDetails" name="updateDetails" native="true"> ++ <property name="maximumSize"> ++ <size> ++ <width>16777215</width> ++ <height>0</height> ++ </size> ++ </property> ++ </widget> ++ </item> ++ <item row="4" column="2"> ++ <widget class="QTreeWidget" name="treeWidget"> ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="iconSize"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ <property name="rootIsDecorated"> ++ <bool>false</bool> ++ </property> ++ <attribute name="headerVisible"> ++ <bool>false</bool> ++ </attribute> ++ <column> ++ <property name="text"> ++ <string notr="true">1</string> ++ </property> ++ </column> ++ </widget> ++ </item> ++ <item row="3" column="2"> ++ <widget class="QLabel" name="label"> ++ <property name="text"> ++ <string>Select Target Systems(s)</string> ++ </property> ++ <property name="alignment"> ++ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> ++ </property> ++ </widget> ++ </item> + </layout> + </widget> + <customwidgets> Modified: soc2013/jmuniz/PackageKit-Setter/pk-setter ============================================================================== --- soc2013/jmuniz/PackageKit-Setter/pk-setter Thu Aug 1 19:37:11 2013 (r255424) +++ soc2013/jmuniz/PackageKit-Setter/pk-setter Thu Aug 1 20:14:56 2013 (r255425) @@ -116,7 +116,8 @@ printUsage() { # Print the instructions to the user in an easily readable way echo "pk-setter is used to select the PackageKit backend" - echo "usage: pk-setter list [prefix]" + echo "usage: pk-setter status [prefix]" + echo " pk-setter list [prefix]" echo " pk-setter set [backend] [prefix]" echo "note: prefix is optional and defaults to \"/usr/local/\"," echo " and refers to the installation prefix of PackageKit" @@ -125,13 +126,26 @@ # End printUsage } +# Notify the user of the current default back end, then exit +showStatus() { + if [ "$1" == "status" ]; then + # Load the variables from the configuration file; ignore errors, not a well-formed file + . ${PK_PREFIX}etc/PackageKit/PackageKit.conf 2>/dev/null + # Notify the user of the current default back end by printing the DefaultBackend variable + echo "PackageKit is currently using the $DefaultBackend back end" + fi +# End showStatus +} + # Beginning of execution # Make sure there is an appropriate number of arguments if [ $# -eq 1 -o $# -eq 2 -o $# -eq 3 ]; then - if [ "$1" == "list" -o "$1" == "set" ]; then + if [ "$1" == "list" -o "$1" == "set" -o "$1" == "status" ]; then # Determine if there is a user defined prefix, save the prefix for later setPrefix $* + # List the current default back end if that is the action to do + showStatus $* # If the user wants a list of backends then print it listBackends $* # Change the current backend if the user wants to Modified: soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/Makefile ============================================================================== --- soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/Makefile Thu Aug 1 19:37:11 2013 (r255424) +++ soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/Makefile Thu Aug 1 20:14:56 2013 (r255425) @@ -11,6 +11,8 @@ COMMENT= Qt4 bindings to packagekit +LICENSE= GPLv2 + MASTERDIR= ${.CURDIR}/../../ports-mgmt/packagekit BUILD_WRKSRC= ${WRKSRC}/lib/packagekit-qt INSTALL_WRKSRC= ${WRKSRC}/lib/packagekit-qt Modified: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile ============================================================================== --- soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile Thu Aug 1 19:37:11 2013 (r255424) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile Thu Aug 1 20:14:56 2013 (r255425) @@ -11,14 +11,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= DBUS packaging abstraction layer +LICENSE= GPLv2 + BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ ${LOCALBASE}/bin/sgmlspl:${PORTSDIR}/textproc/p5-SGMLSpm/pkg-plist LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ - ck-connector:${PORTSDIR}/sysutils/consolekit \ - libffi:${PORTSDIR}/devel/libffi \ - Expat:${PORTSDIR}/textproc/p5-XML-Parser + ck-connector:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info @@ -42,13 +42,10 @@ MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" -MAKE_JOBS_UNSAFE=yes - - -.if !defined(${SLAVEPORT}) +.if !defined(SLAVEPORT) OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BAKCEND= PORTS PKGNG DUMMY +OPTIONS_SINGLE_BACKEND= PORTS PKGNG DUMMY OPTIONS_DEFAULT=PORTS PORTS_DESC= Ruby back end for traditional or new binary packages PKGNG_DESC= C back end for PGN Next Generation, specifically @@ -96,7 +93,7 @@ PLIST_SUB+= GTK="@comment " CONFIGURE_ARGS+=--disable-qt -.elif defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4" +.elif defined(SLAVEPORT) && ${SLAVEPORT}=="qt4" LIB_DEPENDS+= packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit CONFIGURE_ARGS+=--enable-qt LIB_DEPENDS+= cppunit-1.12:${PORTSDIR}/devel/cppunit @@ -104,8 +101,8 @@ #.include "${PORTSDIR}/Mk/bsd.qt.mk" .endif -post-fetch: -.if defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4" +post-extract: +.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4" (cd ${WRKSRC}/lib/packagekit-qt/src && \ moc-qt4 ./client.h -o ./client.moc && \ moc-qt4 ./clientprivate.h -o ./clientprivate.moc && \ @@ -127,7 +124,7 @@ '/xsltproc/s|.xsl [$$]? &> /dev|.xsl $$? > /dev|g' post-install: -.if !defined(${SLAVEPORT}) +.if !defined(SLAVEPORT) @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ ${PREFIX}/share/PackageKit/transactions.db @-update-mime-database ${PREFIX}/share/mime > /dev/null Modified: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile ============================================================================== --- soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile Thu Aug 1 19:37:11 2013 (r255424) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile Thu Aug 1 20:14:56 2013 (r255425) @@ -1,69 +1,78 @@ # Created by: Anders F Bjorklund <afb@users.sourceforge.net> +# $FreeBSD: ports-mgmt/packagekit/Makefile 316683 2013-04-27 18:25:24Z mva $ +# $MCom: ports/trunk/ports-mgmt/packagekit/Makefile 17268 2013-04-01 05:13:11Z marcus $ -# $FreeBSD$ - -PORTNAME= PackageKit +PORTNAME= packagekit PORTVERSION= 0.8.9 -#PORTREVISION= 0 CATEGORIES= ports-mgmt sysutils MASTER_SITES= http://www.packagekit.org/releases/ -EXTRACT_SUFX= .tar.xz +DISTNAME= PackageKit-${PORTVERSION} -MAINTAINER= jmuniz@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= DBUS packaging abstraction layer -BUILD_DEPENDS= intltool>=0.35.0:{PORTSDIR}/textproc/intltool \ - glib>=2.14.0:{PORTSDIR}/devel/glib \ - dbus>=1.1.3:{PORTSDIR}/devel/dbus \ - dbus-glib>=0.74.0:{PORTSDIR}/devel/dbus-glib \ - polkit>=0.9:{PORTSDIR}/sysutils/polkit +LICENSE= GPLv2 + +BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \ + g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ - dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ - ck-connector:${PORTSDIR}/sysutils/consolekit -RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ - ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ - ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof USE_GMAKE= yes -USES= gettext -USE_PYTHON_BUILD= 2.5+ +USE_XZ= yes +USES= gettext iconv pathfix shared-mime-info +USE_GNOME= glib20 intltool +USE_LDCONFIG= yes +USE_SQLITE= 3 +USE_PYTHON= -2.7 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+= --with-security-framework=polkit \ - --localstatedir=/var \ - --disable-maintainer-mode \ - --disable-gtk-doc \ - --disable-systemd \ - --disable-bash-completion \ - --enable-dummy \ - --with-default-backend=ports \ - --disable-networkmanager \ - --disable-connman \ - --disable-browser-plugin \ - --disable-gstreamer-plugin \ - --disable-man-pages \ - --disable-nls - -MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +CONFIGURE_ARGS+=--with-security-framework=polkit \ + --localstatedir=/var \ + --disable-gtk-doc \ + --disable-browser-plugin \ + --disable-gstreamer-plugin \ + --disable-networkmanager \ + --disable-systemd \ + --disable-bash-completion \ + --disable-connman \ + +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} || defined(PACKAGE_BUILDING) +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +USE_GNOME+= libxslt:build +MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 +.else +CONFIGURE_ARGS+=--disable-man-pages +.endif -post-install: -.if !defined(${SLAVEPORT}) - @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ - ${PREFIX}/share/PackageKit/transactions.db - @-update-mime-database ${PREFIX}/share/mime > /dev/null +.if ${PORT_OPTIONS:MPORTS_BACKEND} +LIB_DEPENDS+= pkg:${PORTSDIR}/ports-mgmt/pkg +CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports +PLIST_SUB+= PORTS="" +.else +CONFIGURE_ARGS+=--disable-ports --with-default-backend=dummy +PLIST_SUB+= PORTS="@comment " .endif -.include <bsd.port.mk> +# gtk+3 module +CONFIGURE_ARGS+=--disable-gtk-module +PLIST_SUB+= GTK="@comment " + +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/src/plugins/pk-lsof.c + (mkdir ${WRKSRC}/backends/ports/helpers && \ + cp ${WRKSRC}/../../files/default-dialog ${WRKDIR}/backends/ports/helpers/ && \ + cp ${WRKSRC}/../../files/Makefile.am ${WRKDIR}/backends/ports/helpers) -#change default backend -#provide option to select a single or multiple backends -#add pk_backend_select script which takes one argument, the name of the backend, and help; responds to bad names or syntax -#patch in pk_backend_select and make sure it is in pkg-plist -#add man page support and option -#preserve modified configuration files - -# --enable-ports \ -# --with-default-backend=ports \ -# --localstatedir=/var +post-install: + @${MKDIR} /var/cache/PackageKit/downloads +.include <bsd.port.mk> Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/Makefile.am Thu Aug 1 20:14:56 2013 (r255425) @@ -0,0 +1,17 @@ + +helperdir = $(datadir)/PackageKit/helpers/ports + +NULL = + +dist_helper_DATA = \ + default-dialog \ + $(NULL) + +install-data-hook: + chmod a+rx $(DESTDIR)$(helperdir)/default-dialog + +clean-local : + rm -f *~ + + +-include $(top_srcdir)/git.mk Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/default-dialog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/default-dialog Thu Aug 1 20:14:56 2013 (r255425) @@ -0,0 +1,23 @@ +#!/usr/local/bin/ruby + +# This goes instead of dialog(1), it will +# just return the default options selection +# +# Ex: make config DIALOG=default-dialog + +box = ARGV[0] +exit(-1) unless box == "--checklist" + +text, height, width, list_height = ARGV[1, 4] + +i = 5 +while i < ARGV.count do + tag, item, status = ARGV[i, 3] + if status == "on" + $stderr.puts tag + end + i += 3 +end + +# "OK" +exit(0) Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-backends-ports-ruby__packagekit_backend.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-backends-ports-ruby__packagekit_backend.rb Thu Aug 1 20:14:56 2013 (r255425) @@ -0,0 +1,158 @@ +--- backends/ports/ruby_packagekit/backend.rb 2013-04-11 07:58:36.000000000 -0400 ++++ backends/ports/ruby_packagekit/backend.rb 2013-07-30 10:11:40.000000000 -0400 +@@ -14,15 +14,44 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-# Copyright (C) 2009 Anders F Bjorklund <afb@users.sourceforge.net> ++# Copyright (C) 2009, 2013 Anders F Bjorklund <afb@users.sourceforge.net> + # + # This file contain the base classes to implement a PackageKit ruby backend + # + + PACKAGE_IDS_DELIM = '&' + FILENAME_DELIM = '|' ++FLAGS_DELIM = ';' + + class PackageKitBaseBackend ++ @locked = false ++ ++ def do_lock() ++ # Generic locking, override and extend in subclass ++ @locked = true ++ end ++ ++ def un_lock() ++ # Generic locking, override and extend in subclass ++ @locked = false ++ end ++ ++ def locked? ++ return @locked ++ end ++ ++ def error(err, description, exit=true) ++ if exit and locked?: ++ un_lock() ++ end ++ error_description(err, description) ++ if exit ++ # Paradoxically, we don't want to print "finished" to stdout here. ++ # ++ # Leave PackageKit to clean up for us in this case. ++ exit(254) ++ end ++ end + + def dispatch_command(cmd, args) + case +@@ -32,40 +61,40 @@ + download_packages(directory, package_ids) + finished() + when cmd == 'get-packages' +- filters = args[0] ++ filters = args[0].split(FLAGS_DELIM) + get_packages(filters) + finished() + when cmd == 'get-repo-list' +- filters = args[0] ++ filters = args[0].split(FLAGS_DELIM) + get_repo_list(filters) + finished() + when cmd == 'resolve' +- filters = args[0] ++ filters = args[0].split(FLAGS_DELIM) + package_ids = args[1].split(PACKAGE_IDS_DELIM) + resolve(filters, package_ids) + finished() + when cmd == 'search-details' +- options = args[0] +- searchterms = args[1] ++ options = args[0].split(FLAGS_DELIM) ++ searchterms = args[1].split(PACKAGE_IDS_DELIM) + search_details(options, searchterms) + finished() + when cmd == 'search-file' +- options = args[0] +- searchterms = args[1] ++ options = args[0].split(FLAGS_DELIM) ++ searchterms = args[1].split(PACKAGE_IDS_DELIM) + search_file(options, searchterms) + finished() + when cmd == 'search-group' +- options = args[0] +- searchterms = args[1] ++ options = args[0].split(FLAGS_DELIM) ++ searchterms = args[1].split(PACKAGE_IDS_DELIM) + search_group(options, searchterms) + finished() + when cmd == 'search-name' +- options = args[0] +- searchterms = args[1] ++ options = args[0].split(FLAGS_DELIM) ++ searchterms = args[1].split(PACKAGE_IDS_DELIM) + search_name(options, searchterms) + finished() + when cmd == 'get-depends' +- filters = args[0] ++ filters = args[0].split(FLAGS_DELIM) + package_ids = args[1].split(PACKAGE_IDS_DELIM) + recursive = to_b(args[2]) + get_depends(filters, package_ids, recursive) +@@ -79,7 +108,7 @@ + get_files(package_ids) + finished() + when cmd == 'get-requires' +- filters = args[0] ++ filters = args[0].split(FLAGS_DELIM) + package_ids = args[1].split(PACKAGE_IDS_DELIM) + recursive = to_b(args[2]) + get_requires(filters, package_ids, recursive) +@@ -89,32 +118,34 @@ + get_update_detail(package_ids) + finished() + when cmd == 'get-updates' +- filters = args[0] ++ filters = args[0].split(FLAGS_DELIM) + get_updates(filters) + finished() + when cmd == 'install-files' +- only_trusted = to_b(args[0]) ++ transaction_flags = args[0].split(FLAGS_DELIM) + files_to_inst = args[1].split(FILENAME_DELIM) +- install_files(only_trusted, files_to_inst) ++ install_files(transaction_flags, files_to_inst) + finished() + when cmd == 'install-packages' +- only_trusted = to_b(args[0]) ++ transaction_flags = args[0].split(FLAGS_DELIM) + package_ids = args[1].split(PACKAGE_IDS_DELIM) +- install_packages(only_trusted, package_ids) ++ install_packages(transaction_flags, package_ids) ++ finished() ++ when cmd == 'update-packages' ++ transaction_flags = args[0].split(FLAGS_DELIM) ++ package_ids = args[1].split(PACKAGE_IDS_DELIM) ++ update_packages(transaction_flags, package_ids) + finished() + when cmd == 'refresh-cache' + force = to_b(args[0]) + refresh_cache(force) + finished() + when cmd == 'remove-packages' +- allowdeps = to_b(args[0]) +- autoremove = to_b(args[1]) +- package_ids = args[2].split(PACKAGE_IDS_DELIM) +- remove_packages(allowdeps, autoremove, package_ids) +- finished() +- when cmd == 'update-system' +- only_trusted = to_b(args[0]) +- update_system(only_trusted) ++ transaction_flags = args[0].split(FLAGS_DELIM) ++ package_ids = args[1].split(PACKAGE_IDS_DELIM) ++ allowdeps = to_b(args[2]) ++ autoremove = to_b(args[3]) ++ remove_packages(transaction_flags, package_ids, allowdeps, autoremove) + finished() + else + errmsg = "command '#{cmd}' is not known" Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-backends-ports-ruby__packagekit_prints.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/files/patch-backends-ports-ruby__packagekit_prints.rb Thu Aug 1 20:14:56 2013 (r255425) @@ -0,0 +1,99 @@ +--- backends/ports/ruby_packagekit/prints.rb 2010-02-11 06:13:57.000000000 -0500 ++++ backends/ports/ruby_packagekit/prints.rb 2013-07-30 10:11:40.000000000 -0400 +@@ -8,6 +8,16 @@ + $stdout.flush + end + ++def media_change_required(mtype, id, text) ++ $stdout.printf "media-change-required\t%s\t%s\t%s\n", mtype, id, text ++ $stdout.flush ++end ++ ++def distro_upgrade(repoid, dtype, name, summary) ++ $stdout.printf "distro-upgrade\t%s\t%s\t%s\n", dtype, name, summary ++ $stdout.flush ++end ++ + def repo_detail(repoid, name, state) + $stdout.printf "repo-detail\t%s\t%s\t%s\n", repoid, name, state + $stdout.flush +@@ -18,6 +28,11 @@ + $stdout.flush + end + ++def require_restart(restart_type, details) ++ $stdout.printf "requirerestart\t%s\t%s\n", restart_type, details ++ $stdout.flush ++end ++ + def details(package_id, package_license, group, desc, url, bytes) + $stdout.printf "details\t%s\t%s\t%s\t%s\t%s\t%d\n", package_id, package_license, group, desc, url, bytes + $stdout.flush +@@ -28,23 +43,44 @@ + $stdout.flush + end + ++def category(parent_id, cat_id, name, summary, icon) ++ $stdout.printf "category\t%s\t%s\t%s\t%s\t%s\n", parent_id, cat_id, name, summary, icon ++ $stdout.flush ++end ++ + def status(state) + $stdout.printf "status\t%s\n", state + $stdout.flush + end + +-def error(err, description, exit=true) ++def data(data) ++ $stdout.printf "data\t%s\n", data ++ $stdout.flush ++end ++ ++def allow_cancel(allow) ++ $stdout.printf "allow-cancel\t%s\n", allow ++ $stdout.flush ++end ++ ++def repo_signature_required(package_id, repo_name, key_url, key_userid, key_id, key_fingerprint, key_timestamp, sig_type) ++ $stdout.printf "repo-signature-required\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", package_id, repo_name, key_url, key_userid, key_id, key_fingerprint, key_timestamp, sig_type ++ $stdout.flush ++end ++ ++def eula_required(eula_id, package_id, vendor_name, license_agreement) ++ $stdout.printf "eula-required\t%s\t%s\t%s\t%s\n", eula_id, package_id, vendor_name, license_agreement ++ $stdout.flush ++end ++ ++def error_description(err, description) + $stdout.printf "error\t%s\t%s\n", err, description + $stdout.flush +- if exit +- finished +- exit(1) +- end + end + + def percentage(percent=nil) + if percent==nil +- $stdout.printf "finished\n" ++ $stdout.printf "no-percentage-updates\n" + else percent == 0 or percent > $percentage_old + $stdout.printf "percentage\t%i\n", percent + $percentage_old = percent +@@ -52,6 +88,16 @@ + $stdout.flush + end + ++def item_progress(package_id, status, percent=nil) ++ $stdout.printf "item-progress\t%s\t%s\t%i\n", package_id, status, percent ++ $stdout.flush ++end ++ ++def speed(bps=0) ++ $stdout.printf "speed\t%i\n", bps *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308012014.r71KEv04099717>