pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/gtk-vnc drop firefox option and add plugin option ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8ecd48ee1ddf
branches: trunk
changeset: 399196:8ecd48ee1ddf
user: tnn <tnn%pkgsrc.org@localhost>
date: Mon Sep 14 10:07:03 2009 +0000
description:
drop firefox option and add plugin option instead.
XXX builds but I wasn't able to get it to display anything and there
are no example "application/x-gtk-vnc" files in the distribution.
diffstat:
net/gtk-vnc/PLIST | 4 +-
net/gtk-vnc/distinfo | 7 +-
net/gtk-vnc/options.mk | 13 +-
net/gtk-vnc/patches/patch-ac | 4 +-
net/gtk-vnc/patches/patch-ad | 1297 ++++++++++++++++++++++++++++++++++++++++++
net/gtk-vnc/patches/patch-ae | 36 +
net/gtk-vnc/patches/patch-af | 31 +
7 files changed, 1379 insertions(+), 13 deletions(-)
diffs (truncated from 1451 to 300 lines):
diff -r 54af8dd6688b -r 8ecd48ee1ddf net/gtk-vnc/PLIST
--- a/net/gtk-vnc/PLIST Mon Sep 14 09:30:24 2009 +0000
+++ b/net/gtk-vnc/PLIST Mon Sep 14 10:07:03 2009 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/09/14 10:07:03 tnn Exp $
include/gtk-vnc-1.0/vncdisplay.h
-${PLIST.firefox}lib/firefox/plugins/gtk-vnc-plugin.so
+${PLIST.plugin}lib/netscape/plugins/gtk-vnc-plugin.so
lib/libgtk-vnc-1.0.la
lib/pkgconfig/gtk-vnc-1.0.pc
${PLIST.python}${PYSITELIB}/gtkvnc.la
diff -r 54af8dd6688b -r 8ecd48ee1ddf net/gtk-vnc/distinfo
--- a/net/gtk-vnc/distinfo Mon Sep 14 09:30:24 2009 +0000
+++ b/net/gtk-vnc/distinfo Mon Sep 14 10:07:03 2009 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/04/06 10:17:32 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/09/14 10:07:03 tnn Exp $
SHA1 (gtk-vnc-0.3.8.tar.gz) = 58b729504df8ce8a043bfbf6351d751e8c8b8a09
RMD160 (gtk-vnc-0.3.8.tar.gz) = d0fe46cf6fba4e68165e91a54f9373eff3d77932
Size (gtk-vnc-0.3.8.tar.gz) = 610526 bytes
SHA1 (patch-aa) = e59cd2080d9d88d4d689f10ed15738aa3309dcf3
SHA1 (patch-ab) = e4e34a1f664de13a1c27c3c53eeed5b62d9f988c
-SHA1 (patch-ac) = fe2e85bcbe8df464ab50cdb17afc80ba74ab999b
+SHA1 (patch-ac) = 83a7dde7c9f3833abd2b0a0bd177ac79d79974e1
+SHA1 (patch-ad) = a25d9b04656b6a4c98d399c6c201e7cb0b862195
+SHA1 (patch-ae) = 9afc06224aa6780e5acc282155d4cd752c7758a6
+SHA1 (patch-af) = 7f72b9e16fd82880ab61e74835a55f616fc1aacc
diff -r 54af8dd6688b -r 8ecd48ee1ddf net/gtk-vnc/options.mk
--- a/net/gtk-vnc/options.mk Mon Sep 14 09:30:24 2009 +0000
+++ b/net/gtk-vnc/options.mk Mon Sep 14 10:07:03 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/04/06 10:17:32 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2009/09/14 10:07:03 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-vnc
-PKG_SUPPORTED_OPTIONS= python firefox
+PKG_SUPPORTED_OPTIONS= python plugin
.include "../../mk/bsd.options.mk"
@@ -15,10 +15,9 @@
CONFIGURE_ARGS+= --with-python=no
.endif
-PLIST_VARS+= firefox
-.if !empty(PKG_OPTIONS:Mfirefox)
-.include "../../devel/nspr/buildlink3.mk"
-.include "../../www/firefox/buildlink3.mk"
+PLIST_VARS+= plugin
+.if !empty(PKG_OPTIONS:Mplugin)
+.include "../../devel/xulrunner/buildlink3.mk"
CONFIGURE_ARGS+= --enable-plugin=yes
-PLIST.firefox= yes
+PLIST.plugin= yes
.endif
diff -r 54af8dd6688b -r 8ecd48ee1ddf net/gtk-vnc/patches/patch-ac
--- a/net/gtk-vnc/patches/patch-ac Mon Sep 14 09:30:24 2009 +0000
+++ b/net/gtk-vnc/patches/patch-ac Mon Sep 14 10:07:03 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/04/06 10:17:32 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2009/09/14 10:07:04 tnn Exp $
--- plugin/Makefile.in.orig 2008-09-05 12:32:30.000000000 +0000
+++ plugin/Makefile.in
@@ -7,7 +7,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/mozilla/plugins
-+@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/firefox/plugins
++@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/netscape/plugins
@ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = gtk-vnc-plugin.la
@ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_SOURCES = \
@ENABLE_PLUGIN_TRUE@ gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c
diff -r 54af8dd6688b -r 8ecd48ee1ddf net/gtk-vnc/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gtk-vnc/patches/patch-ad Mon Sep 14 10:07:03 2009 +0000
@@ -0,0 +1,1297 @@
+$NetBSD: patch-ad,v 1.1 2009/09/14 10:07:04 tnn Exp $
+
+--- src/npupp.h.orig 2009-09-14 11:50:07.000000000 +0200
++++ src/npupp.h
+@@ -0,0 +1,1292 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Netscape Public License
++ * Version 1.1 (the "License"); you may not use this file except in
++ * compliance with the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/NPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is mozilla.org code.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1998
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the NPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the NPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++
++/*
++ * npupp.h Revision: 1.2
++ * function call mecahnics needed by platform specific glue code.
++ */
++
++
++#ifndef _NPUPP_H_
++#define _NPUPP_H_
++
++#if defined(__OS2__)
++#pragma pack(1)
++#endif
++
++#ifndef GENERATINGCFM
++#define GENERATINGCFM 0
++#endif
++
++#ifndef _NPAPI_H_
++#include "npapi.h"
++#endif
++
++#include "jri.h"
++
++/******************************************************************************************
++ plug-in function table macros
++ for each function in and out of the plugin API we define
++ typedef NPP_FooUPP
++ #define NewNPP_FooProc
++ #define CallNPP_FooProc
++ for mac, define the UPP magic for PPC/68K calling
++ *******************************************************************************************/
++
++
++/* NPP_Initialize */
++
++#define _NPUPP_USE_UPP_ (TARGET_RT_MAC_CFM && !TARGET_API_MAC_CARBON)
++
++#if _NPUPP_USE_UPP_
++typedef UniversalProcPtr NPP_InitializeUPP;
++
++enum {
++ uppNPP_InitializeProcInfo = kThinkCStackBased
++ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
++ | RESULT_SIZE(SIZE_CODE(0))
++};
++
++#define NewNPP_InitializeProc(FUNC) \
++ (NPP_InitializeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_InitializeProcInfo, GetCurrentArchitecture())
++#define CallNPP_InitializeProc(FUNC) \
++ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_InitializeProcInfo)
++
++#else
++
++typedef void (* NP_LOADDS NPP_InitializeUPP)(void);
++#define NewNPP_InitializeProc(FUNC) \
++ ((NPP_InitializeUPP) (FUNC))
++#define CallNPP_InitializeProc(FUNC) \
++ (*(FUNC))()
++
++#endif
++
++
++/* NPP_Shutdown */
++
++#if _NPUPP_USE_UPP_
++typedef UniversalProcPtr NPP_ShutdownUPP;
++
++enum {
++ uppNPP_ShutdownProcInfo = kThinkCStackBased
++ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
++ | RESULT_SIZE(SIZE_CODE(0))
++};
++
++#define NewNPP_ShutdownProc(FUNC) \
++ (NPP_ShutdownUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_ShutdownProcInfo, GetCurrentArchitecture())
++#define CallNPP_ShutdownProc(FUNC) \
++ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_ShutdownProcInfo)
++
++#else
++
++typedef void (* NP_LOADDS NPP_ShutdownUPP)(void);
++#define NewNPP_ShutdownProc(FUNC) \
++ ((NPP_ShutdownUPP) (FUNC))
++#define CallNPP_ShutdownProc(FUNC) \
++ (*(FUNC))()
++
++#endif
++
++
++/* NPP_New */
++
++#if _NPUPP_USE_UPP_
++typedef UniversalProcPtr NPP_NewUPP;
++
++enum {
++ uppNPP_NewProcInfo = kThinkCStackBased
++ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPMIMEType)))
++ | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPP)))
++ | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(uint16)))
++ | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(int16)))
++ | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(char **)))
++ | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(char **)))
++ | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(NPSavedData *)))
++ | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
++};
++
++#define NewNPP_NewProc(FUNC) \
++ (NPP_NewUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewProcInfo, GetCurrentArchitecture())
++#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
++ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewProcInfo, \
++ (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
++#else
++
++typedef NPError (* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
++#define NewNPP_NewProc(FUNC) \
++ ((NPP_NewUPP) (FUNC))
++#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
++ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
++
++#endif
++
++
++/* NPP_Destroy */
++
++#if _NPUPP_USE_UPP_
++
++typedef UniversalProcPtr NPP_DestroyUPP;
++enum {
++ uppNPP_DestroyProcInfo = kThinkCStackBased
++ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
++ | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPSavedData **)))
++ | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
++};
++#define NewNPP_DestroyProc(FUNC) \
++ (NPP_DestroyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyProcInfo, GetCurrentArchitecture())
++#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
++ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyProcInfo, (ARG1), (ARG2))
++#else
++
++typedef NPError (* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save);
++#define NewNPP_DestroyProc(FUNC) \
++ ((NPP_DestroyUPP) (FUNC))
++#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
++ (*(FUNC))((ARG1), (ARG2))
++
++#endif
++
++
++/* NPP_SetWindow */
++
++#if _NPUPP_USE_UPP_
++
++typedef UniversalProcPtr NPP_SetWindowUPP;
++enum {
++ uppNPP_SetWindowProcInfo = kThinkCStackBased
++ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
++ | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPWindow *)))
++ | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
++};
++#define NewNPP_SetWindowProc(FUNC) \
++ (NPP_SetWindowUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetWindowProcInfo, GetCurrentArchitecture())
++#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
++ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetWindowProcInfo, (ARG1), (ARG2))
++
++#else
++
++typedef NPError (* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window);
++#define NewNPP_SetWindowProc(FUNC) \
++ ((NPP_SetWindowUPP) (FUNC))
++#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
++ (*(FUNC))((ARG1), (ARG2))
++
++#endif
++
++
++/* NPP_NewStream */
++
Home |
Main Index |
Thread Index |
Old Index