public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/bijiben/, app-misc/bijiben/files/
@ 2015-11-09 10:22 Pacho Ramos
  0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2015-11-09 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     8e6754934a615b1c0431af09ab115c6f03250af7
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 10:06:22 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 10:22:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e675493

app-misc/bijiben: Version bump

Package-Manager: portage-2.2.24

 app-misc/bijiben/Manifest                          |  1 +
 app-misc/bijiben/bijiben-3.18.2.ebuild             | 53 ++++++++++++++++++++++
 .../files/bijiben-3.18.2-zeitgeist-automagic.patch | 52 +++++++++++++++++++++
 app-misc/bijiben/metadata.xml                      |  3 ++
 4 files changed, 109 insertions(+)

diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 7a6b91b..81e8bf3 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,2 +1,3 @@
 DIST bijiben-3.14.2.tar.xz 621696 SHA256 7998632c83889071c23725ad95867618c72814676a3a3865881e9556714e0537 SHA512 1fc1d4c9ddf3fb674229e96793603769ef77c9aaf43eb142c41450ce79d82e6a5dc659d7e0fe1b7c0256830516f770b32d3b2cf36250172feba2962b71bcb40a WHIRLPOOL 005b103a96457a729b5bb194f2d8973f4785ef302a23825f473c18d75caa699d9d47f8bab27ac44b11f8c327d5d93fb3ce72b46ef57a5f430ca721d95de3adba
 DIST bijiben-3.16.2.tar.xz 658656 SHA256 39c97690e6d0bbed343b2283ea184c89fd49f3c4309af7f56e1b494efd0fd98a SHA512 59e56a961ad66e90e2267ffeb0cdeab312720e82e2a0fb3e78fc1908478f42d657b81b7a3099121a36e150997cdae177f0b25db7e8fb664311550c2d79fab6de WHIRLPOOL 710db7f418be48ead556de0e059f39428bde6277a40174379f797953c8dea20b72ebda15db505cc044fff19df6636932f30b481eae271664ca357825ae8d171a
+DIST bijiben-3.18.2.tar.xz 682036 SHA256 45fed3242ba092138760b99e725f0a4d3c8d749ef37c607d43c8f010e11a645d SHA512 bdda83860db4cff2f1c7fd28754b6f521fbf1862b2f5c1582676ce1e218f388162d4b782ca6a39e4672c6899441bfcb60a4b93e6265df942a622d5fc7d70be6b WHIRLPOOL 8e2d4db8581ac05c9abe29476e120622fff9133f7d657f9eab734c005c831b37af8f9ac839d20587f0bcfdb087103d077b2ce3141692c8d4291b484927566e14

diff --git a/app-misc/bijiben/bijiben-3.18.2.ebuild b/app-misc/bijiben/bijiben-3.18.2.ebuild
new file mode 100644
index 0000000..776e405
--- /dev/null
+++ b/app-misc/bijiben/bijiben-3.18.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zeitgeist"
+
+RDEPEND="
+	>=app-misc/tracker-1:=
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2
+	>=gnome-extra/evolution-data-server-3.13.90:=
+	net-libs/gnome-online-accounts
+	net-libs/webkit-gtk:3
+	sys-apps/util-linux
+	>=x11-libs/gtk+-3.11.4:3
+	zeitgeist? ( gnome-extra/zeitgeist )
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	app-text/yelp-tools
+"
+# Needed by eautoreconf:
+#	app-text/yelp-tools
+
+src_prepare() {
+	# Fix zeitgeist automagic dependency
+	# https://bugzilla.gnome.org/show_bug.cgi?id=756013
+	epatch "${FILESDIR}"/${PN}-3.18.2-zeitgeist-automagic.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable zeitgeist) \
+		--disable-update-mimedb
+}

