cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update gnomebaker to 0.6.4

Browse Source 
(all our patches are accepted upstream)
- set a default device via gconf (from antoine)

ok ajacoutot@
This commit is contained in:
jasper 2008-08-19 22:37:40 +00:00
parent bc1834379b
commit feca2d2e32
9 changed files with 34 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/baker/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2008/06/02 17:58:23 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2008/08/19 22:37:40 jasper Exp $
COMMENT= CD/DVD authoring application for GNOME
GNOME_PROJECT= gnomebaker
GNOME_VERSION= 0.6.2
PKGNAME= ${DISTNAME}p0
GNOME_VERSION= 0.6.4
CATEGORIES= sysutils multimedia
HOMEPAGE= http://gnomebaker.sourceforge.net/

10
x11/gnome/baker/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gnomebaker-0.6.2.tar.gz) = D5vMH/JkCwcFxJmdyY3FAQ==
RMD160 (gnome/gnomebaker-0.6.2.tar.gz) = 6Cn62Z1NyDB6QvOs5Dq+MW1oP+w=
SHA1 (gnome/gnomebaker-0.6.2.tar.gz) = DEWB65Y5Fy0SIYF+YhWCsixUojY=
SHA256 (gnome/gnomebaker-0.6.2.tar.gz) = bMHRoGVRL+Juuy0eYgSjTuvGblIb+eKVBHL2HhFgLkI=
SIZE (gnome/gnomebaker-0.6.2.tar.gz) = 1286713
MD5 (gnome/gnomebaker-0.6.4.tar.gz) = 20NJJoTgujSb6F6BzgqeVg==
RMD160 (gnome/gnomebaker-0.6.4.tar.gz) = qQ0SmGbe794x6FnkWtEmDmwb5Mw=
SHA1 (gnome/gnomebaker-0.6.4.tar.gz) = 6tD+AJGh3nrpGXv44bN0dJ/Hxhs=
SHA256 (gnome/gnomebaker-0.6.4.tar.gz) = bh75TK/KdTb8MhGnq9RzL23FrcPHwbcxhPWodzgRf7c=
SIZE (gnome/gnomebaker-0.6.4.tar.gz) = 1276117

36
x11/gnome/baker/patches/patch-src-devices_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src-devices_c,v 1.1.1.1 2008/04/16 16:05:36 jasper Exp $
--- src/devices.c.orig Sun Sep 16 18:36:33 2007
+++ src/devices.c Tue Apr 15 12:40:30 2008
@@ -32,7 +32,8 @@
#include <fcntl.h>
#include <stdlib.h>
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) \
+ || defined(__OpenBSD__)
#include <sys/cdio.h>
#define CDROM_DRIVE_STATUS 0x5326
#define CDS_NO_DISC 1
@@ -474,6 +475,7 @@ devices_get_scsi_device(const gchar *device_node, cons
*model_name = g_strdup_printf("%s %s", vendor, model);
*device_id = g_strdup_printf("%d,%d,%d", scsihost, scsiid, scsilun);
+ printf("vendor = %s, model = %s device = %s\n", vendor, model, device);
break;
}
}
@@ -703,11 +705,11 @@ devices_eject_disk(const gchar *device_key)
else
{
/* Use ioctl to send the CDROMEJECT (CDIOCEJECT on FreeBSD) command to the device */
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
if(ioctl(cdrom, CDIOCEJECT, 0) < 0)
- ret = TRUE;
- else
g_warning("devices_eject_disk - ioctl failed");
+ else
+ ret = TRUE;
#else
if(ioctl(cdrom, CDROMEJECT, 0) < 0)
g_warning("devices_eject_disk - ioctl failed");

12
x11/gnome/baker/patches/patch-src-exec_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src-exec_c,v 1.1.1.1 2008/04/16 16:05:36 jasper Exp $
--- src/exec.c.orig Mon Mar 10 20:38:05 2008
+++ src/exec.c Mon Mar 10 20:38:13 2008
@@ -24,7 +24,7 @@
#include "gbcommon.h"
#include <glib/gprintf.h>
-#if defined (__FreeBSD__)
+#if defined (__FreeBSD__) || defined(__OpenBSD__)
#include <signal.h>
#endif

18
x11/gnome/baker/patches/patch-src_execfunctions_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_execfunctions_c,v 1.1.1.1 2008/04/16 16:05:37 jasper Exp $
--- src/execfunctions.c.orig Sun Sep 16 18:36:33 2007
+++ src/execfunctions.c Tue Apr 15 10:47:46 2008
@@ -1707,13 +1707,9 @@ dvdformat_add_args(ExecCmd *cmd)
else
exec_cmd_add_arg(cmd, "-force");
}
- else if(!preferences_get_bool(GB_FAST_FORMAT))
- {
- exec_cmd_add_arg(cmd, "-blank=full");
- }
else
{
- exec_cmd_add_arg(cmd, "-blank");
+ exec_cmd_add_arg(cmd, "-lead-out");
}
}

12
x11/gnome/baker/patches/patch-src_preferences_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_preferences_c,v 1.1.1.1 2008/04/16 16:05:37 jasper Exp $
--- src/preferences.c.orig Tue Apr 15 09:30:54 2008
+++ src/preferences.c Tue Apr 15 09:31:05 2008
@@ -71,7 +71,7 @@ preferences_init()
preferences_set_bool(GB_SCROLL_OUTPUT, TRUE);
preferences_set_string(GB_WRITE_MODE, _("default"));
preferences_set_string(GB_DVDWRITE_MODE, _("default"));
- preferences_set_bool(GB_ALWAYS_SCAN, TRUE);
+ preferences_set_bool(GB_ALWAYS_SCAN, FALSE);
preferences_set_bool(GB_SHOW_FILE_BROWSER, TRUE);
preferences_set_bool(GB_JOLIET, TRUE);
preferences_set_bool(GB_ROCKRIDGE, TRUE);

