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

cinnamon: fix all instances of Gtk.ShadowType.IN and drop patch.

Browse source
This commit is contained in:
Juan RP 2012-09-22 17:14:03 +02:00
parent 6fea46853e
commit a76bff3fb4
2 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/cinnamon/patches/cinnamon-settings-gtk.shadow.IN.patch
View file

@ -1,22 +0,0 @@
A workaround for this error:
Traceback (most recent call last):
File "/usr/lib/cinnamon-settings/cinnamon-settings.py", line 1838, in side_view_nav
sidePage.build()
File "/usr/lib/cinnamon-settings/cinnamon-settings.py", line 744, in build
scrolledWindow.set_shadow_type(Gtk.ShadowType.IN)
AttributeError: type object 'GtkShadowType' has no attribute 'IN'
Disable the shadow type for now.
--- files/usr/lib/cinnamon-settings/cinnamon-settings.py.orig 2012-09-22 16:47:36.560928739 +0200
+++ files/usr/lib/cinnamon-settings/cinnamon-settings.py 2012-09-22 16:47:47.218674599 +0200
@@ -741,7 +741,7 @@ class ThemeViewSidePage (SidePage):
iconView.select_path(self.model.get_path(self.active_theme_iter))
iconView.connect("selection_changed", self.apply_theme )
scrolledWindow.add(iconView)
- scrolledWindow.set_shadow_type(Gtk.ShadowType.IN)
+ scrolledWindow.set_shadow_type(Gtk.ShadowType.NONE)
link = Gtk.LinkButton("http://cinnamon-spices.linuxmint.com/themes")
link.set_label(_("Get new themes"))
cinnamon_theme_vbox.pack_start(link, False, False, 2)

12
srcpkgs/cinnamon/template
View file

@ -1,7 +1,7 @@
# Template file for 'cinnamon' # Template file for 'cinnamon'
pkgname=cinnamon pkgname=cinnamon
version=1.6.0 version=1.6.0
revision=4 revision=5
wrksrc="linuxmint-Cinnamon-bd02368" wrksrc="linuxmint-Cinnamon-bd02368"
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-schemas-compile --enable-compile-warnings=yes configure_args="--disable-schemas-compile --enable-compile-warnings=yes
@ -33,8 +33,16 @@ long_desc="
pycompile_dirs="usr/lib/cinnamon-settings usr/lib/cinnamon-menu-editor" pycompile_dirs="usr/lib/cinnamon-settings usr/lib/cinnamon-menu-editor"
pre_configure() { pre_configure() {
_cur="/usr/lib/gnome-session/gnome-session-check-accelerated"
_new="/usr/libexec/gnome-session-check-accelerated"
# Fix path to gnome-session-check-accelerated # Fix path to gnome-session-check-accelerated
sed -i -e "s|/usr/lib/gnome-session/gnome-session-check-accelerated|/usr/libexec/gnome-session-check-accelerated|g" \ sed -i -e "s|${_cur}|${_new}|g" \
files/usr/share/gnome-session/sessions/cinnamon.session files/usr/share/gnome-session/sessions/cinnamon.session
./autogen.sh ./autogen.sh
# Workaround for 'Unknown attribute IN (Gtk.ShadowType)' in
# cinnamon-settings.
sed -i -e "s|Gtk.ShadowType.IN|Gtk.ShadowType.NONE|g" \
files/usr/lib/cinnamon-settings/cinnamon-settings.py
} }