Hello community, here is the log from the commit of package sax2 for openSUSE:Factory checked in at 2012-06-01 07:23:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sax2 (Old) and /work/SRC/openSUSE:Factory/.sax2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sax2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/sax2/sax2.changes 2011-12-01 17:38:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sax2.new/sax2.changes 2012-06-01 07:23:55.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 31 12:47:10 UTC 2012 - [email protected] + +- sax2-XF86OptionPtr-definition-changes.diff + * fixes build against xorg-server > 1.10 (workaround changes + in definition of current XF86OptionPtr definition) + +------------------------------------------------------------------- New: ---- sax2-XF86OptionPtr-definition-changes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.zJsATN/_old 2012-06-01 07:23:56.000000000 +0200 +++ /var/tmp/diff_new_pack.zJsATN/_new 2012-06-01 07:23:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sax2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: sax2 Version: 8.1 Release: 0 -License: GPL-2.0+ Summary: SuSE advanced X Window System-configuration -Url: http://sax.berlios.de +License: GPL-2.0+ Group: System/X11/Utilities +Url: http://sax.berlios.de Source: sax2.tar.bz2 Source1: sax2.desktop Source2: sax2-rpmlintrc Patch1: sax2-tools-only.diff Patch2: nohal.diff Patch3: sax2-dots_as_needed.diff +Patch4: sax2-XF86OptionPtr-definition-changes.diff BuildRequires: antlr BuildRequires: automake BuildRequires: bison @@ -93,6 +95,7 @@ %patch1 -p0 %patch2 -p0 %patch3 +%patch4 -p1 %build # disable as-needed to fix build ++++++ sax2-XF86OptionPtr-definition-changes.diff ++++++ --- sax.orig/parse/parse.c 2012-05-31 12:25:37.000000000 +0000 +++ sax/parse/parse.c 2012-05-31 12:42:29.000000000 +0000 @@ -222,7 +222,7 @@ char* GetModuleSubSpecs (XF86ConfigPtr c char optv[SIZE] = ""; char *result = NULL; XF86LoadPtr lp; - XF86OptionPtr op; + XF86OptionRec *op; if (conf == NULL) return("null"); lp = (XF86LoadPtr) conf->conf_modules->mod_load_lst; @@ -239,7 +239,7 @@ char* GetModuleSubSpecs (XF86ConfigPtr c strcat(result,"extmod:"); count = 0; - op = (XF86OptionPtr) lp->load_opt; + op = (XF86OptionRec*) lp->load_opt; for (op;op;op=op->list.next) { strcpy(optn,"<none>"); strcpy(optv,"<none>"); @@ -276,7 +276,7 @@ char* GetInputSpecs (XF86ConfigPtr conf) int next; char *result = NULL; XF86ConfInputPtr ip; - XF86OptionPtr op; + XF86OptionRec *op; if (conf == NULL) return("null"); ip = (XF86ConfInputPtr) conf->conf_input_lst; @@ -309,7 +309,7 @@ char* GetInputSpecs (XF86ConfigPtr conf) } /* build option line... */ - op = (XF86OptionPtr) ip->inp_option_lst; + op = (XF86OptionRec*) ip->inp_option_lst; if (op != NULL) { strcpy(optline,"option="); count = 0; @@ -348,7 +348,7 @@ char* GetFlags (XF86ConfigPtr conf) { char optv[SIZE] = ""; char optn[SIZE] = ""; XF86ConfFlagsPtr fp; - XF86OptionPtr op; + XF86OptionRec *op; if (conf == NULL) return("null"); fp = (XF86ConfFlagsPtr) conf->conf_flags; @@ -359,7 +359,7 @@ char* GetFlags (XF86ConfigPtr conf) { result = (char*) malloc(SIZE); strcpy(result,""); - for (op=fp->flg_option_lst;op;op=op->list.next) { + for (op=(XF86OptionRec*)fp->flg_option_lst;op;op=op->list.next) { if (op->opt_name == NULL) { continue; } @@ -392,7 +392,7 @@ char* GetExtensions (XF86ConfigPtr conf) char optv[SIZE] = ""; char optn[SIZE] = ""; XF86ConfExtensionsPtr ep; - XF86OptionPtr op; + XF86OptionRec *op; if (conf == NULL) return("null"); ep = (XF86ConfExtensionsPtr) conf->conf_extensions; @@ -403,7 +403,7 @@ char* GetExtensions (XF86ConfigPtr conf) result = (char*) malloc(SIZE); strcpy(result,""); - for (op=ep->ext_option_lst;op;op=op->list.next) { + for (op=(XF86OptionRec*)ep->ext_option_lst;op;op=op->list.next) { if (op->opt_name == NULL) { continue; } @@ -461,7 +461,7 @@ char* GetLayoutSpecs (XF86ConfigPtr conf XF86ConfAdjacencyPtr ap,hp; XF86ConfInputrefPtr ip; XF86ConfLayoutPtr lp; - XF86OptionPtr op; + XF86OptionRec *op; if (conf == NULL) return("null"); lp = (XF86ConfLayoutPtr) conf->conf_layout_lst; @@ -569,7 +569,7 @@ char* GetLayoutSpecs (XF86ConfigPtr conf strcat(input,buf); } if (ip->iref_option_lst != NULL) { - op = (XF86OptionPtr) ip->iref_option_lst; + op = (XF86OptionRec*) ip->iref_option_lst; for (op;op;op=op->list.next) { strcpy(optn,"<none>"); strcpy(optv,"<none>"); @@ -587,7 +587,7 @@ char* GetLayoutSpecs (XF86ConfigPtr conf /* build option line... */ - op = (XF86OptionPtr) lp->lay_option_lst; + op = (XF86OptionRec*) lp->lay_option_lst; if (op != NULL) { strcpy(optline,"option="); count = 0; @@ -628,7 +628,7 @@ char* GetDeviceSpecs (XF86ConfigPtr conf int next; char *result = NULL; XF86ConfDevicePtr dp; - XF86OptionPtr op; + XF86OptionRec *op; if (conf == NULL) return("null"); dp = (XF86ConfDevicePtr) conf->conf_device_lst; @@ -778,7 +778,7 @@ char* GetDeviceSpecs (XF86ConfigPtr conf } /* build option line... */ - op = (XF86OptionPtr) dp->dev_option_lst; + op = (XF86OptionRec*) dp->dev_option_lst; if (op != NULL) { strcpy(optline,"option="); count = 0; @@ -827,7 +827,7 @@ char* GetMonitorSpecs (XF86ConfigPtr con XF86ConfMonitorPtr mp; XF86ConfModeLinePtr lp; - XF86OptionPtr op; + XF86OptionRec *op; XF86ConfModesLinkPtr cp; if (conf == NULL) return("null"); @@ -978,7 +978,7 @@ char* GetMonitorSpecs (XF86ConfigPtr con } /* build option line... */ - op = (XF86OptionPtr) mp->mon_option_lst; + op = (XF86OptionRec*) mp->mon_option_lst; if (op != NULL) { strcpy(optline,"option="); count = 0; @@ -1107,7 +1107,7 @@ char* GetDisplaySpecs (XF86ConfigPtr con char *result = NULL; XF86ConfScreenPtr sp; - XF86OptionPtr op; + XF86OptionRec *op; XF86ConfDisplayPtr dp; XF86ModePtr mp; @@ -1169,7 +1169,7 @@ char* GetDisplaySpecs (XF86ConfigPtr con } /* build option line... */ - op = (XF86OptionPtr) sp->scrn_option_lst; + op = (XF86OptionRec*) sp->scrn_option_lst; if (op != NULL) { strcpy(optline,"option="); count = 0; @@ -1382,7 +1382,7 @@ char* GetDisplaySpecs (XF86ConfigPtr con } /* get options... */ - op = (XF86OptionPtr) dp->disp_option_lst; + op = (XF86OptionRec*) dp->disp_option_lst; if (op != NULL) { strcpy(optline,"option="); anz = 0; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