19
x11/gnome/baker/patches/patch-src_prefsdlg_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_prefsdlg_c,v 1.1.1.1 2008/04/16 16:05:36 jasper Exp $
--- src/prefsdlg.c.orig Sun Sep 16 18:36:33 2007
+++ src/prefsdlg.c Tue Apr 15 11:24:55 2008
$OpenBSD: patch-src_prefsdlg_c,v 1.2 2008/08/19 22:37:40 jasper Exp $
--- src/prefsdlg.c.orig Mon Aug 4 10:29:47 2008
+++ src/prefsdlg.c Mon Aug 4 10:33:29 2008
@@ -25,6 +25,7 @@
#include "filebrowser.h"
#include "devices.h"
@ -9,7 +9,7 @@ $OpenBSD: patch-src_prefsdlg_c,v 1.1.1.1 2008/04/16 16:05:36 jasper Exp $
/* Prefs dialog glade widget names */
static const gchar *const widget_prefsdlg = "prefsDlg";
@@ -40,7 +41,6 @@ static const gchar *const widget_prefsdlg_backend = "c
@@ -41,7 +42,6 @@ static const gchar *const widget_prefsdlg_backend = "c
static const gint DEVICELIST_COL_ICON = 0;
static const gint DEVICELIST_COL_NAME = 1;
@ -17,7 +17,7 @@ $OpenBSD: patch-src_prefsdlg_c,v 1.1.1.1 2008/04/16 16:05:36 jasper Exp $
static const gint DEVICELIST_COL_NODE = 3;
static const gint DEVICELIST_COL_MOUNT = 4;
static const gint DEVICELIST_WRITE_CDR = 5;
@@ -149,15 +149,6 @@ prefsdlg_create_device_list()
@@ -150,15 +150,6 @@ prefsdlg_create_device_list()
gtk_tree_view_column_set_attributes(col, renderer, "text", DEVICELIST_COL_NAME, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(device_list), col);
@ -33,14 +33,17 @@ $OpenBSD: patch-src_prefsdlg_c,v 1.1.1.1 2008/04/16 16:05:36 jasper Exp $
/* Third column to display the device node */
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes(_("Node"), renderer,
@@ -465,8 +456,8 @@ prefsdlg_on_add(GtkButton *button, gpointer user_data
@@ -469,8 +460,13 @@ prefsdlg_on_add(GtkButton *button, gpointer user_data
gtk_list_store_set(device_model, &iter,
DEVICELIST_COL_ICON, GNOME_STOCK_PIXMAP_CDROM,
DEVICELIST_COL_NAME, "New CD Burner",
- DEVICELIST_COL_ID, "1,0,0",
- DEVICELIST_COL_NODE, "/dev/cdrom",
+#if defined(__OpenBSD__)
+ DEVICELIST_COL_ID, "",
+ DEVICELIST_COL_NODE, "/dev/rcd0c",
+#else
DEVICELIST_COL_ID, "1,0,0",
DEVICELIST_COL_NODE, "/dev/cdrom",
+#endif
DEVICELIST_COL_MOUNT, "/mnt/cdrom", -1);
}

4
x11/gnome/baker/pkg/MESSAGE
View File

@ -1,3 +1,7 @@
To ensure correct operation, GnomeBaker needs to run with root privileges.
They are 2 ways to do so, either start it with sudo(8) or add the setuid
bit to the gnomebaker binary (not recommended).
You have to restart the GConf daemon by killing it before running
GnomeBaker for the first time. As a regular user:
gconftool-2 --shutdown && sudo gnomebaker

14
x11/gnome/baker/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/04/16 16:05:36 jasper Exp $
bin/gnomebaker
@comment $OpenBSD: PLIST,v 1.2 2008/08/19 22:37:40 jasper Exp $
@bin bin/gnomebaker
share/applications/gnomebaker.desktop
share/gnome/help/gnomebaker/
share/gnome/help/gnomebaker/C/
@ -174,6 +174,16 @@ share/locale/zh_HK/LC_MESSAGES/gnomebaker.mo
share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
share/omf/gnomebaker/
share/omf/gnomebaker/gnomebaker-C.omf
@exec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --type int --set /apps/GnomeBaker/Devices/Device01/Capabilities 15 > /dev/null
@exec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --type string --set /apps/GnomeBaker/Devices/Device01/DeviceId /dev/rcd0c > /dev/null
@exec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --type string --set /apps/GnomeBaker/Devices/Device01/DeviceName CD_DVD_Writer > /dev/null
@exec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --type string --set /apps/GnomeBaker/Devices/Device01/DeviceNode /dev/rcd0c > /dev/null
@exec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --type string --set /apps/GnomeBaker/Devices/Device01/MountPoint /mnt > /dev/null
@unexec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --unset /apps/GnomeBaker/Devices/Device01/Capabilities > /dev/null
@unexec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --unset /apps/GnomeBaker/Devices/Device01/DeviceId > /dev/null
@unexec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --unset /apps/GnomeBaker/Devices/Device01/DeviceName > /dev/null
@unexec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --unset /apps/GnomeBaker/Devices/Device01/DeviceNode > /dev/null
@unexec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --unset /apps/GnomeBaker/Devices/Device01/MountPoint > /dev/null
@exec %D/bin/scrollkeeper-update -q
@unexec %D/bin/scrollkeeper-update -q
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true