Re: [update] x11/girara to 0.4.1
Le Wed, Dec 13, 2023 at 12:37:30PM +0100, Justin Berthault a écrit : > Hi ports@ > > Quick update for girara to 0.4.1 (needed for the new zathura release, > diff incoming btw). > > Bumped SHARED_LIBS because zathura will not build against previous > release. (Let me know if I did wrong.) the reasoning for bumping shared_libs is explained in https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs here, bumpingthe minor seems sane as a function was added: --- girara-0.4.0-libgirara-gtk3.so.1.2 Wed Dec 13 13:05:39 2023 +++ girara-0.4.1-libgirara-gtk3.so.1.2 Wed Dec 13 13:08:05 2023 @@ -76,6 +76,7 @@ girara_list_prepend girara_list_remove girara_list_set_free_function +girara_list_set_nth girara_list_size girara_list_sort girara_log but, if newest zathura cant build against girara 0.4.0 your just need to adjust the dependency in the zatura port to require 0.4.1. those are two different & distinct issues :)
[update] x11/girara to 0.4.1
Hi ports@ Quick update for girara to 0.4.1 (needed for the new zathura release, diff incoming btw). Bumped SHARED_LIBS because zathura will not build against previous release. (Let me know if I did wrong.) Built and tested on arm64. diff /usr/ports commit - 350601b3e26ca2a6b36f1b11acec33577bc7715d path + /usr/ports blob - cda7cae503036600bfaaa6be7fcd954a78bf26f6 file + x11/girara/Makefile --- x11/girara/Makefile +++ x11/girara/Makefile @@ -1,7 +1,7 @@ COMMENT = user interface library from pwmt -DISTNAME = girara-0.4.0 +DISTNAME = girara-0.4.1 -SHARED_LIBS += girara-gtk3 1.2 # 3.1 +SHARED_LIBS += girara-gtk3 1.3 # 3.1 EXTRACT_SUFX = .tar.xz blob - 005a5a3dd85ef7ac402f28855a5cd2ec5f6b2072 file + x11/girara/distinfo --- x11/girara/distinfo +++ x11/girara/distinfo @@ -1,2 +1,2 @@ -SHA256 (girara-0.4.0.tar.xz) = zq/Qpq7VCtgyunZuxinx6jZmgcFfj6coqPVUGMOdyQE= -SIZE (girara-0.4.0.tar.xz) = 60804 +SHA256 (girara-0.4.1.tar.xz) = oD3+cxfuVFFXB/NJFUou99YpUztU+VB3PoEGRDFhffU= +SIZE (girara-0.4.1.tar.xz) = 61320 -- ~Justin
Re: [UPDATE] x11/girara 0.3.8 -> 0.4.0 (fixes a SIGSEGV in textproc/zathura)
On 2023/04/25 16:32:15 -0600, Ashlen wrote: > Hi. textproc/zathura will consistently SIGSEGV and dump a core file when > I hit to view the table of contents. I examined the core file and > found that this is due to an invalid read in girara_node_free, > referenced in this issue and fixed in the commit following it. > > https://git.pwmt.org/pwmt/girara/-/issues/17 > https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e Committed, thanks! The changes between 0.3.8 and 0.4.0 were just this fix and the added ability to use unicode characters in mappings. No shared libraries change. > Bumping x11/girara to 0.4.0 fixes the issue. I added SEPARATE_BUILD=Yes > while here since that works. I've dropped SEPARATE_BUILD since it was already set by meson.port.mk. One handy feature is to use `make show=VARIABLE' to see if something is already set (either by a parent Makefile.inc or modules). It also works with modifiers, which it makes incredibly useful when tweaking stuff $ make show=SEPARATE_BUILD Yes $ make show=SEPARATE_BUILD:U YES
[UPDATE] x11/girara 0.3.8 -> 0.4.0 (fixes a SIGSEGV in textproc/zathura)
Hi. textproc/zathura will consistently SIGSEGV and dump a core file when
I hit to view the table of contents. I examined the core file and
found that this is due to an invalid read in girara_node_free,
referenced in this issue and fixed in the commit following it.
https://git.pwmt.org/pwmt/girara/-/issues/17
https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e
Bumping x11/girara to 0.4.0 fixes the issue. I added SEPARATE_BUILD=Yes
while here since that works.
Any feedback? I kept the diff minimal, but am open to suggestions.
Index: Makefile
===
RCS file: /cvs/ports/x11/girara/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile28 Dec 2022 22:56:14 - 1.27
+++ Makefile25 Apr 2023 22:13:00 -
@@ -1,5 +1,5 @@
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.3.8
+DISTNAME = girara-0.4.0
SHARED_LIBS += girara-gtk3 1.2 # 3.1
@@ -33,5 +33,7 @@ TEST_DEPENDS =devel/check
TEST_FLAGS += VERBOSE=1
TEST_FLAGS += HOME=${WRKDIR}
TEST_IS_INTERACTIVE =X11
+
+SEPARATE_BUILD = Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/girara/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo28 Dec 2022 22:56:14 - 1.15
+++ distinfo25 Apr 2023 22:13:00 -
@@ -1,2 +1,2 @@
-SHA256 (girara-0.3.8.tar.xz) = UXBiKODIIv8tMgkCnhQh6cFT7CAiemo8Z4V3Bipkg/w=
-SIZE (girara-0.3.8.tar.xz) = 60664
+SHA256 (girara-0.4.0.tar.xz) = zq/Qpq7VCtgyunZuxinx6jZmgcFfj6coqPVUGMOdyQE=
+SIZE (girara-0.4.0.tar.xz) = 60804
Update: x11/girara
Required to update zathura.
Reviewing the diff at https://git.pwmt.org/pwmt/girara/compare/0.3.2...0.3.4
there was a symbol addition (girara_xdg_open_with_working_directory) and
a few exported symbols had a pointer arg made const. I think a minor
bump suffices here. Only consumer seems to be zathura which builds fine.
diff --git Makefile Makefile
index 61a91d9c39d..b749ba0f3a3 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2019/07/13 22:12:09 naddy Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.3.2
+DISTNAME = girara-0.3.4
-SHARED_LIBS += girara-gtk3 1.0 # 3.1
+SHARED_LIBS += girara-gtk3 1.1 # 3.1
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11
diff --git distinfo distinfo
index 8d5d7072b3b..a261da12b08 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (girara-0.3.2.tar.xz) = FwA1OhAfPFIPmyLnnXHqWyaKnsMkeWz55kd12Wuwhs0=
-SIZE (girara-0.3.2.tar.xz) = 58220
+SHA256 (girara-0.3.4.tar.xz) = UfzaWlCmj6vUYftORnod79Ux2vyk9H9oUanrVnVssjI=
+SIZE (girara-0.3.4.tar.xz) = 58708
diff --git pkg/PLIST pkg/PLIST
index 107790e4b90..52e2753df66 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -20,6 +20,7 @@ include/girara/types.h
include/girara/utils.h
@lib lib/libgirara-gtk3.so.${LIBgirara-gtk3_VERSION}
lib/pkgconfig/girara-gtk3.pc
+share/locale/ar/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/de/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/el/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/eo/LC_MESSAGES/libgirara-gtk3-3.mo
@@ -31,4 +32,5 @@ share/locale/nl/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/pl/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/ru/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/sv/LC_MESSAGES/libgirara-gtk3-3.mo
share/locale/tr/LC_MESSAGES/libgirara-gtk3-3.mo
Re: update x11/girara 0.3.2
On Mon, Mar 04 2019, Olivier Taïbi wrote: > Thanks for your advice! I confirmed that old zathura still works with > updated girara, so no major bump is needed. Committed, thanks! -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update x11/girara 0.3.2
On 2019/03/04 09:40, Olivier Taïbi wrote: > Thanks for your advice! I confirmed that old zathura still works with > updated girara, so no major bump is needed. > > On Mon, Mar 04, 2019 at 02:31:17AM +0100, Jeremie Courreges-Anglas wrote: > > > > Technically some exported symbols have been removed, so it would be > > a major bump. But said symbols aren't exported any more because > > meson.build now uses "gnu_symbol_visibility: 'hidden'" to build the > > library. Feel free to skip the major bump if you know that zathura > > linked against girara-0.3.0 works fine when using the library from > > girara-0.3.2. > > > > BTW there is a nice tool to check changes in exported symbols: > > /usr/src/lib/check_sym > > > > Apart from the major bump concern, I have noticed the following points > > that could be improved: > > - HOMEPAGE / MASTER_SITES could switch to https > > - WANTLIB should be refreshed (make port-lib-depeends-check) > > - libnotify is not picked up by default any more, is should either be > > explicitely activated or removed from LIB_DEPENDS > > - I switched to https, but cannot test it as the server is experiencing > turbulence at the moment. > - I updated WANTLIB following the recommendation of make > port-lib-depends-check > - the developers decided to disable libnotify by default, so I removed > the dependency > > > This makes your diff hard to apply. If you can't use cvs diff, please > > at least do something like: > > > > cd /build/usr/ports/x11/girara/ && diff -uNprx CVS /usr/ports/x11/girara . > > > > so that we don't have to guess the pathname strip count. > > I would prefer to use cvs diff, but the resulting diff does not include > new and deleted files (perhaps there is an option that I missed?). As long as you don't need to add a directory, you can do this (works OK against anoncvs): cvs add $file cvs rm $file cvs di -uNp
Re: update x11/girara 0.3.2
Thanks for your advice! I confirmed that old zathura still works with
updated girara, so no major bump is needed.
On Mon, Mar 04, 2019 at 02:31:17AM +0100, Jeremie Courreges-Anglas wrote:
>
> Technically some exported symbols have been removed, so it would be
> a major bump. But said symbols aren't exported any more because
> meson.build now uses "gnu_symbol_visibility: 'hidden'" to build the
> library. Feel free to skip the major bump if you know that zathura
> linked against girara-0.3.0 works fine when using the library from
> girara-0.3.2.
>
> BTW there is a nice tool to check changes in exported symbols:
> /usr/src/lib/check_sym
>
> Apart from the major bump concern, I have noticed the following points
> that could be improved:
> - HOMEPAGE / MASTER_SITES could switch to https
> - WANTLIB should be refreshed (make port-lib-depeends-check)
> - libnotify is not picked up by default any more, is should either be
> explicitely activated or removed from LIB_DEPENDS
- I switched to https, but cannot test it as the server is experiencing
turbulence at the moment.
- I updated WANTLIB following the recommendation of make
port-lib-depends-check
- the developers decided to disable libnotify by default, so I removed
the dependency
> This makes your diff hard to apply. If you can't use cvs diff, please
> at least do something like:
>
> cd /build/usr/ports/x11/girara/ && diff -uNprx CVS /usr/ports/x11/girara .
>
> so that we don't have to guess the pathname strip count.
I would prefer to use cvs diff, but the resulting diff does not include
new and deleted files (perhaps there is an option that I missed?).
diff -uNprx CVS /usr/ports/x11/girara/Makefile ./Makefile
--- /usr/ports/x11/girara/Makefile Wed Sep 19 11:35:19 2018
+++ ./Makefile Mon Mar 4 09:21:13 2019
@@ -1,27 +1,26 @@
# $OpenBSD: Makefile,v 1.17 2018/09/19 09:35:19 landry Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.3.0
+DISTNAME = girara-0.3.2
SHARED_LIBS += girara-gtk3 1.0 # 3.1
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11
-HOMEPAGE = http://pwmt.org/projects/girara/
+HOMEPAGE = https://pwmt.org/projects/girara/
# zlib
PERMIT_PACKAGE_CDROM =Yes
-WANTLIB += gdk-3 gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl json-c
-WANTLIB += notify pango-1.0
+WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 gtk-3 intl json-c m pango-1.0 pangocairo-1.0
-MASTER_SITES = http://pwmt.org/projects/girara/download/
+MASTER_SITES = https://pwmt.org/projects/girara/download/
MODULES = devel/meson
BUILD_DEPENDS =devel/gettext-tools
LIB_DEPENDS = x11/gtk+3 \
- devel/json-c \
- devel/libnotify
+ devel/json-c
# c11
COMPILER = base-clang ports-gcc
diff -uNprx CVS /usr/ports/x11/girara/distinfo ./distinfo
--- /usr/ports/x11/girara/distinfo Wed Sep 19 11:35:19 2018
+++ ./distinfo Mon Mar 4 08:56:33 2019
@@ -1,2 +1,2 @@
-SHA256 (girara-0.3.0.tar.xz) = t1L6X/CpjPp3O7z2a7il4zemHLsIXWV3s5eReNF+QaI=
-SIZE (girara-0.3.0.tar.xz) = 57820
+SHA256 (girara-0.3.2.tar.xz) = FwA1OhAfPFIPmyLnnXHqWyaKnsMkeWz55kd12Wuwhs0=
+SIZE (girara-0.3.2.tar.xz) = 58220
diff -uNprx CVS /usr/ports/x11/girara/patches/patch-tests_meson_build
./patches/patch-tests_meson_build
--- /usr/ports/x11/girara/patches/patch-tests_meson_build Wed Sep 19
11:35:19 2018
+++ ./patches/patch-tests_meson_build Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
-$OpenBSD: patch-tests_meson_build,v 1.2 2018/09/19 09:35:19 landry Exp $
-
-env -u (for unset) doesnt exist on OpenBSD
-
-Index: tests/meson.build
tests/meson.build.orig
-+++ tests/meson.build
-@@ -44,7 +44,7 @@ if check.found()
- env.set('XDG_TEST_HELPER_PATH', meson.current_build_dir())
-
- test('tests-without-home', env_bin,
-- args: ['-u', 'HOME', tests],
-+ args: ['HOME', tests],
- env: env,
- timeout: 60*60,
- is_parallel: false
Re: update x11/girara 0.3.2
On Sun, Mar 03 2019, Olivier Taïbi wrote: > Here is an update for x11/girara (a library that it only used by > textproc/zathura, so this update is motivated by an upcoming update for > zathura) > from version 0.3.0 to version 0.3.2. A patch for tests becomes unnecessary. I > compared the output of nm -g oldlib.so.X.Y | cut -c10- | grep -e^T and for > newlib> as suggested in the doc, and the dif is below: > > 3,25d2 > < T acos > < T atan2 > < T ceil > < T cos > < T exp > < T exp2 > < T feclearexcept > < T fedisableexcept > < T feenableexcept > < T fegetenv > < T fegetexcept > < T fegetexceptflag > < T fegetround > < T feholdexcept > < T feraiseexcept > < T fesetenv > < T fesetexceptflag > < T fesetround > < T fetestexcept > < T feupdateenv > < T floor > < T floorf > < T fmod > 167,181d143 > < T hypot > < T log10 > < T log2 > < T lrint > < T nearbyint > < T nearbyintf > < T nearbyintl > < T pow > < T rint > < T rintf > < T round > < T scalbn > < T sin > < T tan > < T trunc > > so only functions from the standard library... I'm not sure why this is, but I > guess no version bump is needed for the SHARED_LIBS version. Technically some exported symbols have been removed, so it would be a major bump. But said symbols aren't exported any more because meson.build now uses "gnu_symbol_visibility: 'hidden'" to build the library. Feel free to skip the major bump if you know that zathura linked against girara-0.3.0 works fine when using the library from girara-0.3.2. BTW there is a nice tool to check changes in exported symbols: /usr/src/lib/check_sym > I have not been > able to "make test" yet (I am building in a chroot and X is needed), but it > works well for me with the new zathura. Apart from the major bump concern, I have noticed the following points that could be improved: - HOMEPAGE / MASTER_SITES could switch to https - WANTLIB should be refreshed (make port-lib-depeends-check) - libnotify is not picked up by default any more, is should either be explicitely activated or removed from LIB_DEPENDS > diff -uNprx CVS /usr/ports/x11/girara/Makefile > /build/usr/ports/x11/girara/Makefile > --- /usr/ports/x11/girara/MakefileWed Sep 19 11:35:19 2018 > +++ /build/usr/ports/x11/girara/Makefile Sat Mar 2 11:59:33 2019 This makes your diff hard to apply. If you can't use cvs diff, please at least do something like: cd /build/usr/ports/x11/girara/ && diff -uNprx CVS /usr/ports/x11/girara . so that we don't have to guess the pathname strip count. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
update x11/girara 0.3.2
Here is an update for x11/girara (a library that it only used by
textproc/zathura, so this update is motivated by an upcoming update for zathura)
from version 0.3.0 to version 0.3.2. A patch for tests becomes unnecessary. I
compared the output of nm -g oldlib.so.X.Y | cut -c10- | grep -e^T and as suggested in the doc, and the dif is below:
3,25d2
< T acos
< T atan2
< T ceil
< T cos
< T exp
< T exp2
< T feclearexcept
< T fedisableexcept
< T feenableexcept
< T fegetenv
< T fegetexcept
< T fegetexceptflag
< T fegetround
< T feholdexcept
< T feraiseexcept
< T fesetenv
< T fesetexceptflag
< T fesetround
< T fetestexcept
< T feupdateenv
< T floor
< T floorf
< T fmod
167,181d143
< T hypot
< T log10
< T log2
< T lrint
< T nearbyint
< T nearbyintf
< T nearbyintl
< T pow
< T rint
< T rintf
< T round
< T scalbn
< T sin
< T tan
< T trunc
so only functions from the standard library... I'm not sure why this is, but I
guess no version bump is needed for the SHARED_LIBS version. I have not been
able to "make test" yet (I am building in a chroot and X is needed), but it
works well for me with the new zathura.
diff -uNprx CVS /usr/ports/x11/girara/Makefile
/build/usr/ports/x11/girara/Makefile
--- /usr/ports/x11/girara/Makefile Wed Sep 19 11:35:19 2018
+++ /build/usr/ports/x11/girara/MakefileSat Mar 2 11:59:33 2019
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2018/09/19 09:35:19 landry Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.3.0
+DISTNAME = girara-0.3.2
SHARED_LIBS += girara-gtk3 1.0 # 3.1
EXTRACT_SUFX = .tar.xz
diff -uNprx CVS /usr/ports/x11/girara/distinfo
/build/usr/ports/x11/girara/distinfo
--- /usr/ports/x11/girara/distinfo Wed Sep 19 11:35:19 2018
+++ /build/usr/ports/x11/girara/distinfoSat Mar 2 11:59:33 2019
@@ -1,2 +1,2 @@
-SHA256 (girara-0.3.0.tar.xz) = t1L6X/CpjPp3O7z2a7il4zemHLsIXWV3s5eReNF+QaI=
-SIZE (girara-0.3.0.tar.xz) = 57820
+SHA256 (girara-0.3.2.tar.xz) = FwA1OhAfPFIPmyLnnXHqWyaKnsMkeWz55kd12Wuwhs0=
+SIZE (girara-0.3.2.tar.xz) = 58220
diff -uNprx CVS /usr/ports/x11/girara/patches/patch-tests_meson_build
/build/usr/ports/x11/girara/patches/patch-tests_meson_build
--- /usr/ports/x11/girara/patches/patch-tests_meson_build Wed Sep 19
11:35:19 2018
+++ /build/usr/ports/x11/girara/patches/patch-tests_meson_build Thu Jan 1
01:00:00 1970
@@ -1,16 +0,0 @@
-$OpenBSD: patch-tests_meson_build,v 1.2 2018/09/19 09:35:19 landry Exp $
-
-env -u (for unset) doesnt exist on OpenBSD
-
-Index: tests/meson.build
tests/meson.build.orig
-+++ tests/meson.build
-@@ -44,7 +44,7 @@ if check.found()
- env.set('XDG_TEST_HELPER_PATH', meson.current_build_dir())
-
- test('tests-without-home', env_bin,
-- args: ['-u', 'HOME', tests],
-+ args: ['HOME', tests],
- env: env,
- timeout: 60*60,
- is_parallel: false
Re: [UPDATE] x11/girara 0.2.5->0.2.6
On Wed, Jun 15, 2016 at 01:02:24AM +0200, Jakub Skrzypnik wrote: > On Tue, 14 Jun 2016 21:31:03 +0200 > Landry Breuil wrote: > > > We don't do that symlink dance - which you would have noticed if you > > had ran make update-plist > > Thanks for explaining, I've not looked in PLIST _after_ updating the > port, can't remember why. > > > Fixed patch attached - i have to admit that it changes nothing for me > > in zathura. > > When you're zooming in on default GTK3 theme (Adwaita or something), > it's very visible. Okay, no i see what you mean, and indeed the update fixes the issue. Commited. Thanks! Landry
Re: [UPDATE] x11/girara 0.2.5->0.2.6
On Tue, 14 Jun 2016 21:31:03 +0200 Landry Breuil wrote: > We don't do that symlink dance - which you would have noticed if you > had ran make update-plist Thanks for explaining, I've not looked in PLIST _after_ updating the port, can't remember why. > Fixed patch attached - i have to admit that it changes nothing for me > in zathura. When you're zooming in on default GTK3 theme (Adwaita or something), it's very visible. Examples: https://bbs.archlinux.org/viewtopic.php?pid=1518406 https://dl.dropboxusercontent.com/u/20481401/archlinux/zathura_black_stripes.png https://www.reddit.com/r/archlinux/comments/377pll/ http://i.imgur.com/cUcosRI.gif
Re: [UPDATE] x11/girara 0.2.5->0.2.6
On Fri, Jun 10, 2016 at 04:24:08AM +0200, Jakub Skrzypnik wrote:
> Hi
>
> My first contribution into /usr/ports after infamous x11/mpv port.
> Updates x11/girara to 0.2.6, fixes bug which caused to show ugly black
> bars around window in x11/zathura (or any other program using it) and
> made reading PDFs uncomfortable.
>
> Makefile patch were also removed, because I couldn't find what to patch
> there again, seems like upstream fixed that issue too.
Sorry, the Makefile patch shouldnt be removed, as without it it's doing
wrong things when linking the library and doing the usual symlink dance.
[LD] build/release/bin/libgirara-gtk3.so.0.1
cc -Wl,-soname,libgirara-gtk3.so.2 \
-shared -fPIC -o build/release/bin/libgirara-gtk3.so.0.1
-soname is wrong here
install -m 644 build/release/bin/libgirara-gtk3.so.0.1
/usr/obj/ports/girara-0.2.6/fake-amd64/usr/local/lib
ln -sf libgirara-gtk3.so.0.1
/usr/obj/ports/girara-0.2.6/fake-amd64/usr/local/lib/libgirara-gtk3.so.2
|| \
echo "Failed to create libgirara-gtk3.so.2. Please check if it
exists and points to the correct version of libgirara-gtk3.so."
ln -sf libgirara-gtk3.so.0.1
/usr/obj/ports/girara-0.2.6/fake-amd64/usr/local/lib/libgirara-gtk3.so
|| \
echo "Failed to create libgirara-gtk3.so. Please check if it
exists and points to the correct version of libgirara-gtk3.so."
We don't do that symlink dance - which you would have noticed if you had
ran make update-plist
Fixed patch attached - i have to admit that it changes nothing for me in
zathura.
Landry
? girara-0.2.5-libgirara-gtk3.so.0.1
? girara-0.2.6-libgirara-gtk3.so.0.1
Index: Makefile
===
RCS file: /cvs/ports/x11/girara/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile30 Dec 2015 09:56:28 - 1.6
+++ Makefile14 Jun 2016 19:30:35 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2015/12/30 09:56:28 ajacoutot Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.2.5
+DISTNAME = girara-0.2.6
SHARED_LIBS += girara-gtk3 0.1 # 2.3
Index: distinfo
===
RCS file: /cvs/ports/x11/girara/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo30 Dec 2015 09:56:28 - 1.4
+++ distinfo14 Jun 2016 19:30:35 -
@@ -1,2 +1,2 @@
-SHA256 (girara-0.2.5.tar.gz) = XPTy0EQ4Wxie2OnvyuhTLbHy1jokCh4ibzSRyZarqJI=
-SIZE (girara-0.2.5.tar.gz) = 75215
+SHA256 (girara-0.2.6.tar.gz) = 66abNSK00UngbRM95Sh3kTJ1hzxQWZP60ItteITsmg8=
+SIZE (girara-0.2.6.tar.gz) = 75841
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/girara/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile
--- patches/patch-Makefile 30 Dec 2015 09:56:28 - 1.3
+++ patches/patch-Makefile 14 Jun 2016 19:30:35 -
@@ -1,27 +1,27 @@
-$OpenBSD: patch-Makefile,v 1.3 2015/12/30 09:56:28 ajacoutot Exp $
+$OpenBSD$
Create libs with a correct soname.
Don't symlink libs.
Makefile.orig Mon Dec 21 11:13:39 2015
-+++ Makefile Wed Dec 30 10:50:28 2015
-@@ -118,7 +118,7 @@ ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a: ${OBJEC
- ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}: ${OBJECTS}
+--- Makefile.orig Tue Jun 14 21:20:42 2016
Makefile Tue Jun 14 21:25:35 2016
+@@ -134,7 +134,7 @@ ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a: ${OBJEC
+ ${BUILDDIR_RELEASE}/${BINDIR}/${SOVERSIONFILE}: ${OBJECTS}
$(call colorecho,LD,$@)
@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
-- $(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOMAJOR} \
-+ $(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOVERSION} \
- ${SHARED_FLAG} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
+- $(QUIET)${CC} -Wl,${SONAME_FLAG},${BUILDSOMAJORFILE} \
++ $(QUIET)${CC} -Wl,${SONAME_FLAG},${SOVERSIONFILE} \
+ ${SHARED_FLAG} ${PLATFORMFLAGS} ${LDFLAGS} -o $@ ${OBJECTS}
${LIBS}
${PROJECT}: static shared
-@@ -250,10 +250,6 @@ install-shared: shared
+@@ -266,10 +266,6 @@ install-shared: shared
$(call colorecho,INSTALL,"Install shared library")
$(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
- $(QUIET)install -m 644
${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}
-- $(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION}
${DESTDIR}${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} || \
-- echo "Failed to create lib${PROJECT}.so.${SOMAJOR}. Please
check if it exists and points to the correct version of lib${PROJECT}.so."
-- $(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION}
${DESTDIR}${LIBDIR}/lib${PROJECT}.so || \
-- echo "Failed to create lib${PROJECT}.so. Please check if it
exists and points to the correct version of lib${PROJECT}.so."
+ $(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/${SOV
Re: [UPDATE] x11/girara 0.2.5->0.2.6
Ping.
Re: [UPDATE] x11/girara 0.2.5->0.2.6
On Fri, 10 Jun 2016 04:24:08 +0200 Jakub Skrzypnik wrote: > ok? " skrzyp: cool, good job. one thing i'll mention is that "ok?" makes it sound like you have commit access" Just what blakkheim said, I don't have access to the cvs, but I took that line a kind of folklor here, but while it looks like something more official, I should say sorry for any misleading. -- Jakub Skrzypnik
[UPDATE] x11/girara 0.2.5->0.2.6
Hi
My first contribution into /usr/ports after infamous x11/mpv port.
Updates x11/girara to 0.2.6, fixes bug which caused to show ugly black
bars around window in x11/zathura (or any other program using it) and
made reading PDFs uncomfortable.
Makefile patch were also removed, because I couldn't find what to patch
there again, seems like upstream fixed that issue too.
cc ajacoutot@
ok?Index: Makefile
===
RCS file: /cvs/ports/x11/girara/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 30 Dec 2015 09:56:28 - 1.6
+++ Makefile 10 Jun 2016 02:10:12 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2015/12/30 09:56:28 ajacoutot Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.2.5
+DISTNAME = girara-0.2.6
SHARED_LIBS += girara-gtk3 0.1 # 2.3
Index: distinfo
===
RCS file: /cvs/ports/x11/girara/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 30 Dec 2015 09:56:28 - 1.4
+++ distinfo 10 Jun 2016 02:10:12 -
@@ -1,2 +1,2 @@
-SHA256 (girara-0.2.5.tar.gz) = XPTy0EQ4Wxie2OnvyuhTLbHy1jokCh4ibzSRyZarqJI=
-SIZE (girara-0.2.5.tar.gz) = 75215
+SHA256 (girara-0.2.6.tar.gz) = 66abNSK00UngbRM95Sh3kTJ1hzxQWZP60ItteITsmg8=
+SIZE (girara-0.2.6.tar.gz) = 75841
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 30 Dec 2015 09:56:28 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2015/12/30 09:56:28 ajacoutot Exp $
-
-Create libs with a correct soname.
-Don't symlink libs.
-
Makefile.orig Mon Dec 21 11:13:39 2015
-+++ Makefile Wed Dec 30 10:50:28 2015
-@@ -118,7 +118,7 @@ ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a: ${OBJEC
- ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}: ${OBJECTS}
- $(call colorecho,LD,$@)
- @mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
-- $(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOMAJOR} \
-+ $(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOVERSION} \
- ${SHARED_FLAG} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
-
- ${PROJECT}: static shared
-@@ -250,10 +250,6 @@ install-shared: shared
- $(call colorecho,INSTALL,"Install shared library")
- $(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
- $(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}
-- $(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} || \
-- echo "Failed to create lib${PROJECT}.so.${SOMAJOR}. Please check if it exists and points to the correct version of lib${PROJECT}.so."
-- $(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so || \
-- echo "Failed to create lib${PROJECT}.so. Please check if it exists and points to the correct version of lib${PROJECT}.so."
-
- install-headers: ${PROJECTNV}/version.h ${BUILDDIR}/${PROJECT}.pc
- $(call colorecho,INSTALL,"Install pkg-config file")
UPDATE: x11/girara-0.2.3
Hi,
Update Girara to 0.2.3 -- needed for zathura update (posting soon).
Not sure where 0.0 came from in the SHARED_LIBS comment, as upstream use the
release version as the library version. upstream assure me that backwards
compatibility has not been broken since 0.1.x, thus a minor bump.
Comments, OK?
Index: Makefile
===
RCS file: /home/edd/cvsync/ports/x11/girara/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile29 Sep 2014 19:57:31 - 1.2
+++ Makefile24 Nov 2014 20:47:44 -
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2014/09/29 19:57:31 jasper Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.2.2
+DISTNAME = girara-0.2.3
-SHARED_LIBS += girara-gtk3 0.0 # 0.0
+SHARED_LIBS += girara-gtk3 0.1 # 2.3
CATEGORIES = x11
HOMEPAGE = http://pwmt.org/projects/girara/
@@ -23,14 +23,14 @@ WANTLIB += notify pango-1.0 pangocairo-1
USE_GMAKE =Yes
-MAKE_FLAGS += QUIET= TPUT=true
+MAKE_FLAGS += VERBOSE=1 TPUT=true COLOR=0
MAKE_FLAGS += SOVERSION=${LIBgirara-gtk3_VERSION}
FAKE_FLAGS += PREFIX=${TRUEPREFIX}
TEST_TARGET = test
TEST_DEPENDS = devel/check
-TEST_FLAGS += QUIET=
+TEST_FLAGS += VERBOSE=1
TEST_FLAGS += HOME=${WRKDIR}
TEST_IS_INTERACTIVE =X11
Index: distinfo
===
RCS file: /home/edd/cvsync/ports/x11/girara/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo2 Sep 2014 13:22:32 - 1.1.1.1
+++ distinfo24 Nov 2014 12:48:39 -
@@ -1,2 +1,2 @@
-SHA256 (girara-0.2.2.tar.gz) = Y4Lf3xzH3f7fPR7OWn8HWQxJtJMhhO6N7G0r0SHmZlM=
-SIZE (girara-0.2.2.tar.gz) = 72553
+SHA256 (girara-0.2.3.tar.gz) = sH/M5QmifFkXqZfrCMxcjaIOkBP1muiTZ/8Ejy6uDt4=
+SIZE (girara-0.2.3.tar.gz) = 74107
Index: pkg/PLIST
===
RCS file: /home/edd/cvsync/ports/x11/girara/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 2 Sep 2014 13:22:32 - 1.1.1.1
+++ pkg/PLIST 24 Nov 2014 12:48:39 -
@@ -6,6 +6,7 @@ include/girara/completion.h
include/girara/config.h
include/girara/css-definitions.h
include/girara/datastructures.h
+include/girara/entry.h
include/girara/girara.h
include/girara/input-history.h
include/girara/macros.h
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
