From f7eba937a33bb466978158fc1f26b4be63926803 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 30 Nov 2014 12:31:05 +0100 Subject: [PATCH] Misc tweaks to random gnome packages. --- srcpkgs/eog/template | 6 +++--- srcpkgs/file-roller/template | 5 ++--- .../0001-Add-Arch-Linux-PAM-config-files.patch | 5 +++-- srcpkgs/gdm/template | 2 +- srcpkgs/gedit/template | 6 +++--- srcpkgs/gnome-shell-extensions/template | 2 +- srcpkgs/gnome-sound-recorder/template | 3 +-- srcpkgs/gucharmap/template | 13 +++---------- srcpkgs/seahorse/template | 4 ++-- srcpkgs/totem/template | 2 +- srcpkgs/yelp/template | 4 ++-- 11 files changed, 22 insertions(+), 30 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 24f33aefba..8358f8def5 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -4,10 +4,10 @@ version=3.14.3 revision=1 lib32disabled=yes build_style=gnu-configure -hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" +hostmakedepends="pkg-config intltool gnome-doc-utils itstool gobject-introspection" makedepends=" - gnome-desktop-devel>=3.12 libpeas-devel>=1.9 lcms2-devel exempi-devel - libexif-devel librsvg-devel>=2.39 gnome-icon-theme shared-mime-info" + gnome-desktop-devel>=3.14 libpeas-devel>=1.9 lcms2-devel exempi-devel + libexif-devel librsvg-devel gnome-icon-theme shared-mime-info" depends="hicolor-icon-theme desktop-file-utils gnome-icon-theme shared-mime-info" short_desc="Eye of GNOME graphics viewer program" maintainer="Juan RP " diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index a224c13db8..b3d54562bf 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -4,9 +4,8 @@ version=3.14.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-magic --disable-static" -hostmakedepends="which pkg-config intltool gnome-doc-utils itstool - glib-devel" -makedepends="nautilus-devel>=3.12 json-glib-devel>=1.0 libnotify-devel libarchive-devel>=3.1.2" +hostmakedepends="pkg-config intltool gnome-doc-utils itstool glib-devel" +makedepends="nautilus-devel>=3.14 json-glib-devel>=1.0 libnotify-devel libarchive-devel>=3.1.2" depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME Front-end to archiving programs like tar and zip" maintainer="Juan RP " diff --git a/srcpkgs/gdm/patches/0001-Add-Arch-Linux-PAM-config-files.patch b/srcpkgs/gdm/patches/0001-Add-Arch-Linux-PAM-config-files.patch index c3a43582af..63318e43b9 100644 --- a/srcpkgs/gdm/patches/0001-Add-Arch-Linux-PAM-config-files.patch +++ b/srcpkgs/gdm/patches/0001-Add-Arch-Linux-PAM-config-files.patch @@ -127,7 +127,7 @@ new file mode 100644 index 0000000..618a7d3 --- /dev/null +++ b/data/pam-arch/gdm-launch-environment.pam -@@ -0,0 +1,10 @@ +@@ -0,0 +1,11 @@ +auth required pam_env.so +auth optional pam_permit.so + @@ -136,7 +136,8 @@ index 0000000..618a7d3 +password required pam_deny.so + +session optional pam_keyinit.so force revoke -+session required pam_systemd.so ++-session optional pam_systemd.so ++-session optional pam_ck_connector_so nox11 +session optional pam_permit.so diff --git a/data/pam-arch/gdm-password.pam b/data/pam-arch/gdm-password.pam new file mode 100644 diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index f3cc5c900f..4d9b1615d6 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -45,7 +45,7 @@ if [ "$build_option_systemd" ]; then configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system" makedepends+=" systemd-devel" else - configure_args+=" --without-systemd --disable-systemd-journal --with-initial-vt=7" + configure_args+=" --with-console-kit --without-systemd --disable-systemd-journal --with-initial-vt=7" fi pre_configure() { diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index a52e6768cb..475e7c7108 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -8,8 +8,8 @@ configure_args="--disable-schemas-compile --enable-zeitgeist hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends=" - gtksourceview-devel>=3.12 libpeas-devel>=1.9 enchant-devel python-gobject-devel - gsettings-desktop-schemas-devel>=3.12 zeitgeist-devel iso-codes" + gtksourceview-devel>=3.14 libpeas-devel>=1.9 enchant-devel python-gobject-devel>=3.14 + gsettings-desktop-schemas-devel>=3.14 zeitgeist-devel iso-codes" depends="zeitgeist hicolor-icon-theme desktop-file-utils iso-codes" short_desc="A text editor for GNOME" maintainer="Juan RP " @@ -19,7 +19,7 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=84ba2d7ef28d9039a9f8077d48c288ee26e51ed7cc351d964b05ce6397a908d8 gedit-devel_package() { - depends="gtksourceview-devel>=3.12 libpeas-devel>=1.9" + depends="gtksourceview-devel>=3.14 libpeas-devel>=1.9" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 907d1ce551..7955d1edf1 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -7,7 +7,7 @@ build_style=gnu-configure configure_args="--enable-extensions=all" hostmakedepends="pkg-config intltool" makedepends="unzip libglib-devel libgtop-devel" -depends="gnome-shell>=${version} nautilus>=3.12 unzip" +depends="gnome-shell>=${version} nautilus>=3.14 unzip" short_desc="Extensions for GNOME shell, including classic mode" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell/Extensions" diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template index 0fa4100918..994033c7a2 100644 --- a/srcpkgs/gnome-sound-recorder/template +++ b/srcpkgs/gnome-sound-recorder/template @@ -5,8 +5,7 @@ revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--disable-schemas-compile" -hostmakedepends="which pkg-config intltool itstool gobject-introspection - glib-devel" +hostmakedepends="pkg-config intltool itstool glib-devel gobject-introspection" makedepends="gtk+3-devel gsettings-desktop-schemas-devel>=3.14 gjs-devel>=1.40 gst-plugins-base1" depends="desktop-file-utils gjs>=1.40 gsettings-desktop-schemas>=3.14 gst-plugins-base1" short_desc="GNOME sound recorder application" diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template index 2afac26a49..d959c24045 100644 --- a/srcpkgs/gucharmap/template +++ b/srcpkgs/gucharmap/template @@ -3,9 +3,9 @@ pkgname=gucharmap version=3.14.2 revision=1 build_style=gnu-configure -configure_args="--disable-schemas-compile" -hostmakedepends="which pkg-config intltool gnome-doc-utils itstool glib-devel - desktop-file-utils appdata-tools" +configure_args="--disable-schemas-compile $(vopt_enable gir introspection)" +hostmakedepends="pkg-config intltool gnome-doc-utils itstool glib-devel + desktop-file-utils appdata-tools $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel hicolor-icon-theme desktop-file-utils" depends="hicolor-icon-theme desktop-file-utils" short_desc="GNOME Unicode Charmap" @@ -23,13 +23,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -if [ "$build_option_gir" ]; then - configure_args+=" --enable-introspection" - makedepends+=" gobject-introspection" -else - configure_args+=" --disable-introspection" -fi - gucharmap-devel_package() { depends="gtk+3-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template index d4d4374967..8356851d47 100644 --- a/srcpkgs/seahorse/template +++ b/srcpkgs/seahorse/template @@ -5,10 +5,10 @@ revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-ldap --enable-hkp" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool" -makedepends="gtk+3-devel gcr-devel>=3.12 libsecret-devel vala-devel +makedepends="gtk+3-devel gcr-devel>=3.14 libsecret-devel vala-devel gpgme-devel libldap-devel libsoup-devel avahi-glib-libs-devel openssh>=6.1p1" -depends="hicolor-icon-theme desktop-file-utils gcr>=3.12 openssh>=6.1p1" +depends="hicolor-icon-theme desktop-file-utils gcr>=3.14 openssh>=6.1p1" short_desc="GNOME application for managing encryption keys" maintainer="Juan RP " homepage="http://projects.gnome.org/seahorse/" diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index b3dd6e6802..e8b9137251 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -22,7 +22,7 @@ makedepends=" evolution-data-server-devel>=3.12 dbus-glib-devel zeitgeist-devel>=0.9.14 clutter-gst-devel>=2.0.10 clutter-gtk-devel>=1.5.2 libSM-devel libpeas-devel>=1.9 libXtst-devel grilo-devel>=0.2.7 libepc-devel vala-devel>=0.24 - gst-plugins-bad1-devel>=1:1.2.4 gsettings-desktop-schemas-devel>=3.12 + gst-plugins-bad1-devel>=1:1.2.4 gsettings-desktop-schemas-devel>=3.14 nautilus-devel>=3.14 gst-plugins-ugly1>=1:1.2.4 gst-plugins-good1>=1:1.2.4 gnome-desktop-devel>=3.14" depends="grilo-plugins>=0.2.12 hicolor-icon-theme desktop-file-utils diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index 965834414a..15d4c88a0e 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -7,9 +7,9 @@ configure_args="--disable-schemas-compile --disable-static" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="bzip2-devel liblzma-devel sqlite-devel libgpg-error-devel libgcrypt-devel libxslt-devel libsoup-devel>=2.46 webkitgtk-devel>=2.4 - yelp-xsl>=3.12" + yelp-xsl>=3.14" depends="libsoup>=2.46 webkitgtk>=2.4 dconf>=0.20 hicolor-icon-theme - desktop-file-utils yelp-xsl>=3.12" + desktop-file-utils yelp-xsl>=3.14" short_desc="Help browser for GNOME desktop" maintainer="Juan RP " homepage="http://www.gnome.org"