[arch-commits] Commit in (11 files)
Eli Schwartz
eschwartz at archlinux.org
Thu Apr 19 06:05:22 UTC 2018
Date: Thursday, April 19, 2018 @ 06:05:20
Author: eschwartz
Revision: 316967
cinnamon*: general cleanup/style improvements
Sort depends.
Add maintainer lines.
Prefer patches over sed in a few places.
Modified:
cinnamon-control-center/trunk/PKGBUILD
cinnamon-desktop/trunk/PKGBUILD (contents, properties)
cinnamon-menus/trunk/PKGBUILD (contents, properties)
cinnamon-screensaver/trunk/PKGBUILD
cinnamon-session/trunk/PKGBUILD (contents, properties)
cinnamon-settings-daemon/trunk/PKGBUILD
cinnamon-translations/trunk/PKGBUILD (contents, properties)
cinnamon/trunk/PKGBUILD
cjs/trunk/PKGBUILD (contents, properties)
muffin/trunk/PKGBUILD
nemo/trunk/PKGBUILD
-----------------------------------------+
cinnamon-control-center/trunk/PKGBUILD | 53 +++++++++-------
cinnamon-desktop/trunk/PKGBUILD | 48 +++++++++------
cinnamon-menus/trunk/PKGBUILD | 33 ++++++----
cinnamon-screensaver/trunk/PKGBUILD | 37 +++++++----
cinnamon-session/trunk/PKGBUILD | 50 ++++++++-------
cinnamon-settings-daemon/trunk/PKGBUILD | 54 +++++++++--------
cinnamon-translations/trunk/PKGBUILD | 4 -
cinnamon/trunk/PKGBUILD | 95 +++++++++++++++---------------
cjs/trunk/PKGBUILD | 46 ++++++++------
muffin/trunk/PKGBUILD | 49 ++++++++-------
nemo/trunk/PKGBUILD | 61 +++++++++----------
11 files changed, 300 insertions(+), 230 deletions(-)
Modified: cinnamon/trunk/PKGBUILD
===================================================================
--- cinnamon/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
# Contributor: M0Rf30
# Contributor: unifiedlinux
# Contributor: CReimer
@@ -11,80 +12,82 @@
arch=('x86_64')
url="https://github.com/linuxmint/Cinnamon"
license=('GPL2')
-depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
- 'cjs' 'clutter-gtk' 'gnome-backgrounds'
- 'gnome-themes-standard' 'gstreamer' 'libkeybinder3' 'librsvg'
- 'muffin' 'python2-cairo' 'python-dbus' 'python2-dbus' 'python2-pillow'
- 'python2-pam' 'python2-pexpect' 'python2-pyinotify'
- 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
- 'network-manager-applet' 'nemo' 'polkit-gnome' 'xapps' 'python2-gobject')
-makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
+depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver'
+ 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'clutter-gtk' 'gnome-backgrounds'
+ 'gnome-themes-standard' 'gstreamer' 'libgnomekbd' 'libkeybinder3' 'librsvg'
+ 'muffin' 'network-manager-applet' 'nemo' 'python2-cairo' 'python-dbus' 'python2-dbus'
+ 'polkit-gnome' 'python2-gobject' 'python2-pam' 'python2-pexpect' 'python2-pillow'
+ 'python2-pyinotify' 'xapps')
optdepends=('blueberry: Bluetooth support'
'cinnamon-translations: i18n'
'gnome-panel: fallback mode'
'metacity: fallback mode'
'system-config-printer: printer settings')
+makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+ "${url}/commit/2dc04b8a26fa7a672c579ed62a70dca6c6e4b295.patch"
+ "0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch::${url}/pull/7382.patch"
"set_wheel.patch"
"default-theme.patch")
sha512sums=('446e0bbf1fcda7e193735115b4c0396e24428e102b0e74d4b1e150c279d97bbf45961fe57ac08e5828f957c390c39bf385bf29ae7549f5fead2bc59389e64add'
+ '9cc53e23f7a11b97cb3e03802fdece1dda77a1f809e751dd513e61436e656c1083c63304334b3b7f5c1615752f3d630e5d40b7aa7360710e86778625f480f5e6'
+ 'a0a9f4d25053fe96f9b1495394adb829252367099931d3f0e9bdfd2371093b4e86ff13fc945301b3a59691bbb7ee14da89e68c4ef3d8e7a1b5ec6bdedccb9137'
'55929747b9cc1bc8893717c9fef257f8f2d560dc56849f1c74f88ed636b6f9f9997f6c4713768793b115e93482543a330b70eba672d696ea8456741ed2c71237'
'3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
prepare() {
- cd ${srcdir}/Cinnamon*
+ cd "${srcdir}"/Cinnamon-${pkgver}
- # Python2 fix
- sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/share/cinnamon/cinnamon-settings/bin/TreeListWidgets.py
+ # GNOME Terminal desktop file was renamed in GNOME 3.20
+ patch -p1 < ../2dc04b8a26fa7a672c579ed62a70dca6c6e4b295.patch
- # Use wheel group instread of sudo (taken from Fedora)
- patch -Np1 -i ../set_wheel.patch
+ # Check for the cc-panel module path, not for the irrelevant binary
+ patch -p1 < ../0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch
- # Set default theme to 'cinnamon'
- patch -Np1 -i ../default-theme.patch
+ # Python2 fix
+ sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/share/cinnamon/cinnamon-settings/bin/TreeListWidgets.py
- # Add polkit agent to required components
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
- files/usr/share/cinnamon-session/sessions/cinnamon*.session
+ # Use wheel group instread of sudo (taken from Fedora)
+ patch -Np1 -i ../set_wheel.patch
- # Check for the cc-panel path, not for the unneeded binary
- sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' \
- files/usr/bin/cinnamon-settings
+ # Set default theme to 'cinnamon'
+ patch -Np1 -i ../default-theme.patch
- # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
- sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
- files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+ # Replace MintInstall with GNOME Software
+ sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in
- # GNOME Terminal desktop file was renamed in GNOME 3.20
- sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/' data/org.cinnamon.gschema.xml.in \
- files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/settings-schema.json
+ # Add polkit agent to required components
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session
- # Replace MintInstall with GNOME Software
- sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in
+ # https://github.com/linuxmint/Cinnamon/issues/3575#issuecomment-374887122
+ # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
+ sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
+ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
- # Remove broken symlink
- rm files/etc/xdg/menus/cinnamon-applications-merged
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd ${srcdir}/Cinnamon*
+ cd "${srcdir}"/Cinnamon-${pkgver}
- ./autogen.sh --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/cinnamon \
- --localstatedir=/var \
- --disable-static \
- --disable-schemas-compile \
- --enable-compile-warnings=yes
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=yes
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ # https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make
}
package() {
- cd ${srcdir}/Cinnamon*
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/Cinnamon-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
}
Modified: cinnamon-control-center/trunk/PKGBUILD
===================================================================
--- cinnamon-control-center/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon-control-center/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
# Based on gnome-control-center:
# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
# Jan de Groot <jgc at archlinux.org>
@@ -9,37 +10,45 @@
pkgrel=1
pkgdesc="The Control Center for Cinnamon"
arch=('x86_64')
-depends=('cinnamon-settings-daemon' 'cinnamon-menus'
- 'libgnomekbd' 'libmm-glib' 'nm-connection-editor' 'colord' 'gnome-online-accounts')
+url="https://github.com/linuxmint/${pkgname}"
+license=('GPL')
+depends=('cinnamon-settings-daemon' 'cinnamon-menus' 'colord' 'gnome-online-accounts'
+ 'libgnomekbd' 'libmm-glib' 'nm-connection-editor')
optdepends=('cinnamon-translations: i18n'
'gnome-color-manager: for color management tasks')
-makedepends=('intltool' 'gnome-common' 'docbook-xsl')
-url="https://github.com/linuxmint/cinnamon-control-center"
-license=('GPL')
+makedepends=('docbook-xsl' 'gnome-common' 'intltool')
options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
-sha256sums=('298daf3f0f01af11b63a57c59f0ee62cc0cb16a12b498bdd45fd92e6d32754aa')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
+sha256sums=('7e839b2ca42aec23a47a844f8ba48f8846eabe19ccc9fa1aaeae4a9f742e87df'
+ '45decb920589d4ed519ecdd25fd016a3c7e2d4a786ff2361a46381b14fd044b4')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
build() {
- cd $pkgname-$pkgver
+ cd "${srcdir}"/${pkgname}-${pkgver}
- ./autogen.sh --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-systemd
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-systemd
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ make
}
package() {
- cd $pkgname-$pkgver
+ cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="$pkgdir" install
+ # https://github.com/linuxmint/Cinnamon/pull/7382#issuecomment-374894901
+ # /usr/bin/cinnamon-control-center is not meant for users, it is a development troubleshooting tool.
+ # Just install the shell libs/headers.
+ make -C shell DESTDIR="${pkgdir}" install-{libcinnamon_control_center_includeHEADERS,libLTLIBRARIES,pkgconfigDATA}
+ make -C panels DESTDIR="${pkgdir}" install
- # Remove unused stuff
- make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm "$pkgdir"/usr/share/applications/cinnamon-{control-center,region-panel}.desktop
- rm -R "$pkgdir/etc"
-
- install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+ install -d -o root -g 102 -m 750 "${pkgdir}"/usr/share/polkit-1/rules.d
}
Modified: cinnamon-desktop/trunk/PKGBUILD
===================================================================
--- cinnamon-desktop/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon-desktop/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueria <alexfilgueira at antergos.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueria <alexfilgueira at antergos.com>
# Contributor: Jan de Groot <jan at archlinux.org>
pkgname=cinnamon-desktop
@@ -6,34 +7,43 @@
pkgver=3.6.2
pkgrel=1
pkgdesc="Library with common API for various Cinnamon modules"
-arch=(x86_64)
-license=(GPL LGPL)
-depends=(accountsservice gtk3 libxkbfile python libpulse)
-makedepends=(intltool gobject-introspection gnome-common python2)
-url="https://github.com/linuxmint/cinnamon-desktop"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz"
+arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
+license=('GPL' 'LGPL')
+depends=('accountsservice' 'gtk3' 'libxkbfile' 'libpulse')
+makedepends=('gobject-introspection' 'intltool' 'python')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
"config.patch")
sha256sums=('76b053eea02c61df22d35ccec6ba83de25246b794cbc024dce636dcb1e74c812'
'45f403e6fe4ec701a0f3d16e990bb36598dd4a58fac5a374f85ccecdf74dd98a')
-
+
prepare() {
- cd $pkgname-$pkgver
- # Adjust configuration
- patch -Np1 -i ../config.patch
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ # Adjust configuration
+ patch -Np1 -i ../config.patch
+
+ NOCONFIGURE=1 autoreconf -fi
}
build() {
- cd $pkgname-$pkgver
- ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static
+ cd "${srcdir}"/${pkgname}-${pkgver}
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname \
+ --disable-static
- make
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ # rm legacy migration script (cinnamon 2.4) and its package dependency on python
+ rm -rf "${pkgdir}"/usr/bin
}
Property changes on: cinnamon-desktop/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: cinnamon-menus/trunk/PKGBUILD
===================================================================
--- cinnamon-menus/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon-menus/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,4 +1,6 @@
-#Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# $Id$
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at antergos.com>
pkgname=cinnamon-menus
pkgver=3.6.0
@@ -5,22 +7,29 @@
pkgrel=1
pkgdesc="Cinnamon menu specifications"
arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
+license=('GPL' 'LGPL')
depends=('glib2')
-makedepends=('intltool' 'gobject-introspection' 'python2' 'gnome-common')
-license=('GPL' 'LGPL')
-url="https://github.com/linuxmint/cinnamon-menus"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-menus/archive/${pkgver}.tar.gz")
+makedepends=('gobject-introspection')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
sha256sums=('ac005b0b46fb6285f82b2f80683c7d5cdd719cb7548a4dc3e36f0cd717e38d00')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ autoreconf -fi
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./autogen.sh --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --sbindir=/usr/bin
- make
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --disable-static
+ make
}
package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
}
Property changes on: cinnamon-menus/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: cinnamon-screensaver/trunk/PKGBUILD
===================================================================
--- cinnamon-screensaver/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon-screensaver/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,4 +1,5 @@
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
# Based on gnome-screensaver package:
# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
# Jan de Groot <jgc at archlinux.org>
@@ -8,29 +9,37 @@
pkgrel=1
pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
license=('GPL')
-url="https://github.com/linuxmint/cinnamon-screensaver"
-backup=(etc/pam.d/cinnamon-screensaver)
depends=('accountsservice' 'cinnamon-desktop' 'dbus-glib' 'libgnomekbd'
'python-cairo' 'python-gobject' 'python-setproctitle' 'python-xapp' 'xapps' 'webkit2gtk')
optdepends=('cinnamon-translations: i18n')
-makedepends=('intltool' 'gnome-common' 'gobject-introspection')
-source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
- cinnamon-screensaver.pam)
+makedepends=('gobject-introspection' 'intltool')
+backup=(etc/pam.d/cinnamon-screensaver)
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+ "cinnamon-screensaver.pam")
sha256sums=('aeb3edb07f6e9a0f9aa0e291c82c26b12335dfe78fea6a32edb4ff1d049ca728'
'c34925177c883dc4935408a4679e984855b14ef18a208bb5c7c3e5be3817619a')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ autoreconf -fi
+}
+
build() {
- cd $pkgname-$pkgver
+ cd "${srcdir}"/${pkgname}-${pkgver}
- ./autogen.sh --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/cinnamon-screensaver \
- --localstatedir=/var
- make
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon-screensaver \
+ --localstatedir=/var
+ make
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../cinnamon-screensaver.pam "${pkgdir}"/etc/pam.d/cinnamon-screensaver
}
Modified: cinnamon-session/trunk/PKGBUILD
===================================================================
--- cinnamon-session/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon-session/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at antergos.com>
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
pkgname=cinnamon-session
@@ -6,31 +7,36 @@
pkgver=3.6.1
pkgrel=1
pkgdesc="The Cinnamon Session Handler"
-arch=(x86_64)
-license=(GPL LGPL)
-depends=(dbus-glib cinnamon-desktop libsm libcanberra)
-makedepends=(intltool mesa json-glib xtrans gnome-common)
-options=('!emptydirs')
-url="https://github.com/linuxmint/cinnamon-session"
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz)
+arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
+license=('GPL' 'LGPL')
+depends=('cinnamon-desktop' 'dbus-glib' 'libsm' 'libcanberra')
+makedepends=('intltool' 'xtrans')
+source=(${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz)
sha256sums=('1de855afe097c2fe4d63f0edd4f8876ace2d73620edb65b3c665e91e5a115d9e')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
build() {
- cd $pkgname-$pkgver
-
- CFLAGS="${CFLAGS} -Wno-error=format-nonliteral" ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/cinnamon-session \
- --disable-schemas-compile \
- --disable-gconf \
- --enable-qt57-theme-support
-
- make
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/cinnamon-session \
+ --disable-schemas-compile \
+ --disable-gconf \
+ --enable-qt57-theme-support
+
+ make
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
}
Property changes on: cinnamon-session/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: cinnamon-settings-daemon/trunk/PKGBUILD
===================================================================
--- cinnamon-settings-daemon/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon-settings-daemon/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
pkgname=cinnamon-settings-daemon
@@ -7,37 +8,44 @@
pkgrel=1
pkgdesc="The Cinnamon Settings daemon"
arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
license=('GPL')
-depends=('cinnamon-desktop' 'libcanberra-pulse' 'librsvg' 'nss'
- 'pulseaudio-alsa' 'upower' 'libnotify' 'libgnomekbd' 'libwacom'
- 'libgudev' 'dbus-glib' 'colord' 'libcups' 'polkit')
-makedepends=('autoconf-archive' 'intltool' 'docbook-xsl' 'xf86-input-wacom')
+depends=('cinnamon-desktop' 'colord' 'dbus-glib' 'libcanberra-pulse' 'libcups'
+ 'libgnomekbd' 'libgudev' 'libnotify' 'librsvg' 'libwacom' 'nss' 'polkit'
+ 'pulseaudio-alsa' 'upower')
+makedepends=('autoconf-archive' 'intltool' 'python' 'xf86-input-wacom')
options=('!emptydirs')
-url="https://github.com/linuxmint/cinnamon-settings-daemon"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
-sha256sums=('60f4de4eb1e05d720605dbd6f90bb841039be00ca1ad4f2bedaf39725ea34339')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+ "0001-Remove-vestigial-manpage.patch::${url}/pull/229.patch")
+sha256sums=('60f4de4eb1e05d720605dbd6f90bb841039be00ca1ad4f2bedaf39725ea34339'
+ 'ba2770a883bf7c61da768986d183dd507afdd3f912538938500612554f2b85f0')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # https://github.com/linuxmint/cinnamon-settings-daemon/pull/229
+ patch -p1 < ../0001-Remove-vestigial-manpage.patch
+ autoreconf -fi
+}
+
build() {
- cd $pkgname-$pkgver
+ cd "${srcdir}"/${pkgname}-${pkgver}
- ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir="/usr/lib/${pkgname}" \
- --enable-systemd \
- --enable-polkit
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir="/usr/lib/${pkgname}" \
+ --enable-systemd \
+ --enable-polkit
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}"/${pkgname}-${pkgver}
- # Remove useless man page (FS#54840)
- rm "$pkgdir/usr/share/man/man1/cinnamon-settings-daemon.1"
+ make DESTDIR="$pkgdir" install
}
Modified: cinnamon-translations/trunk/PKGBUILD
===================================================================
--- cinnamon-translations/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cinnamon-translations/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98057 2013-10-05 02:33:20Z faidoc $
+# $Id$
# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
# Contributor: Alexandre Filgueira <alexfilgueira at antergos.com>
@@ -7,7 +7,7 @@
pkgrel=1
pkgdesc="Translations for Cinnamon and Nemo"
arch=('any')
-url="https://github.com/linuxmint/cinnamon-translations"
+url="https://github.com/linuxmint/${pkgname}"
license=('GPL2')
source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
sha512sums=('7c43ef97c7f4b3c0610914d1f66d37769bffb81458be5121ad0d5aea8c51e8fc78ebd9539a72255ea0b9bc64a486d565c98d3f9077385758b651d5c948b81f7b')
Property changes on: cinnamon-translations/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: cjs/trunk/PKGBUILD
===================================================================
--- cjs/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ cjs/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
# Contributor: Ionut Biru <ibiru at archlinux.org>
pkgname=cjs
@@ -6,33 +7,42 @@
pkgver=3.6.1
pkgrel=1
pkgdesc="Javascript Bindings for Cinnamon"
-arch=(x86_64)
-url="https://github.com/linuxmint/cjs"
-license=(GPL)
-depends=(gtk3 gobject-introspection-runtime js38 dbus-glib)
-makedepends=(gnome-common python gobject-introspection)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz")
-options=(!emptydirs)
+arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
+license=('GPL')
+depends=('dbus-glib' 'gtk3' 'gobject-introspection-runtime' 'js38')
+makedepends=('gnome-common' 'gobject-introspection')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
sha512sums=('648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ autoreconf -fi
+}
+
build() {
- cd $pkgname-$pkgver
+ cd "${srcdir}"/${pkgname}-${pkgver}
- ./autogen.sh --prefix=/usr --disable-static --libexecdir=/usr/lib
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --disable-static
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make
}
check() {
- cd $pkgname-$pkgver
- # Needs a display
- make -k check || :
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # Needs a display
+ make -k check || :
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
}
Property changes on: cjs/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: muffin/trunk/PKGBUILD
===================================================================
--- muffin/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ muffin/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
# Contributor: Adam Hani Schakaki <adam at schakaki.net>
# Contributor: Ner0
@@ -8,42 +9,46 @@
pkgrel=1
pkgdesc="Cinnamon window manager based on Mutter"
arch=('x86_64')
-url="https://github.com/linuxmint/muffin"
+url="https://github.com/linuxmint/${pkgname}"
license=('GPL')
-depends=('clutter' 'gobject-introspection-runtime' 'cinnamon-desktop' 'libcanberra' 'libsm'
+depends=('cinnamon-desktop' 'clutter' 'gobject-introspection-runtime' 'libcanberra' 'libsm'
'startup-notification' 'zenity')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc')
+makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'gnome-doc-utils')
options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
sha256sums=('b343b6bf86d83dad01dcfb12d224c7eb2d4b63e1fbbe8beb3240a618ffecf737')
prepare() {
- cd ${pkgname}-${pkgver}
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd ${pkgname}-${pkgver}
+ cd "${srcdir}"/${pkgname}-${pkgver}
- PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
- --localstatedir=/var --disable-static --disable-schemas-compile \
- --enable-compile-warnings=minimum
+ PYTHON=python2 ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/muffin \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=minimum
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make
}
package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
+ cd "${srcdir}"/${pkgname}-${pkgver}
- # Remove unused stuff
- make -C src DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-desktopfilesDATA
- make -C src/tools DESTDIR="$pkgdir" uninstall
- make -C src/compositor/plugins DESTDIR="$pkgdir" uninstall
- make -C doc/man DESTDIR="$pkgdir" uninstall
+ make DESTDIR="${pkgdir}" install
+
+ # Remove unused stuff
+ make -C src DESTDIR="${pkgdir}" uninstall-binPROGRAMS uninstall-desktopfilesDATA
+ make -C src/tools DESTDIR="${pkgdir}" uninstall
+ make -C src/compositor/plugins DESTDIR="${pkgdir}" uninstall
+ make -C doc/man DESTDIR="${pkgdir}" uninstall
}
-
-# vim:set ts=2 sw=2 et:
Modified: nemo/trunk/PKGBUILD
===================================================================
--- nemo/trunk/PKGBUILD 2018-04-19 04:34:57 UTC (rev 316966)
+++ nemo/trunk/PKGBUILD 2018-04-19 06:05:20 UTC (rev 316967)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
# Contributor: Ner0
pkgname=nemo
@@ -7,47 +8,47 @@
pkgrel=1
pkgdesc="Cinnamon file manager (Nautilus fork)"
arch=('x86_64')
-url="https://github.com/linuxmint/nemo"
+url="https://github.com/linuxmint/${pkgname}"
license=('GPL')
-depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python'
- 'cinnamon-desktop' 'libnotify' 'libxml2' 'cinnamon-translations' 'xapps')
-optdepends=('ffmpegthumbnailer: support for video thumbnails')
-makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common'
- 'python-gobject' 'python-polib' 'python2-gobject')
-options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
-sha512sums=('f224cc5749e39f477594c1eb3133454db7838f1f62b924f1ad868038026318cfdc52c23d65e1be309e71c0fae046cff0bdc908003235630b986c897820217d4e')
+depends=('cinnamon-desktop' 'dconf' 'gvfs' 'exempi' 'libexif' 'libnotify' 'libxml2' 'python' 'xapps')
+optdepends=('cinnamon-translations: i18n'
+ 'ffmpegthumbnailer: support for video thumbnails')
+makedepends=('gobject-introspection' 'gnome-common' 'gtk-doc' 'intltool')
+#options=('!emptydirs')
+source=("$pkgname-$pkgver.tar.gz::${url}/archive/${pkgver}.tar.gz")
+sha512sums=('6a8652633c0d71e910aad1447cae1cc09de67e6325ff4c7b1515e653e354be80ec2b9889f92bbe3fa011132152729e8aacf95698c079ff00d6b8e737a9cd25f1')
prepare() {
- cd linuxmint-nemo-*
+ cd "${srcdir}"/${pkgname}-${pkgver}
- # Rename 'Files' app name to avoid having the same as nautilus
- sed -i '/^\[Desktop Entry/,/^\[Desktop Action/ s/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+ # Rename 'Files' app name to avoid having the same as nautilus
+ sed -i '/^\[Desktop Entry/,/^\[Desktop Action/ s/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd linuxmint-nemo-*
+ cd "${srcdir}"/${pkgname}-${pkgver}
- ./autogen.sh --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/nemo \
- --disable-update-mimedb \
- --disable-tracker \
- --disable-gtk-doc-html \
- --disable-schemas-compile \
- --disable-selinux
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --libexecdir=/usr/lib/nemo \
+ --disable-update-mimedb \
+ --disable-tracker \
+ --disable-gtk-doc-html \
+ --disable-schemas-compile \
+ --disable-selinux
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make
}
package() {
- cd linuxmint-nemo-*
+ cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="$pkgdir" install
-
- # Remove D-Bus activation file to avoid conflict with nautilus-desktop
- rm "$pkgdir/usr/share/dbus-1/services/nemo.FileManager1.service"
+ make DESTDIR="${pkgdir}" install
}
More information about the arch-commits
mailing list