diff --git a/app-misc/bijiben/files/bijiben-3.18.2-zeitgeist-automagic.patch b/app-misc/bijiben/files/bijiben-3.18.2-zeitgeist-automagic.patch
new file mode 100644
index 0000000..d438220
--- /dev/null
+++ b/app-misc/bijiben/files/bijiben-3.18.2-zeitgeist-automagic.patch
@@ -0,0 +1,52 @@
+From d3ebde7427514ca9ab92b6f7937ebb5ab8efb063 Mon Sep 17 00:00:00 2001
+From: Poncho <poncho@spahan.ch>
+Date: Sun, 27 Sep 2015 14:25:58 +0200
+Subject: [PATCH] make zeitgeist dependency optional
+
+---
+ configure.ac | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19a44b4..afb0c3a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,9 +83,24 @@ PKG_CHECK_MODULES(BIJIBEN,
+                     uuid
+                     webkitgtk-3.0])
+ 
+-PKG_CHECK_MODULES(ZEITGEIST, zeitgeist-2.0, [have_zeitgeist=yes], [have_zeitgeist=no])
+ 
+-AM_CONDITIONAL(BUILD_ZEITGEIST, test x$have_zeitgeist = xyes)
++# check for zeitgeist
++AC_ARG_ENABLE([zeitgeist],
++  [AS_HELP_STRING([--disable-zeitgeist], [Disable zeitgeist support @<:@auto@:>@])],
++  [:],
++  [enable_zeitgeist=auto])
++
++AS_IF([test "$enable_zeitgeist" != "no"],
++  [PKG_CHECK_MODULES([ZEITGEIST],
++    [zeitgeist-2.0],
++    [enable_zeitgeist=yes],
++    [AS_IF([test "$enable_zeitgeist" = "yes"],
++      [AC_MSG_ERROR([zeitgeist-2.0 required, but not found.])],
++      [enable_zeitgeist=no])
++    ])
++])
++
++AM_CONDITIONAL([BUILD_ZEITGEIST], [test "$enable_zeitgeist" = "yes"])
+ 
+ 
+ GLIB_GSETTINGS
+@@ -113,7 +128,7 @@ src/Makefile
+ AC_OUTPUT
+ 
+ echo "	Version:	        $VERSION
+-        Enable Zeitgeist  $have_zeitgeist
++        Enable Zeitgeist  $enable_zeitgeist
+ 
+ 	Run make to compile."
+ 
+-- 
+2.4.9
+

diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
index da6fd63..8a8cf37 100644
--- a/app-misc/bijiben/metadata.xml
+++ b/app-misc/bijiben/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/bijiben/, app-misc/bijiben/files/
@ 2022-11-16 22:56 Matt Turner
  0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2022-11-16 22:56 UTC (permalink / raw
  To: gentoo-commits

commit:     27798bec01b881642adb0bda32b98eec03ed09e3
Author:     Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Wed Nov 16 22:22:30 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 22:56:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27798bec

app-misc/bijiben: link against webkit-gtk:4.1

The evolution-data-server version this ebuild is using is linked
against libsoup:3.0, we need to use a webkit-gtk version that does so
too.

Closes: https://bugs.gentoo.org/878109
Closes: https://github.com/gentoo/gentoo/pull/28304
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../{bijiben-40.1-r1.ebuild => bijiben-40.1-r2.ebuild}       |  1 +
 app-misc/bijiben/files/bijiben-40.1-webkit-gtk-libsoup.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app-misc/bijiben/bijiben-40.1-r1.ebuild b/app-misc/bijiben/bijiben-40.1-r2.ebuild
similarity index 95%
rename from app-misc/bijiben/bijiben-40.1-r1.ebuild
rename to app-misc/bijiben/bijiben-40.1-r2.ebuild
index d7e5045ca8bc..5170e1f11c80 100644
--- a/app-misc/bijiben/bijiben-40.1-r1.ebuild
+++ b/app-misc/bijiben/bijiben-40.1-r2.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-40.1-meson-0.61.patch
+	"${FILESDIR}"/${PN}-40.1-webkit-gtk-libsoup.patch
 )
 
 src_configure() {

diff --git a/app-misc/bijiben/files/bijiben-40.1-webkit-gtk-libsoup.patch b/app-misc/bijiben/files/bijiben-40.1-webkit-gtk-libsoup.patch
new file mode 100644
index 000000000000..150f97010686
--- /dev/null
+++ b/app-misc/bijiben/files/bijiben-40.1-webkit-gtk-libsoup.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/878109
+
+--- a/meson.build
++++ b/meson.build
+@@ -126,7 +126,7 @@ bijiben_deps = [
+   dependency('libxml-2.0'),
+   dependency('libcurl'),
+   dependency('uuid'),
+-  dependency('webkit2gtk-4.0', version: '>= 2.26'),
++  dependency('webkit2gtk-4.1', version: '>= 2.26'),
+   cc.find_library('m')
+ ]


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-11-16 22:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-16 22:56 [gentoo-commits] repo/gentoo:master commit in: app-misc/bijiben/, app-misc/bijiben/files/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2015-11-09 10:22 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox