public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxappearance-obconf/files/, lxde-base/lxappearance/
Date: Tue, 12 Jul 2022 02:32:26 +0000 (UTC)	[thread overview]
Message-ID: <1657593135.48b7cc4daf05dd7e5d5dc550b4972d4550fbe356.sam@gentoo> (raw)

commit:     48b7cc4daf05dd7e5d5dc550b4972d4550fbe356
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Jul 12 02:28:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 02:32:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b7cc4d

lxde-base/lxappearance: Fix patch

Fixes: https://github.com/gentoo/gentoo/commit/26734c3900e4e41aa7820b6f4afcf30bec26a441
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26359
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/lxappearance-obconf-0.2.3-cairo-xlib.patch         | 12 ++++++++++--
 ...pearance-0.6.3-r2.ebuild => lxappearance-0.6.3-r3.ebuild} |  0
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch b/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch
index ae61c3b35f82..7098f98ca50f 100644
--- a/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch
+++ b/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch
@@ -22,8 +22,6 @@ src/preview.c:146:15: warning: implicit declaration of function ‘cairo_xlib_su
  	$(OPENBOX_LIBS) \
  	$(GTK_LIBS) \
  	$(LXAPPEARANCE_LIBS) \
-diff --git a/configure.ac b/configure.ac
-index 9042f7f..84de1c7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -89,6 +89,10 @@ PKG_CHECK_MODULES(OPENBOX, [obrender-3.5 >= 3.5 obt-3.5 >= 3.5])
@@ -37,3 +35,13 @@ index 9042f7f..84de1c7 100644
  if test "x$enable_gtk3" = "xyes" ; then
    CFLAGS="$CFLAGS -DENABLE_GTK3"
    gtk_modules="gtk+-3.0 >= 3.0.0"
+--- a/src/preview.c
++++ b/src/preview.c
+@@ -27,6 +27,7 @@
+ 
+ #include <string.h>
+ 
++#include <cairo/cairo-xlib.h>
+ #include <obrender/theme.h>
+ 
+ #if GTK_CHECK_VERSION(3, 0, 0)

diff --git a/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild
similarity index 100%
rename from lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
rename to lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild


                 reply	other threads:[~2022-07-12  2:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1657593135.48b7cc4daf05dd7e5d5dc550b4972d4550fbe356.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox