update to 4.6

normalize icon and desktop stuff

from Alexandr Shadchin with some tweaks
This commit is contained in:
steven 2010-09-18 11:19:24 +00:00
parent 99ca5c3dd2
commit de4638db45
4 changed files with 60 additions and 22 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2009/08/10 06:31:44 kili Exp $
# $OpenBSD: Makefile,v 1.5 2010/09/18 11:19:24 steven Exp $
COMMENT= portable DjVu viewer and browser plugin
DISTNAME= djview4-4.4
PKGNAME= ${DISTNAME}p1
DISTNAME= djview4-4.6
CATEGORIES= graphics print
HOMEPAGE= http://djvu.sourceforge.net/djview4.html
# GPL v2
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -16,20 +15,21 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/}
WANTLIB= ICE SM X11 Xext Xi Xinerama Xrender \
c m z stdc++ fontconfig freetype pthread \
glib-2.0 gthread-2.0 iconv intl png jpeg tiff \
expat gobject-2.0 pthread-stubs xcb
WANTLIB += QtGui QtNetwork X11 Xext c djvulibre m pthread stdc++ tiff
MODULES= x11/qt4
LIB_DEPENDS= djvulibre::graphics/djvulibre \
QtGui,QtNetwork::x11/qt4
LIB_DEPENDS= ::graphics/djvulibre
BUILD_DEPENDS= ::graphics/ImageMagick \
::x11/gnome/librsvg
RUN_DEPENDS= ::devel/desktop-file-utils \
::x11/hicolor-icon-theme
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-tiff=${LOCALBASE} \
--with-qt=${MODQT_LIBDIR}
CONFIGURE_ARGS= --with-tiff=${LOCALBASE}
CONFIGURE_ENV+= QTDIR="${MODQT4_QTDIR}" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"

View File

@ -1,5 +1,5 @@
MD5 (djview4-4.4.tar.gz) = RmIlxVRq7ZAAjWEs20kKTg==
RMD160 (djview4-4.4.tar.gz) = z1+3jaLV1XIjNWEgw35eyBk3ues=
SHA1 (djview4-4.4.tar.gz) = tx61O1Ad+rrjgQKvIh8vGIQYHWs=
SHA256 (djview4-4.4.tar.gz) = Tz/ntIlzENLqVZhy9N0g8dCwF0gIV7BN1BO8q0sP6Lw=
SIZE (djview4-4.4.tar.gz) = 837828
MD5 (djview4-4.6.tar.gz) = ZCEFlwRnzwhkwAcxQNH6EQ==
RMD160 (djview4-4.6.tar.gz) = qRFkZrodwkQe04WSiy9U1x+rUls=
SHA1 (djview4-4.6.tar.gz) = ctmP3pxkBu5xSDARjQZ2e1YZQf0=
SHA256 (djview4-4.6.tar.gz) = A2IFzaHxNDAb2/LbaRE6hvAUzkeTPpoV2lRof+co2Vs=
SIZE (djview4-4.6.tar.gz) = 893657

View File

@ -0,0 +1,34 @@
$OpenBSD: patch-desktopfiles_Makefile_in,v 1.1 2010/09/18 11:19:24 steven Exp $
--- desktopfiles/Makefile.in.orig Sat Mar 20 21:38:33 2010
+++ desktopfiles/Makefile.in Sun Aug 29 21:11:01 2010
@@ -39,6 +39,8 @@ XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
RM = @RM@
datadir_djview = ${datadir}/djvu/djview4/desktop
+datadir_applications = ${datadir}/applications
+datadir_icons = ${datadir}/icons/hicolor
# -------- all
@@ -70,13 +72,14 @@ register-djview-menu: register-djview-menu.in
install: install-djview-files
install-djview-files: FORCE
- ${INSTALL} -d ${DESTDIR}${datadir_djview}
- ${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
- ${INSTALL_DATA} *djview4.png ${DESTDIR}${datadir_djview}
- ${INSTALL_DATA} *djview4.svgz ${DESTDIR}${datadir_djview}
- ${INSTALL_PROGRAM} ${srcdir}/*djview4.desktop ${DESTDIR}${datadir_djview}
- -@echo "Run ${datadir_djview}/register-djview-menu install"
- -@echo " to register the djview3 menu entries."
+ ${INSTALL} -d ${DESTDIR}${datadir_applications}
+ ${INSTALL_DATA} djvulibre-djview4.desktop ${DESTDIR}${datadir_applications}/djvulibre-djview4.desktop
+ ${INSTALL} -d ${DESTDIR}${datadir_icons}/32x32/apps
+ ${INSTALL_DATA} hi32-djview4.png ${DESTDIR}${datadir_icons}/32x32/apps/djvulibre-djview4.png
+ ${INSTALL} -d ${DESTDIR}${datadir_icons}/64x64/apps
+ ${INSTALL_DATA} hi64-djview4.png ${DESTDIR}${datadir_icons}/64x64/apps/djvulibre-djview4.png
+ ${INSTALL} -d ${DESTDIR}${datadir_icons}/scalable/apps
+ ${INSTALL_DATA} djview.svg ${DESTDIR}${datadir_icons}/scalable/apps/djvulibre-djview4.svg
# -------- misc

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2008/10/30 14:54:20 steven Exp $
@comment $OpenBSD: PLIST,v 1.3 2010/09/18 11:19:24 steven Exp $
%%SHARED%%
bin/djview
@bin bin/djview4
@ -7,14 +7,18 @@ lib/netscape/plugins/
@man man/man1/djview.1
@man man/man1/djview4.1
@man man/man1/nsdejavu.1
share/applications/djvulibre-djview4.desktop
share/djvu/
share/djvu/djview4/
share/djvu/djview4/desktop/
share/djvu/djview4/desktop/djvulibre-djview4.desktop
share/djvu/djview4/desktop/hi32-djview4.png
share/djvu/djview4/desktop/register-djview-menu
share/djvu/djview4/djview_cs.qm
share/djvu/djview4/djview_de.qm
share/djvu/djview4/djview_fr.qm
share/djvu/djview4/djview_ru.qm
share/djvu/djview4/djview_uk.qm
share/icons/hicolor/32x32/apps/djvulibre-djview4.png
share/icons/hicolor/64x64/apps/djvulibre-djview4.png
share/icons/hicolor/scalable/apps/djvulibre-djview4.svg
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true