Fri Jul 14 08:13:26 2023 UTC ()
wm/ccsm: Fix an issue where CCSM displays no text or icons


(pho)
diff -r1.39 -r1.40 pkgsrc/wm/ccsm/Makefile
diff -r1.5 -r1.6 pkgsrc/wm/ccsm/distinfo
diff -r0 -r1.1 pkgsrc/wm/ccsm/patches/patch-ccm_Utils.py
cvs diff -r1.39 -r1.40 pkgsrc/wm/ccsm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/ccsm/Makefile 2023/04/19 08:11:42 1.39
+++ pkgsrc/wm/ccsm/Makefile 2023/07/14 08:13:26 1.40
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.39 2023/04/19 08:11:42 adam Exp $ 1# $NetBSD: Makefile,v 1.40 2023/07/14 08:13:26 pho Exp $
2 2
3PKGVER= 0.8.4 3PKGVER= 0.8.4
4DISTNAME= ccsm-${PKGVER} 4DISTNAME= ccsm-${PKGVER}
5PKGREVISION= 18 5PKGREVISION= 19
6CATEGORIES= wm gnome 6CATEGORIES= wm gnome
7MASTER_SITES= http://releases.compiz.org/${PKGVER}/ 7MASTER_SITES= http://releases.compiz.org/${PKGVER}/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://compiz.org/ 10HOMEPAGE= http://compiz.org/
11COMMENT= CompizConfig Settings Manager 11COMMENT= CompizConfig Settings Manager
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= compizconfig-backend-gconf>=0.6.0:../../devel/compizconfig-backend-gconf 14DEPENDS+= compizconfig-backend-gconf>=0.6.0:../../devel/compizconfig-backend-gconf
15DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 15DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
16 16
17USE_TOOLS+= pkg-config gmake msgfmt intltool 17USE_TOOLS+= pkg-config gmake msgfmt intltool
18 18
cvs diff -r1.5 -r1.6 pkgsrc/wm/ccsm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/ccsm/distinfo 2021/10/26 11:25:11 1.5
+++ pkgsrc/wm/ccsm/distinfo 2023/07/14 08:13:26 1.6
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 11:25:11 nia Exp $ 1$NetBSD: distinfo,v 1.6 2023/07/14 08:13:26 pho Exp $
2 2
3BLAKE2s (ccsm-0.8.4.tar.gz) = 12e4b1732b243a58af45e93030c46031fd1f7f6583dfd0afd7f530d5e401424a 3BLAKE2s (ccsm-0.8.4.tar.gz) = 12e4b1732b243a58af45e93030c46031fd1f7f6583dfd0afd7f530d5e401424a
4SHA512 (ccsm-0.8.4.tar.gz) = ad52315c527571ca82a74c0285e1806d178c3af5873c2d2f3f00addd5b6615862c2a33b5292e897bdccb3374c9594fc418fb5515748bbb7794254d1df6dbcfb2 4SHA512 (ccsm-0.8.4.tar.gz) = ad52315c527571ca82a74c0285e1806d178c3af5873c2d2f3f00addd5b6615862c2a33b5292e897bdccb3374c9594fc418fb5515748bbb7794254d1df6dbcfb2
5Size (ccsm-0.8.4.tar.gz) = 635866 bytes 5Size (ccsm-0.8.4.tar.gz) = 635866 bytes
6SHA1 (patch-aa) = 83439bdc7c716fe5e94eef90c22d2975ca7f2357 6SHA1 (patch-aa) = 83439bdc7c716fe5e94eef90c22d2975ca7f2357
 7SHA1 (patch-ccm_Utils.py) = 684df0b871af0b5ecaf6d0827c1a52c5b0d550df
File Added: pkgsrc/wm/ccsm/patches/patch-ccm_Utils.py
$NetBSD: patch-ccm_Utils.py,v 1.1 2023/07/14 08:13:26 pho Exp $

CCSM: No icons and text in main screen, submenus of the plugins work
normally

https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/1130941

--- ccm/Utils.py.orig	2023-07-14 07:56:20.403539555 +0000
+++ ccm/Utils.py
@@ -184,7 +184,7 @@ class PrettyButton (gtk.Button):
         if has_focus:
             self.unset_flags (gtk.HAS_FOCUS)
 
-        ret = super (PrettyButton, self).do_expose_event (self, event)
+        ret = gtk.Button.do_expose_event (self, event)
 
         if has_focus:
             self.set_flags (gtk.HAS_FOCUS)