Re: pkg/52631: x11/xfce4-gtk2-engine build fails

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost,martin%NetBSD.org@localhost
Subject: Re: pkg/52631: x11/xfce4-gtk2-engine build fails
From: David Shao <davshao%gmail.com@localhost>
Date: Mon, 29 Jan 2018 08:20:01 +0000 (UTC)

The following reply was made to PR pkg/52631; it has been noted by GNATS.

From: David Shao <davshao%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/52631: x11/xfce4-gtk2-engine build fails
Date: Mon, 29 Jan 2018 00:17:44 -0800

 Time to just patch xfce4-gtk2-engine and not to rely on glib-mkenums
 being patched upstream.
 
 Do something better than this:
 
 --- x11/xfce4-gtk2-engine.orig/distinfo    2018-01-29 00:03:19.076153000 -0=
 800
 +++ x11/xfce4-gtk2-engine/distinfo    2018-01-29 00:01:41.363734000 -0800
 @@ -4,3 +4,7 @@
  RMD160 (gtk-xfce-engine-3.2.0.tar.bz2) =3D
 4f49ab683f418af78b0dc2b688bb54c7ed38f16a
  SHA512 (gtk-xfce-engine-3.2.0.tar.bz2) =3D
 c965e597c1b4aa04f3b474f3c4cea249aa6e753be697d5d3d7a19184adca650fc084f39acbd=
 357f53eaf4180d96d5d3499866367e221ae445de4864fc9487012
  Size (gtk-xfce-engine-3.2.0.tar.bz2) =3D 376203 bytes
 +SHA1 (patch-gtk-2.0_xfce__rc__style.h) =3D
 6e7827f74f2de36c34a32e67bf63b5ffec65787b
 +SHA1 (patch-gtk-2.0_xfce__style.h) =3D 8b9d4b0f85b304c4544ecf203210b3e6b12=
 a4471
 +SHA1 (patch-gtk-3.0_xfce__engine.h) =3D 4e83508ba39188711f257061d18eab5f82=
 161a99
 +SHA1 (patch-gtk-3.0_xfce__style__types.h) =3D
 ec95e4da7efb747d4f45be13590e985c8681fd94
 diff -Nur -x CVS
 x11/xfce4-gtk2-engine.orig/patches/patch-gtk-2.0_xfce__rc__style.h
 x11/xfce4-gtk2-engine/patches/patch-gtk-2.0_xfce__rc__style.h
 --- x11/xfce4-gtk2-engine.orig/patches/patch-gtk-2.0_xfce__rc__style.h
    1969-12-31 16:00:00.000000000 -0800
 +++ x11/xfce4-gtk2-engine/patches/patch-gtk-2.0_xfce__rc__style.h
 2018-01-29 00:00:36.302123000 -0800
 @@ -0,0 +1,20 @@
 +$NetBSD$
 +
 +--- gtk-2.0/xfce_rc_style.h.orig    2015-02-28 12:54:43.000000000 +0000
 ++++ gtk-2.0/xfce_rc_style.h
 +@@ -18,13 +18,13 @@
 +  *
 +  *  Portions based Thinice port by
 +  *                       Tim Gerla <timg%rrv.net@localhost>,
 +- *                       Tomas =C3=96gren <stric%ing.umu.se@localhost,
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost,
 +  *                       Richard Hult <rhult%codefactory.se@localhost>
 +  *  Portions based on Smooth theme by
 +  *                       Andrew Johnson <ajgenius%ajgenius.us@localhost>
 +  *  Portions based on IceGradient theme by
 +  *                       Tim Gerla <timg%means.net@localhost>
 +- *                       Tomas =C3=83=E2=80=93gren <stric%ing.umu.se@localhost>
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost>
 +  *                       JM Perez <jose.perez%upcnet.es@localhost>
 +  *  Portions based on Wonderland theme by
 +  *                       Garrett LeSage
 diff -Nur -x CVS
 x11/xfce4-gtk2-engine.orig/patches/patch-gtk-2.0_xfce__style.h
 x11/xfce4-gtk2-engine/patches/patch-gtk-2.0_xfce__style.h
 --- x11/xfce4-gtk2-engine.orig/patches/patch-gtk-2.0_xfce__style.h
 1969-12-31 16:00:00.000000000 -0800
 +++ x11/xfce4-gtk2-engine/patches/patch-gtk-2.0_xfce__style.h
 2018-01-29 00:00:36.312124000 -0800
 @@ -0,0 +1,20 @@
 +$NetBSD$
 +
 +--- gtk-2.0/xfce_style.h.orig    2015-02-28 12:54:43.000000000 +0000
 ++++ gtk-2.0/xfce_style.h
 +@@ -18,13 +18,13 @@
 +  *
 +  *  Portions based Thinice port by
 +  *                       Tim Gerla <timg%rrv.net@localhost>,
 +- *                       Tomas =C3=96gren <stric%ing.umu.se@localhost,
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost,
 +  *                       Richard Hult <rhult%codefactory.se@localhost>
 +  *  Portions based on Smooth theme by
 +  *                       Andrew Johnson <ajgenius%ajgenius.us@localhost>
 +  *  Portions based on IceGradient theme by
 +  *                       Tim Gerla <timg%means.net@localhost>
 +- *                       Tomas =C3=83=E2=80=93gren <stric%ing.umu.se@localhost>
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost>
 +  *                       JM Perez <jose.perez%upcnet.es@localhost>
 +  *  Portions based on Wonderland theme by
 +  *                       Garrett LeSage
 diff -Nur -x CVS
 x11/xfce4-gtk2-engine.orig/patches/patch-gtk-3.0_xfce__engine.h
 x11/xfce4-gtk2-engine/patches/patch-gtk-3.0_xfce__engine.h
 --- x11/xfce4-gtk2-engine.orig/patches/patch-gtk-3.0_xfce__engine.h
 1969-12-31 16:00:00.000000000 -0800
 +++ x11/xfce4-gtk2-engine/patches/patch-gtk-3.0_xfce__engine.h
 2018-01-28 23:57:18.717231000 -0800
 @@ -0,0 +1,31 @@
 +$NetBSD$
 +
 +  File "/usr/pkg/bin/glib-mkenums", line 710, in <module>
 +    process_file(fname)
 +  File "/usr/pkg/bin/glib-mkenums", line 442, in process_file
 +    line =3D curfile.readline()
 +  File "/usr/pkg/lib/python2.7/codecs.py", line 314, in decode
 +    (result, consumed) =3D self._buffer_decode(data, self.errors, final)
 +  File "/usr/pkg/bin/glib-mkenums", line 94, in replace_and_warn
 +    err.object[err.start - 7:err.end + 7]))
 +UnicodeDecodeError: 'ascii' codec can't decode byte 0xd6 in position
 7: ordinal not in range(128)
 +Makefile:743: recipe for target 'xfce_typebuiltin.c' failed
 +
 +--- gtk-3.0/xfce_engine.h.orig    2015-02-28 12:54:43.000000000 +0000
 ++++ gtk-3.0/xfce_engine.h
 +@@ -19,13 +19,13 @@
 +  *
 +  *  Portions based Thinice port by
 +  *                       Tim Gerla <timg%rrv.net@localhost>,
 +- *                       Tomas =C3=96gren <stric%ing.umu.se@localhost,
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost>
 +  *                       Richard Hult <rhult%codefactory.se@localhost>
 +  *  Portions based on Smooth theme by
 +  *                       Andrew Johnson <ajgenius%ajgenius.us@localhost>
 +  *  Portions based on IceGradient theme by
 +  *                       Tim Gerla <timg%means.net@localhost>
 +- *                       Tomas =C3=83=E2=80=93gren <stric%ing.umu.se@localhost>
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost>
 +  *                       JM Perez <jose.perez%upcnet.es@localhost>
 +  *  Portions based on Wonderland theme by
 +  *                       Garrett LeSage
 diff -Nur -x CVS
 x11/xfce4-gtk2-engine.orig/patches/patch-gtk-3.0_xfce__style__types.h
 x11/xfce4-gtk2-engine/patches/patch-gtk-3.0_xfce__style__types.h
 --- x11/xfce4-gtk2-engine.orig/patches/patch-gtk-3.0_xfce__style__types.h
    1969-12-31 16:00:00.000000000 -0800
 +++ x11/xfce4-gtk2-engine/patches/patch-gtk-3.0_xfce__style__types.h
  2018-01-28 23:55:36.744706000 -0800
 @@ -0,0 +1,20 @@
 +$NetBSD$
 +
 +--- gtk-3.0/xfce_style_types.h.orig    2015-02-28 12:54:43.000000000 +0000
 ++++ gtk-3.0/xfce_style_types.h
 +@@ -19,13 +19,13 @@
 +  *
 +  *  Portions based Thinice port by
 +  *                       Tim Gerla <timg%rrv.net@localhost>,
 +- *                       Tomas =C3=96gren <stric%ing.umu.se@localhost,
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost,
 +  *                       Richard Hult <rhult%codefactory.se@localhost>
 +  *  Portions based on Smooth theme by
 +  *                       Andrew Johnson <ajgenius%ajgenius.us@localhost>
 +  *  Portions based on IceGradient theme by
 +  *                       Tim Gerla <timg%means.net@localhost>
 +- *                       Tomas =C3=83=E2=80=93gren <stric%ing.umu.se@localhost>
 ++ *                       Tomas ??gren <stric%ing.umu.se@localhost>
 +  *                       JM Perez <jose.perez%upcnet.es@localhost>
 +  *  Portions based on Wonderland theme by
 +  *                       Garrett LeSage

Prev by Date: Re: pkg/52962 (sysutils/memtestplus fails when build on -current)
Next by Date: PR/52941 CVS commit: pkgsrc/security
Previous by Thread: Re: pkg/52631: x11/xfce4-gtk2-engine build fails
Next by Thread: Re: pkg/52629 (pkg_add: A different version of libarchive-3.3.2 is already installed: libarchive-3.1.2nb2)
Indexes:

Home | Main Index | Thread Index | Old Index