girara 0.2.4 master
authorYaakov Selkowitz <yselkowi@redhat.com>
Thu, 27 Aug 2015 21:43:30 +0000 (16:43 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Thu, 27 Aug 2015 21:43:30 +0000 (16:43 -0500)
0.1.6-cygwin.patch [deleted file]
0.2.4-cygwin.patch [new file with mode: 0644]
girara.cygport

diff --git a/0.1.6-cygwin.patch b/0.1.6-cygwin.patch
deleted file mode 100644 (file)
index 18d2fe5..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
---- origsrc/girara-0.1.6/Makefile      2013-05-12 16:09:14.000000000 -0500
-+++ src/girara-0.1.6/Makefile  2013-07-30 12:53:48.335521400 -0500
-@@ -49,15 +49,15 @@ ${DOBJECTS}: config.mk version.h
- ${PROJECT}: static shared
- static: lib${PROJECT}.a
--shared: lib${PROJECT}.so.${SOVERSION}
-+shared: cyg${PROJECT}-${SOMAJOR}.dll
- lib${PROJECT}.a: ${OBJECTS}
-       $(ECHO) AR rcs $@
-       $(QUIET)ar rcs $@ ${OBJECTS}
--lib${PROJECT}.so.${SOVERSION}: ${OBJECTS}
-+cyg${PROJECT}-${SOMAJOR}.dll: ${OBJECTS}
-       $(ECHO) LD $@
--      $(QUIET)${CC} -Wl,-soname,lib${PROJECT}.so.${SOMAJOR} -shared ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
-+      $(QUIET)${CC} -Wl,--out-implib,lib${PROJECT}.dll.a -shared ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
- clean:
-       $(QUIET)rm -rf ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
-@@ -128,12 +128,10 @@ install-static: static
- install-shared: shared
-       $(ECHO) installing shared library
-+      $(QUIET)mkdir -m 755 -p ${DESTDIR}${BINDIR}
-       $(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
--      $(QUIET)install -m 644 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 cyg${PROJECT}-${SOMAJOR}.dll ${DESTDIR}${BINDIR}
-+      $(QUIET)install -m 644 lib${PROJECT}.dll.a ${DESTDIR}${LIBDIR}
- install: options po install-static install-shared install-headers
-               $(QUIET)${MAKE} -C po install
---- origsrc/girara-0.1.6/config.mk     2013-05-12 16:09:14.000000000 -0500
-+++ src/girara-0.1.6/config.mk 2013-07-30 12:53:00.053759800 -0500
-@@ -17,6 +17,7 @@ SOVERSION = ${SOMAJOR}.${SOMINOR}
- # paths
- PREFIX ?= /usr
-+BINDIR ?= ${PREFIX}/bin
- LIBDIR ?= ${PREFIX}/lib
- INCLUDEDIR ?= ${PREFIX}/include
- # locale directory
diff --git a/0.2.4-cygwin.patch b/0.2.4-cygwin.patch
new file mode 100644 (file)
index 0000000..2dbc6f8
--- /dev/null
@@ -0,0 +1,36 @@
+--- origsrc/girara-0.2.4/Makefile      2015-04-13 15:49:26.000000000 -0500
++++ src/girara-0.2.4/Makefile  2015-08-27 16:16:35.318521000 -0500
+@@ -117,10 +117,16 @@ ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJE
+       $(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOMAJOR} \
+               ${SHARED_FLAG} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
++${BUILDDIR_RELEASE}/${BINDIR}/cyg${PROJECT}-${SOMAJOR}.dll: ${OBJECTS}
++      $(call colorecho,LD,$@)
++      @mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
++      $(QUIET)${CC} -Wl,--out-implib,${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.dll.a \
++              ${SHARED_FLAG} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
++
+ ${PROJECT}: static shared
+ ${PROJECTNV}: ${PROJECT}
+ static: ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a
+-shared: ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}
++shared: ${BUILDDIR_RELEASE}/${BINDIR}/cyg${PROJECT}-${SOMAJOR}.dll
+ release: ${PROJECT}
+ # debug build
+@@ -244,12 +250,10 @@ install-static: static
+ install-shared: shared
+       $(call colorecho,INSTALL,"Install shared library")
++      $(QUIET)mkdir -m 755 -p ${DESTDIR}${PREFIX}/bin
+       $(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}/cyg${PROJECT}-${SOMAJOR}.dll ${DESTDIR}${PREFIX}/bin
++      $(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.dll.a ${DESTDIR}${LIBDIR}
+ install-headers: ${PROJECTNV}/version.h ${BUILDDIR}/${PROJECT}.pc
+       $(call colorecho,INSTALL,"Install pkg-config file")
index 97a5401e140f367c12269ea0eff5260854b61b57..f3f4513d6eb7ec19cc3d2f13783263bc6e994da7 100644 (file)
@@ -1,5 +1,5 @@
 NAME="girara"
-VERSION=0.2.0
+VERSION=0.2.4
 RELEASE=1
 CATEGORY="Libs"
 SUMMARY="GTK+-based minimalistic user interface library"
@@ -9,13 +9,12 @@ user interface that is used by zathura and jumanji and other features that
 those applications share."
 HOMEPAGE="http://pwmt.org/projects/girara/"
 SRC_URI="http://pwmt.org/projects/girara/download/${NAME}-${VERSION}.tar.gz"
-PATCH_URI="0.1.6-cygwin.patch"
+PATCH_URI="0.2.4-cygwin.patch"
 
-PKG_NAMES="libgirara-common libgirara-gtk3_1 libgirara-devel"
+PKG_NAMES="libgirara-common libgirara-gtk3_2 libgirara-devel"
 libgirara_common_CONTENTS="usr/share/doc/"
-libgirara_gtk3_1_REQUIRES="libgirara-common"
-libgirara_gtk3_1_CONTENTS="usr/bin/cyggirara-gtk3-1.dll usr/share/locale/*/*/libgirara-gtk3-1.mo"
-libgirara_devel_OBSOLETES="libgirara-gtk2-devel"
+libgirara_gtk3_2_REQUIRES="libgirara-common"
+libgirara_gtk3_2_CONTENTS="usr/bin/cyggirara-gtk3-2.dll usr/share/locale/*/*/libgirara-gtk3-2.mo"
 libgirara_devel_CONTENTS="usr/include/ usr/lib/lib* usr/lib/pkgconfig/"
 
 src_compile() {
@@ -23,12 +22,11 @@ src_compile() {
        cd ${B}
        cygmake \
                CC=${CC} CFLAGS="${CFLAGS} -std=c99 \$(INCS)" \
-               LDFLAGS="${LDFLAGS}" \
-               GIRARA_GTK_VERSION=2
+               LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
        cd ${B}
-       cygmake install-shared install-headers DESTDIR=${D} GIRARA_GTK_VERSION=2
-       cyginstall -C po GIRARA_GTK_VERSION=2
+       cygmake install-shared install-headers DESTDIR=${D}
+       cyginstall -C po
 }
This page took 0.025775 seconds and 5 git commands to generate.