Index: graphics/zathura/Makefile =================================================================== --- graphics/zathura/Makefile (revision 376074) +++ graphics/zathura/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zathura -PORTVERSION= 0.2.9 +PORTVERSION= 0.3.2 CATEGORIES= graphics print MASTER_SITES= http://pwmt.org/projects/zathura/download/ @@ -9,6 +9,11 @@ MAINTAINER= quentin.stievenart@gmail.com COMMENT= Customizable lightweight pdf viewer +LICENSE= pwmt +LICENSE_NAME= pwmt license +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= dist-mirror pkg-mirror auto-accept + LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libgirara-gtk3.so:${PORTSDIR}/x11-toolkits/girara BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils @@ -52,7 +57,7 @@ -e 's/DL_LIB /#&/' \ ${WRKSRC}/config.mk ${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \ - ${WRKSRC}/config.h \ + ${WRKSRC}/zathura/config.h \ ${WRKSRC}/doc/man/zathurarc.5.rst (cd ${WRKSRC}; ${RM} -f zathura.1 zathurarc.5) Index: graphics/zathura/distinfo =================================================================== --- graphics/zathura/distinfo (revision 376074) +++ graphics/zathura/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (zathura-0.2.9.tar.gz) = 2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f -SIZE (zathura-0.2.9.tar.gz) = 196690 +SHA256 (zathura-0.3.2.tar.gz) = fda6503dc5b21f7c667301798fbd2c978897e68b4555e8c731945cecd9d165e2 +SIZE (zathura-0.3.2.tar.gz) = 202943 Index: graphics/zathura/files/patch-zathura_page-widget.c =================================================================== --- graphics/zathura/files/patch-zathura_page-widget.c (revision 0) +++ graphics/zathura/files/patch-zathura_page-widget.c (working copy) @@ -0,0 +1,76 @@ +X-Git-Url: https://git.pwmt.org/?p=zathura.git;a=blobdiff_plain;f=zathura%2Fpage-widget.c;h=ad27c273f1ba04b66dd8a84337febec3729a68af;hp=309f63321cdbc27694fcba964faa3c4ecc48295f;hb=8d71a755d648c5856ef91d214bfdb46925f6c2f0;hpb=10f3da57c65a8ed7d4d3beff3e49da2bcddcf7a7 + +diff --git zathura/page-widget.c zathura/page-widget.c.orig +index 309f633..ad27c27 100644 +--- zathura/page-widget.c ++++ zathura/page-widget.c.orig +@@ -28,8 +28,8 @@ typedef struct zathura_page_widget_private_s { + + struct { + girara_list_t* list; /**< List of links on the page */ +- bool retrieved; /**< True if we already tried to retrieve the list of links */ +- bool draw; /**< True if links should be drawn */ ++ gboolean retrieved; /**< True if we already tried to retrieve the list of links */ ++ gboolean draw; /**< True if links should be drawn */ + unsigned int offset; /**< Offset to the links */ + unsigned int n; /**< Number */ + } links; +@@ -37,12 +37,12 @@ typedef struct zathura_page_widget_private_s { + struct { + girara_list_t* list; /**< A list if there are search results that should be drawn */ + int current; /**< The index of the current search result */ +- bool draw; /**< Draw search results */ ++ gboolean draw; /**< Draw search results */ + } search; + + struct { + girara_list_t* list; /**< List of images on the page */ +- bool retrieved; /**< True if we already tried to retrieve the list of images */ ++ gboolean retrieved; /**< True if we already tried to retrieve the list of images */ + zathura_image_t* current; /**< Image data of selected image */ + } images; + +@@ -52,7 +52,7 @@ typedef struct zathura_page_widget_private_s { + int x; /**< X coordinate */ + int y; /**< Y coordinate */ + } selection_basepoint; +- bool over_link; ++ gboolean over_link; + } mouse; + } zathura_page_widget_private_t; + +@@ -313,13 +313,13 @@ zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* v + case PROP_DRAW_LINKS: + priv->links.draw = g_value_get_boolean(value); + /* get links */ +- if (priv->links.draw == true && priv->links.retrieved == false) { ++ if (priv->links.draw == TRUE && priv->links.retrieved == FALSE) { + priv->links.list = zathura_page_links_get(priv->page, NULL); +- priv->links.retrieved = true; ++ priv->links.retrieved = TRUE; + priv->links.n = (priv->links.list == NULL) ? 0 : girara_list_size(priv->links.list); + } + +- if (priv->links.retrieved == true && priv->links.list != NULL) { ++ if (priv->links.retrieved == TRUE && priv->links.list != NULL) { + GIRARA_LIST_FOREACH(priv->links.list, zathura_link_t*, iter, link) + if (link != NULL) { + zathura_rectangle_t rectangle = recalc_rectangle(priv->page, zathura_link_get_position(link)); +@@ -338,7 +338,7 @@ zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* v + } + priv->search.list = g_value_get_pointer(value); + if (priv->search.list != NULL && priv->search.draw) { +- priv->links.draw = false; ++ priv->links.draw = FALSE; + redraw_all_rects(pageview, priv->search.list); + } + priv->search.current = -1; +@@ -355,7 +355,7 @@ zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* v + priv->search.current = girara_list_size(priv->search.list); + } else { + priv->search.current = val; +- if (priv->search.draw == true && val >= 0 && val < (signed) girara_list_size(priv->search.list)) { ++ if (priv->search.draw == TRUE && val >= 0 && val < (signed) girara_list_size(priv->search.list)) { + zathura_rectangle_t* rect = girara_list_nth(priv->search.list, priv->search.current); + zathura_rectangle_t rectangle = recalc_rectangle(priv->page, *rect); + redraw_rect(pageview, &rectangle); Property changes on: graphics/zathura/files/patch-zathura_page-widget.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/zathura/files/patch-zathura_shortcuts.c =================================================================== --- graphics/zathura/files/patch-zathura_shortcuts.c (revision 0) +++ graphics/zathura/files/patch-zathura_shortcuts.c (working copy) @@ -0,0 +1,20 @@ +X-Git-Url: https://git.pwmt.org/?p=zathura.git;a=blobdiff_plain;f=zathura%2Fshortcuts.c;h=93182c0835f3c41157637f7d2b78dbb7ff3b1328;hp=0e6ca6349a529a9faff75f2a445f7cf0b7a3c98c;hb=8d71a755d648c5856ef91d214bfdb46925f6c2f0;hpb=10f3da57c65a8ed7d4d3beff3e49da2bcddcf7a7 + +diff --git zathura/shortcuts.c zathura/shortcuts.c.orig +index 0e6ca63..93182c0 100644 +--- zathura/shortcuts.c ++++ zathura/shortcuts.c.orig +@@ -861,9 +861,11 @@ sc_search(girara_session_t* session, girara_argument_t* argument, + const unsigned int num_pages = zathura_document_get_number_of_pages(zathura->document); + const unsigned int cur_page = zathura_document_get_current_page_number(zathura->document); + GtkWidget *cur_page_widget = zathura_page_get_widget(zathura, zathura_document_get_page(zathura->document, cur_page)); +- bool nohlsearch, first_time_after_abort, draw; ++ bool nohlsearch, first_time_after_abort; ++ gboolean draw; + +- nohlsearch = first_time_after_abort = draw = false; ++ nohlsearch = first_time_after_abort = false; ++ draw = FALSE; + girara_setting_get(session, "nohlsearch", &nohlsearch); + + if (nohlsearch == false) { Property changes on: graphics/zathura/files/patch-zathura_shortcuts.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/zathura/pkg-plist =================================================================== --- graphics/zathura/pkg-plist (revision 376074) +++ graphics/zathura/pkg-plist (working copy) @@ -9,6 +9,7 @@ libdata/pkgconfig/zathura.pc man/man1/zathura.1.gz man/man5/zathurarc.5.gz +share/appdata/zathura.appdata.xml share/applications/zathura.desktop share/dbus-1/interfaces/org.pwmt.zathura.xml %%NLS%%share/locale/ca/LC_MESSAGES/zathura.mo