diff --git a/srcpkgs/gdm/gdm-devel.template b/srcpkgs/gdm/gdm-devel.template index ca281300af..6459c09341 100644 --- a/srcpkgs/gdm/gdm-devel.template +++ b/srcpkgs/gdm/gdm-devel.template @@ -5,20 +5,9 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pam-devel -Add_dependency run nss-devel -Add_dependency run accountsservice-devel -Add_dependency run gtk+3-devel -Add_dependency run GConf-devel -Add_dependency run upower-devel -Add_dependency run libcanberra-devel -Add_dependency run libXrandr-devel -Add_dependency run libxklavier-devel -Add_dependency run at-spi2-core-devel -Add_dependency run gdm +noarch=yes -do_install() -{ +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/gir-1.0 usr/share diff --git a/srcpkgs/gdm/gdm.rshlibs b/srcpkgs/gdm/gdm.rshlibs index 04339efdbc..15815752c5 100644 --- a/srcpkgs/gdm/gdm.rshlibs +++ b/srcpkgs/gdm/gdm.rshlibs @@ -10,7 +10,6 @@ libgobject-2.0.so.0 libXau.so.6 libpam.so.0 libaccountsservice.so.0 -libgthread-2.0.so.0 libnss3.so libplc4.so libnspr4.so @@ -20,17 +19,15 @@ libgio-2.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo.so.2 libpango-1.0.so.0 -libgconf-2.so.4 libm.so.6 libupower-glib.so.1 libXdmcp.so.6 libatk-1.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libcairo-gobject.so.2 -libfreetype.so.6 -libgmodule-2.0.so.0 librt.so.1 libfontconfig.so.1 libcanberra-gtk3.so.0 libcanberra.so.0 +libsystemd-login.so.0 +libsystemd-daemon.so.0 diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 539bc22857..04616dac9d 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,18 +1,16 @@ # Template file for 'gdm' pkgname=gdm -version=3.2.1.1 -revision=6 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.3.92.1 +distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--disable-schemas-install --disable-scrollkeeper ---with-gconf-schema-file-dir=/usr/share/gconf/schemas +configure_args="--disable-schemas-compile --disable-scrollkeeper --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers --disable-static" short_desc="GNOME Display Manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -checksum=85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd +checksum=957456fa8f3c5243c45d5f0be89931a515b79efd881a0423e8552a8f46c5379c long_desc=" GDM is the GNOME Display Manager, it is the little proggie that runs in the background, runs your X sessions, presents you with a login box @@ -45,7 +43,6 @@ make_dirs=" " subpackages="gdm-devel" -gconf_schemas="gdm.schemas" gtk_iconcache_dirs="/usr/share/icons/hicolor" # Create the 'gdm' system user/group. @@ -62,12 +59,12 @@ Add_dependency build pam-devel Add_dependency build nss-devel Add_dependency build accountsservice-devel Add_dependency build gtk+3-devel -Add_dependency build GConf-devel Add_dependency build upower-devel Add_dependency build libcanberra-devel Add_dependency build libXrandr-devel Add_dependency build libxklavier-devel Add_dependency build at-spi2-core-devel +Add_dependency build systemd-devel Add_dependency full xrdb Add_dependency full dconf @@ -79,8 +76,7 @@ Add_dependency full metacity Add_dependency full gnome-session Add_dependency full gnome-settings-daemon -post_install() -{ +post_install() { # Use our own pam files. rm -f ${DESTDIR}/etc/pam.d/* for f in gdm gdm-autologin gdm-fingerprint gdm-password gdm-smartcard \ @@ -90,11 +86,6 @@ post_install() # Install systemd service. vinstall ${FILESDIR}/gdm.service 644 lib/systemd/system - # Install GConf schema. - mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ - --domain ${pkgname} ${wrksrc}/*.schemas - chmod 1770 ${DESTDIR}/var/log/gdm chmod 700 ${DESTDIR}/var/lib/gdm/.config/dconf }