diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
commit | 61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch) | |
tree | 6b8b6fb14ede5aae651e92f593252dba143cee74 /community/gnome-packagekit | |
parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
Diffstat (limited to 'community/gnome-packagekit')
-rw-r--r-- | community/gnome-packagekit/arch.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/community/gnome-packagekit/arch.patch b/community/gnome-packagekit/arch.patch deleted file mode 100644 index bf4cd91c4..000000000 --- a/community/gnome-packagekit/arch.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nru a/data/gpk-install-local-file.desktop.in b/data/gpk-install-local-file.desktop.in ---- a/data/gpk-install-local-file.desktop.in 2011-03-23 23:15:41.000000000 +1300 -+++ b/data/gpk-install-local-file.desktop.in 2011-04-10 01:04:51.606666671 +1200 -@@ -8,5 +8,5 @@ - Icon=system-software-install - StartupNotify=true - NoDisplay=true --MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-servicepack;application/x-deb; -+MimeType=application/x-xz-compressed-tar;application/x-servicepack; - -diff -Nru a/data/org.gnome.packagekit.gschema.xml b/data/org.gnome.packagekit.gschema.xml ---- a/data/org.gnome.packagekit.gschema.xml 2011-03-28 21:49:37.000000000 +1300 -+++ b/data/org.gnome.packagekit.gschema.xml 2011-04-10 02:37:29.433333340 +1200 -@@ -104,14 +104,4 @@ - <description>When displaying UI from a session DBus request, force these options to be turned on.</description> - </key> - </schema> -- <schema id="org.gnome.settings-daemon" path="/org/gnome/settings-daemon/"> -- <child name="gtk-modules" schema="gnome-settings-daemon.gtk-modules"/> -- </schema> -- <schema id="gnome-settings-daemon.gtk-modules" path="/org/gnome/settings-daemon/gtk-modules/"> -- <key name="pk-gtk-module" type="b"> -- <default>true</default> -- <summary>GTK+ module for font installation</summary> -- <description>This key determines if applications should be able to prompt for fonts.</description> -- </key> -- </schema> - </schemalist> |