jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1792 from Gottox/cinnamon-2.6

Browse source 
Cinnamon 2.6
This commit is contained in:
Juan RP 2015-06-08 12:23:59 +02:00
parent 27c8eb05c0 cb95a27482
commit 252facafb7
12 changed files with 57 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/cinnamon-control-center/template
View file

@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=2.4.2
revision=3
version=2.6.0
revision=1
short_desc="The Cinnamon Control Center"
build_options="systemd"
build_style=gnu-configure
@ -20,7 +20,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188
checksum=bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

11
srcpkgs/cinnamon-desktop/patches/fix-build.patch Normal file
View file

@ -0,0 +1,11 @@
--- configure.ac.orig 2015-06-07 20:31:31.690834276 +0200
+++ configure.ac 2015-06-07 20:31:55.617835373 +0200
@@ -2,7 +2,7 @@
AC_INIT(cinnamon-desktop, 2.6.4)
AC_CONFIG_SRCDIR(libcinnamon-desktop)
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([config.h])

4
srcpkgs/cinnamon-desktop/template
View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
version=2.4.2
version=2.6.4
revision=1
short_desc="Library with common API for various Cinnamon modules"
build_style=gnu-configure
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=62e2ff4fad405f8d4e7259dbeb2daf65c6f8b9995f2bb1e595a7cc0c2a7f9e0a
checksum=d40fc57202408476ff0bfa191958f16de07cf4c00d911bef57c3107c8e483970
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

10
srcpkgs/cinnamon-menus/template
View file

@ -1,17 +1,21 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
version=2.4.2
version=2.6.0
revision=1
short_desc="Cinnamon menu specifications"
build_style=gnu-configure
configure_args=" --disable-static"
hostmakedepends="pkg-config intltool gobject-introspection"
hostmakedepends="automake libtool gnome-common pkg-config intltool gobject-introspection"
makedepends="libglib-devel"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=6f3a2c64b47f3704d639213096ca44aee9a35ec8cd7d8d72fff52efc798928ed
checksum=8fe81ffe9818aa9412b4d89daf846f4c0c01f170838b121d4cba027a48068574
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

4
srcpkgs/cinnamon-screensaver/template
View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
version=2.4.2
version=2.6.3
revision=1
short_desc="The Cinnamon screensaver"
build_options="systemd"
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=52afb2c9b5b00e1d026469c7f2b1865ca44c784b920e35bfcd61d2a75b87bbda
checksum=cef3e6ccbb77e91f7e4ef04115b45696c5b6070b8517a60c8782b1f0a67a348a
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

4
srcpkgs/cinnamon-session/template
View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
version=2.4.3
version=2.6.2
revision=1
short_desc="The Cinnamon session handler"
build_options="systemd"
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733
checksum=42ea718b77240ff24061203bc03ba6af7d51bcba2323b0bb73a56870e232cb92
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

4
srcpkgs/cinnamon-settings-daemon/template
View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
version=2.4.3
version=2.6.2
revision=1
short_desc="The Cinnamon Settings Daemon"
build_options="systemd"
@ -18,7 +18,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2
checksum=a97b85a2f9aafdc9c7c7facc97e422d7bc9531a920ac2e685fd82c56c01d8dec
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

8
srcpkgs/cinnamon-translations/template
View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
version=2.4.4
version=2.6.2
revision=1
noarch=yes
build_style=gnu-makefile
@ -9,9 +9,9 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=7e6f14dc98be622874ac5a50b45191a2147dda145bcd0f6f52ef56df0762c202
checksum=8cbf6114a8b0b19ea0755f4527414661712b5d58fefa057593b4a05a2d1c1f03
do_install () {
vmkdir /usr/share/locale
do_install () {
vmkdir /usr/share/locale
cp -a usr/share/locale/* ${DESTDIR}/usr/share/locale
}

21
srcpkgs/cinnamon/patches/set_wheel.patch
View file

@ -14,19 +14,22 @@
self.set_modal(True)
self.set_skip_taskbar_hint(True)
@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
def change_password(self):
@@ -218,13 +217,7 @@ class PasswordDialog(Gtk.Dialog):
newpass = self.new_password.get_text()
self.user.set_password(newpass, "")
- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
- mask = self.group_mask.get_text()
- mask = mask.split(", ")
- mask.remove("nopasswdlogin")
- mask = ", ".join(mask)
- self.group_mask.set_text(mask)
self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
mask = self.group_mask.get_text()
- if "nopasswdlogin" in mask:
- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
- mask = mask.split(", ")
- mask.remove("nopasswdlogin")
- mask = ", ".join(mask)
- self.group_mask.set_text(mask)
- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
self.destroy()
def set_passwords_visibility(self):
@@ -515,7 +508,7 @@ class Module:
model, treeiter = self.users_treeview.get_selection().get_selected()
if treeiter != None:

13
srcpkgs/cinnamon/template
View file

@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
version=2.4.8
revision=3
version=2.6.7
revision=1
wrksrc="Cinnamon-${version}"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
build_style=gnu-configure
@ -12,10 +12,10 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel
libgnome-keyring-devel NetworkManager-devel libcroco-devel"
libgnome-keyring-devel NetworkManager-devel libcroco-devel gtk+3-devel"
depends="
accountsservice caribou cinnamon-settings-daemon>=2.4 cinnamon-session>=2.4 muffin>=2.4
cinnamon-control-center>=2.4 cinnamon-screensaver>=2.4 cinnamon-translations>=2.4 nemo>=2.4
accountsservice caribou cinnamon-settings-daemon>=${version%.*} cinnamon-session>=${version%.*} muffin>=${version%.*}
cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow
polkit-gnome upower0"
@ -23,7 +23,8 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=5dc693cb57adce95cf917c94ee4e02fa8740e5cd5edbd8ee9cdeed81604aefd3
checksum=839ab0ea86b718809e53a0209d72701638ab3ac68263f2469e70967aaf21a004
CFLAGS+="-I/usr/include/gtk-3.0"
pycompile_dirs="
/usr/lib/cinnamon-slideshow

6
srcpkgs/muffin/template
View file

@ -1,13 +1,13 @@
# Template file for 'muffin'
pkgname=muffin
version=2.4.5
version=2.6.1
revision=1
short_desc="Cinnamon window manager based on Mutter"
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=minimum ac_cv_path_ZENITY=/usr/bin/zenity"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel intltool glib-devel gnome-doc-utils"
gettext-devel intltool glib-devel gnome-doc-utils gtk-doc"
makedepends="clutter-devel startup-notification-devel libcanberra-devel
cinnamon-desktop-devel libXinerama-devel libSM-devel"
depends="dconf zenity"
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=b38d62cb0d4ec9e213cc41501bda0d4712eebab7cd4fbc5ca0bdf8b5e74f83f7
checksum=0772ad6caace2f4570e7d3a0cbc8a6ef5f65be92c6a30cc95a59ed8bba6b5f74
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

4
srcpkgs/nemo/template
View file

@ -1,6 +1,6 @@
# Template file for 'nemo'
pkgname=nemo
version=2.4.5
version=2.6.5
revision=1
short_desc="The Cinnamon file manager (nautilus fork)"
build_style=gnu-configure
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=a4eae743f25d1a66cbb5b28675d78aee1d57224c825d6baebdf88068dc1d8d04
checksum=bf7365cde5a7348376dda3e8c43ee33b9d592f04ddbeb767faf0d5ecbe26e89a
pre_configure() {
# Fix build