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
--- Makefile 30 Dec 2015 09:56:28 -0000 1.6
+++ Makefile 14 Jun 2016 19:30:35 -0000
@@ -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
--- distinfo 30 Dec 2015 09:56:28 -0000 1.4
+++ distinfo 14 Jun 2016 19:30:35 -0000
@@ -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 -0000 1.3
+++ patches/patch-Makefile 14 Jun 2016 19:30:35 -0000
@@ -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}/${SOVERSIONFILE}
${DESTDIR}${LIBDIR}
+- $(QUIET)ln -sf ${SOVERSIONFILE} ${DESTDIR}${LIBDIR}/${SOMAJORFILE} || \
+- echo "Failed to create ${SOMAJORFILE}. Please check if it
exists and points to the correct version of ${SOFILE}."
+- $(QUIET)ln -sf ${SOVERSIONFILE} ${DESTDIR}${LIBDIR}/${SOFILE} || \
+- echo "Failed to create ${SOFILE}. Please check if it exists and
points to the correct version of ${SOFILE}."
install-headers: ${PROJECTNV}/version.h ${BUILDDIR}/${PROJECT}.pc
$(call colorecho,INSTALL,"Install pkg-config file")
