December 2010 - openSUSE Commits - openSUSE Mailing Lists

commit acpica for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package acpica for openSUSE:Factory checked in at Tue Dec 28 23:53:52 CET 2010. -------- --- acpica/acpica.changes 2010-08-07 08:37:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/acpica/acpica.changes 2010-10-26 22:44:19.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Oct 26 20:37:10 UTC 2010 - trenn(a)novell.com + +- Update to version 20100806 +- Added ec_access executable to be able to debug the Embedded + Controller together with CONFIG_ACPI_EC_DEBUGFS kernel .config + option + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- acpica-unix-20100806.tar.bz2 New: ---- acpica-unix-20101013.tar.bz2 acpica_fix_scope_problems.patch ec_access.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpica.spec ++++++ --- /var/tmp/diff_new_pack.VDRjDk/_old 2010-12-28 23:53:21.000000000 +0100 +++ /var/tmp/diff_new_pack.VDRjDk/_new 2010-12-28 23:53:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package acpica (Version 20100806) +# spec file for package acpica (Version 20101013) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: acpica Url: http://acpica.org -Version: 20100806 +Version: 20101013 Release: 1 License: Intel ACPICA %define src_dir acpica-unix-%{version} @@ -32,6 +32,8 @@ Patch3: unaligned_acpidump.patch Patch4: acpidump-cleanup.diff Patch5: acpidump_adjust_to_new_acpica_headers.patch +Patch6: acpica_fix_scope_problems.patch +Source1: ec_access.c Source2: acpidump.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 @@ -65,9 +67,11 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" +RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +cc %{SOURCE1} $RPM_OPT_FLAGS -o ec_access make -C acpidump CFLAGS="$RPM_OPT_FLAGS" make -C compiler CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make -C tools/acpisrc CFLAGS="$RPM_OPT_FLAGS" @@ -78,10 +82,9 @@ make -C tools/acpiexec CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install -install -dm 755 %{buildroot}/usr/sbin -install -dm 755 %{buildroot}/usr/bin -install -m 755 acpidump/acpidump %{buildroot}/usr/sbin -#install -dm 755 %{buildroot}/%{_mandir}/man8 + +install -Dm 755 ec_access %{buildroot}/usr/sbin/ec_access +install -Dm 755 acpidump/acpidump %{buildroot}/usr/sbin/acpidump install -Dm 755 iasl %{buildroot}/usr/bin/iasl install -Dm 755 tools/acpisrc/acpisrc %{buildroot}/usr/sbin/acpisrc install -Dm 755 tools/acpiexec/acpiexec %{buildroot}/usr/bin/acpiexec @@ -97,7 +100,7 @@ /usr/bin/acpixtract /usr/sbin/acpisrc /usr/sbin/acpidump +/usr/sbin/ec_access %doc %{_docdir}/%{name} -#/%{_mandir}/man8/* %changelog ++++++ acpica-override-CFLAGS.diff ++++++ --- /var/tmp/diff_new_pack.VDRjDk/_old 2010-12-28 23:53:21.000000000 +0100 +++ /var/tmp/diff_new_pack.VDRjDk/_new 2010-12-28 23:53:21.000000000 +0100 @@ -9,10 +9,10 @@ tools/acpixtract/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -Index: acpica-unix-20100806/compiler/Makefile +Index: acpica-unix-20101013/compiler/Makefile =================================================================== ---- acpica-unix-20100806.orig/compiler/Makefile -+++ acpica-unix-20100806/compiler/Makefile +--- acpica-unix-20101013.orig/compiler/Makefile ++++ acpica-unix-20101013/compiler/Makefile @@ -12,7 +12,7 @@ ACPICA_TOOLS = $(ACPICA_SRC)/tools ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers @@ -22,23 +22,23 @@ # # Bison/Flex configuration -Index: acpica-unix-20100806/tools/acpiexec/Makefile +Index: acpica-unix-20101013/tools/acpiexec/Makefile =================================================================== ---- acpica-unix-20100806.orig/tools/acpiexec/Makefile -+++ acpica-unix-20100806/tools/acpiexec/Makefile +--- acpica-unix-20101013.orig/tools/acpiexec/Makefile ++++ acpica-unix-20101013/tools/acpiexec/Makefile @@ -11,7 +11,7 @@ ACPICA_TOOLS = $(ACPICA_SRC)/tools ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers NOMAN= YES --CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I$(ACPICA_SRC)/include -+override CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I$(ACPICA_SRC)/include +-CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -Wstrict-prototypes -I$(ACPICA_SRC)/include ++override CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -Wstrict-prototypes -I$(ACPICA_SRC)/include COMPILE = $(CC) -c $(CFLAGS) -o$@ $? LDFLAGS += -lpthread -lrt -Index: acpica-unix-20100806/tools/acpixtract/Makefile +Index: acpica-unix-20101013/tools/acpixtract/Makefile =================================================================== ---- acpica-unix-20100806.orig/tools/acpixtract/Makefile -+++ acpica-unix-20100806/tools/acpixtract/Makefile +--- acpica-unix-20101013.orig/tools/acpixtract/Makefile ++++ acpica-unix-20101013/tools/acpixtract/Makefile @@ -3,7 +3,7 @@ PROG= acpixtract SRCS= acpixtract.c @@ -48,10 +48,10 @@ acpixtract : $(patsubst %.c,%.o, $(SRCS)) -Index: acpica-unix-20100806/tools/acpisrc/Makefile +Index: acpica-unix-20101013/tools/acpisrc/Makefile =================================================================== ---- acpica-unix-20100806.orig/tools/acpisrc/Makefile -+++ acpica-unix-20100806/tools/acpisrc/Makefile +--- acpica-unix-20101013.orig/tools/acpisrc/Makefile ++++ acpica-unix-20101013/tools/acpisrc/Makefile @@ -4,7 +4,7 @@ PROG= acpisrc SRCS= ascase.c asconvrt.c asfile.c asmain.c asremove.c astable.c \ asutils.c osunixdir.c ../../common/getopt.c ++++++ acpica-unix-20100806.tar.bz2 -> acpica-unix-20101013.tar.bz2 ++++++ ++++ 8978 lines of diff (skipped) ++++++ acpica_fix_scope_problems.patch ++++++ commit 019ccfe5087812a413d0caf1d8e23b7c811c9175 Author: Robert Moore <Robert.Moore(a)intel.com> Date: Wed Nov 3 10:40:54 2010 -0700 Fix problem with Scope() operator during parse load phase. During load phase (table load or method execution), the scope operator should not enter the target into the namespace. Instead, it should open a new scope at the target location. Linux BZ 19462. diff --git a/dispatcher/dswexec.c b/source/components/dispatcher/dswexec.c index 3c1f85e..81267b5 100644 --- a/dispatcher/dswexec.c +++ b/dispatcher/dswexec.c @@ -400,10 +400,26 @@ AcpiDsExecBeginOp ( * we must enter this object into the namespace. The created * object is temporary and will be deleted upon completion of * the execution of this method. + * + * Note 10/2010: Except for the Scope() op. This opcode does + * not actually create a new object, it refers to an existing + * object. However, for Scope(), we want to indeed open a + * new scope. */ - Status = AcpiDsLoad2BeginOp (WalkState, NULL); + if (Op->Common.AmlOpcode != AML_SCOPE_OP) + { + Status = AcpiDsLoad2BeginOp (WalkState, NULL); + } + else + { + Status = AcpiDsScopeStackPush (Op->Named.Node, + Op->Named.Node->Type, WalkState); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + } } - break; ++++++ ec_access.c ++++++ /* * ec_access.c * * Copyright (C) 2010 SUSE Products GmbH/Novell * Author: * Thomas Renninger <trenn(a)suse.de> * * This work is licensed under the terms of the GNU GPL, version 2. */ #include <fcntl.h> #include <err.h> #include <stdio.h> #include <stdlib.h> #include <libgen.h> #include <unistd.h> #include <getopt.h> #include <stdint.h> #include <sys/types.h> #include <sys/stat.h> #define EC_SPACE_SIZE 256 #define SYSFS_PATH "/sys/kernel/debug/ec/ec0/io" /* TBD/Enhancements: - Provide param for accessing different ECs (not supported by kernel yet) */ static int read_mode = -1; static int write_byte_offset = -1; static int read_byte_offset = -1; static uint8_t write_value = -1; void usage(char progname[], int exit_status) { printf("Usage:\n"); printf("1) %s -r\n", basename(progname)); printf("2) %s -b byte_offset\n", basename(progname)); printf("3) %s -w byte_offset -v value\n\n", basename(progname)); puts("\t-r or --read -- Dump EC registers"); puts("\t-b or --byte byte_offset -- Read value " " at byte_offset (in hex)"); puts("\t-w or --write byte_offset -v or --value value -- " "Write value at byte_offset"); puts("\t-h or --help -- Print this help\n\n"); puts("Offsets and values are in hexadecimal number sytem."); puts("The offset and value must be between 0 and 0xff."); exit(exit_status); } void parse_opts(int argc, char *argv[]) { int c; struct option long_options[] = { {"read", 0, 0, 'r'}, {"byte", 0, 0, 'b'}, {"write", 1, 0, 'w'}, {"value", 1, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; while (1) { c = getopt_long(argc, argv, "rb:w:v:h", long_options, NULL); if (c == -1) break; switch (c) { case 'r': if (read_mode != -1) usage (argv[0], EXIT_FAILURE); read_mode = 1; break; case 'b': if (read_mode != -1) usage (argv[0], EXIT_FAILURE); read_mode = 1; read_byte_offset = strtoul(optarg, NULL, 16); break; case 'w': if (read_mode != -1) usage (argv[0], EXIT_FAILURE); read_mode = 0; write_byte_offset = strtoul(optarg, NULL, 16); break; case 'v': write_value = strtoul(optarg, NULL, 16); break; case 'h': usage(argv[0], EXIT_SUCCESS); default: fprintf(stderr, "Unknown option!\n"); usage(argv[0], EXIT_FAILURE); } } if (read_mode == 0) { if (write_byte_offset < 0 || write_byte_offset >= EC_SPACE_SIZE) { fprintf(stderr, "Wrong byte offset 0x%.2x, valid: " "[0-0x%.2x]\n", write_byte_offset, EC_SPACE_SIZE - 1); usage(argv[0], EXIT_FAILURE); } if (write_value < 0 || write_value >= 255) { fprintf(stderr, "Wrong byte offset 0x%.2x, valid:" "[0-0xff]\n", write_byte_offset); usage(argv[0], EXIT_FAILURE); } } if (read_mode == 1 && read_byte_offset != -1) { if (read_byte_offset < -1 || read_byte_offset >= EC_SPACE_SIZE) { fprintf(stderr, "Wrong byte offset 0x%.2x, valid: " "[0-0x%.2x]\n", read_byte_offset, EC_SPACE_SIZE - 1); usage(argv[0], EXIT_FAILURE); } } /* Add additional parameter checks here */ } void dump_ec(int fd) { char buf[EC_SPACE_SIZE]; int byte_off, bytes_read; bytes_read = read(fd, buf, EC_SPACE_SIZE); if (bytes_read == -1) err(EXIT_FAILURE, "Could not read from %s\n", SYSFS_PATH); if (bytes_read != EC_SPACE_SIZE) fprintf(stderr, "Could only read %d bytes\n", bytes_read); printf("\t00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F\n"); for (byte_off = 0; byte_off < bytes_read; byte_off++) { if ((byte_off % 16) == 0) printf("\n%.2X: \t", byte_off); printf("%.2x ", (uint8_t)buf[byte_off]); } printf("\n"); sync(); } void read_ec_val(int fd, int byte_offset) { uint8_t buf; int error; error = lseek(fd, byte_offset, SEEK_SET); if (error != byte_offset) err(EXIT_FAILURE, "Cannot set offset to 0x%.2x", byte_offset); error = read(fd, &buf, 1); if (error != 1) err(EXIT_FAILURE, "Could not read byte 0x%.2x from %s\n", byte_offset, SYSFS_PATH); printf("0x%.2x\n", buf); return; } void write_ec_val(int fd, int byte_offset, uint8_t value) { int error; error = lseek(fd, byte_offset, SEEK_SET); if (error != byte_offset) err(EXIT_FAILURE, "Cannot set offset to 0x%.2x", byte_offset); error = write(fd, &value, 1); if (error != 1) err(EXIT_FAILURE, "Cannot write value 0x%.2x to offset 0x%.2x", value, byte_offset); } int main(int argc, char *argv[]) { int file_mode = O_RDONLY; int fd; parse_opts(argc, argv); if (read_mode == 0) file_mode = O_WRONLY; else if (read_mode == 1) file_mode = O_RDONLY; else usage(argv[0], EXIT_FAILURE); fd = open(SYSFS_PATH, file_mode); if (fd == -1) err(EXIT_FAILURE, "%s", SYSFS_PATH); if (read_mode) if (read_byte_offset == -1) dump_ec(fd); else if (read_byte_offset < 0 || read_byte_offset >= EC_SPACE_SIZE) usage(argv[0], EXIT_FAILURE); else read_ec_val(fd, read_byte_offset); else write_ec_val(fd, write_byte_offset, write_value); close(fd); exit(EXIT_SUCCESS); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenPrintingPPDs for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package OpenPrintingPPDs for openSUSE:Factory checked in at Tue Dec 28 23:53:33 CET 2010. -------- --- OpenPrintingPPDs/OpenPrintingPPDs.changes 2010-10-20 17:04:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenPrintingPPDs/OpenPrintingPPDs.changes 2010-12-28 11:36:55.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 28 11:34:12 CET 2010 - jsmeix(a)suse.de + +- Do not install the "Generic GDI Printer" PPD because + there is no such thing as a "Generic GDI Printer", + (see http://www.cups.org/str.php?L3759) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenPrintingPPDs.spec ++++++ --- /var/tmp/diff_new_pack.DoB6Gz/_old 2010-12-28 23:52:42.000000000 +0100 +++ /var/tmp/diff_new_pack.DoB6Gz/_new 2010-12-28 23:52:42.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: cups Summary: PPD files from OpenPrinting.org Version: 4.0.0 -Release: 1 +Release: 2 Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database… License: GPLv2+ ; MIT Group: Hardware/Printing @@ -231,6 +231,11 @@ echo "Finished installing the '$d' PPDs." set -x done +# Do not install the "Generic GDI Printer" PPD because there is no such thing +# as a "Generic GDI Printer", see http://www.cups.org/str.php?L3759 +# The particular GDI printer models which are supported have already their +# individual /usr/share/cups/model/OpenPrintingPPDs/ghostscript/*gdi* PPD files. +rm %{buildroot}/usr/share/cups/model/OpenPrintingPPDs/ghostscript/Generic-GDI_Printer.gdi.ppd.gz %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Tue Dec 28 23:53:03 CET 2010. -------- --- aaa_base/aaa_base.changes 2010-12-16 12:36:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-12-21 17:28:54.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 21 17:21:56 CET 2010 - werner(a)suse.de + +- Test only for bit 64 (clock unsynchronized), if zero the kernel + is within eleven minutes mode (Thanks goes to Rastislav David) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.1ES7QG/_old 2010-12-28 23:52:36.000000000 +0100 +++ /var/tmp/diff_new_pack.1ES7QG/_new 2010-12-28 23:52:36.000000000 +0100 @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 15 +Release: 16 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.clock new/aaa_base/etc/init.d/boot.clock --- old/aaa_base/etc/init.d/boot.clock 2010-11-03 11:17:22.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.clock 2010-12-21 17:28:14.000000000 +0100 @@ -51,7 +51,7 @@ # ELEVENMIN_MODE=no typeset -i STA_CLOCK=$(adjtimex --print | sed -rn '/^[[:blank:]]*status:/{ s/[^[:digit:]]*([[:digit:]]+)/\1/p; }') -test $((STA_CLOCK & 65)) -eq 1 && ELEVENMIN_MODE=yes +test $((STA_CLOCK & 64)) -eq 0 && ELEVENMIN_MODE=yes # # Without having rtc_cmos module loaded hwclock will fail on at least x86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-gnome for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package NetworkManager-gnome for openSUSE:Factory checked in at Tue Dec 28 23:52:18 CET 2010. -------- --- GNOME/NetworkManager-gnome/NetworkManager-gnome.changes 2010-11-06 13:59:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager-gnome/NetworkManager-gnome.changes 2010-12-23 13:54:02.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 23 12:52:06 UTC 2010 - gber(a)opensuse.org + +- updated NetworkManager-gnome-OnlyShowIn.patch in order to start + nm-applet under Xfce as well + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-gnome.spec ++++++ --- /var/tmp/diff_new_pack.y3iUYx/_old 2010-12-28 23:52:09.000000000 +0100 +++ /var/tmp/diff_new_pack.y3iUYx/_new 2010-12-28 23:52:09.000000000 +0100 @@ -20,7 +20,7 @@ Name: NetworkManager-gnome Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.8.2 -Release: 1 +Release: 2 License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: NetworkManager-devel ++++++ NetworkManager-gnome-OnlyShowIn.patch ++++++ --- /var/tmp/diff_new_pack.y3iUYx/_old 2010-12-28 23:52:09.000000000 +0100 +++ /var/tmp/diff_new_pack.y3iUYx/_new 2010-12-28 23:52:09.000000000 +0100 @@ -6,7 +6,7 @@ Exec=nm-applet --sm-disable Terminal=false Type=Application -+OnlyShowIn=GNOME;LXDE; ++OnlyShowIn=GNOME;LXDE;XFCE; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=NetworkManager X-GNOME-Bugzilla-Component=general ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Tue Dec 28 23:52:18 CET 2010. -------- --- MozillaFirefox/MozillaFirefox.changes 2010-11-30 15:21:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2010-12-15 09:44:28.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 15 07:49:45 UTC 2010 - wr(a)rosenauer.org + +- update to version 4.0beta8 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mozilla-firefox-sync.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.OdPJhp/_old 2010-12-28 23:51:51.000000000 +0100 +++ /var/tmp/diff_new_pack.OdPJhp/_new 2010-12-28 23:51:51.000000000 +0100 @@ -33,10 +33,10 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 4.0b -Release: 1 +Release: 2 Provides: web_browser Provides: firefox = %{version} -%define releasedate 2010110500 +%define releasedate 2010121400 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -52,6 +52,7 @@ Source9: firefox-lockdown.js Source10: compare-locales.tar.bz2 Source11: firefox.1 +Patch0: mozilla-firefox-sync.patch Patch1: toolkit-download-folder.patch Patch2: firefox-linkorder.patch Patch3: firefox-browser-css.patch @@ -152,6 +153,7 @@ %prep %setup -q -n mozilla -b 7 -b 10 cd $RPM_BUILD_DIR/mozilla +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 ++++++ compare-locales.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/CompareLocales.py new/compare-locales/lib/Mozilla/CompareLocales.py --- old/compare-locales/lib/Mozilla/CompareLocales.py 2010-11-06 13:43:49.000000000 +0100 +++ new/compare-locales/lib/Mozilla/CompareLocales.py 2010-12-15 09:07:39.000000000 +0100 @@ -418,7 +418,11 @@ shutil.copyfile(l10n_file.fullpath, outfile) f = codecs.open(outfile, 'ab', p.encoding) print "adding to " + outfile - f.write(''.join(trailing)) + def ensureNewline(s): + if not s.endswith('\n'): + return s + '\n' + return s + f.write(''.join(map(ensureNewline,trailing))) f.close() def notify(self, category, file, data): '''Check filterObserver for the found data, and if it's diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/__init__.py new/compare-locales/lib/Mozilla/__init__.py --- old/compare-locales/lib/Mozilla/__init__.py 2010-11-06 13:43:49.000000000 +0100 +++ new/compare-locales/lib/Mozilla/__init__.py 2010-12-15 09:07:39.000000000 +0100 @@ -1 +1 @@ -version="0.9" +version="0.9.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/tests/unitMerge.py new/compare-locales/lib/Mozilla/tests/unitMerge.py --- old/compare-locales/lib/Mozilla/tests/unitMerge.py 1970-01-01 01:00:00.000000000 +0100 +++ new/compare-locales/lib/Mozilla/tests/unitMerge.py 2010-12-15 09:07:39.000000000 +0100 @@ -0,0 +1,132 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla 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/MPL/ +# +# 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 l10n test automation. +# +# The Initial Developer of the Original Code is +# Mozilla Foundation +# Portions created by the Initial Developer are Copyright (C) 2010 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Axel Hecht <l10n(a)mozilla.com> +# +# 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 MPL, 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 MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +import unittest +import os +from tempfile import mkdtemp +import shutil + +from Mozilla.Parser import getParser +from Mozilla.Paths import File +from Mozilla.CompareLocales import ContentComparer, Observer + +class TestProperties(unittest.TestCase): + def setUp(self): + self.tmp = mkdtemp() + os.mkdir(os.path.join(self.tmp, "merge")) + self.ref = os.path.join(self.tmp, "en-reference.properties") + open(self.ref, "w").write("""foo = fooVal +bar = barVal +eff = effVal""") + def tearDown(self): + shutil.rmtree(self.tmp) + del self.tmp + def testGood(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.properties") + open(l10n, "w").write("""foo = lFoo +bar = lBar +eff = lEff +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.properties", ""), + File(l10n, "l10n.properties", "")) + print obs.serialize() + def testMissing(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.properties") + open(l10n, "w").write("""bar = lBar +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.properties", ""), + File(l10n, "l10n.properties", "")) + print obs.serialize() + mergefile = os.path.join(self.tmp, "merge", "l10n.properties") + self.assertTrue(os.path.isfile(mergefile)) + p = getParser(mergefile) + p.readFile(mergefile) + [m,n] = p.parse() + self.assertEqual(map(lambda e:e.key,m), ["bar", "eff", "foo"]) + +class TestDTD(unittest.TestCase): + def setUp(self): + self.tmp = mkdtemp() + os.mkdir(os.path.join(self.tmp, "merge")) + self.ref = os.path.join(self.tmp, "en-reference.dtd") + open(self.ref, "w").write("""<!ENTITY foo 'fooVal'> +<!ENTITY bar 'barVal'> +<!ENTITY eff 'effVal'>""") + def tearDown(self): + shutil.rmtree(self.tmp) + del self.tmp + def testGood(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.dtd") + open(l10n, "w").write("""<!ENTITY foo 'lFoo'> +<!ENTITY bar 'lBar'> +<!ENTITY eff 'lEff'> +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.dtd", ""), + File(l10n, "l10n.dtd", "")) + print obs.serialize() + def testMissing(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.dtd") + open(l10n, "w").write("""<!ENTITY bar 'lBar'> +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.dtd", ""), + File(l10n, "l10n.dtd", "")) + print obs.serialize() + mergefile = os.path.join(self.tmp, "merge", "l10n.dtd") + self.assertTrue(os.path.isfile(mergefile)) + p = getParser(mergefile) + p.readFile(mergefile) + [m,n] = p.parse() + self.assertEqual(map(lambda e:e.key,m), ["bar", "eff", "foo"]) + +if __name__ == '__main__': + unittest.main() ++++++ firefox-4.0b-source.tar.bz2 ++++++ MozillaFirefox/firefox-4.0b-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/firefox-4.0b-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.OdPJhp/_old 2010-12-28 23:51:52.000000000 +0100 +++ /var/tmp/diff_new_pack.OdPJhp/_new 2010-12-28 23:51:52.000000000 +0100 @@ -23,7 +23,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,965 @@ +@@ -0,0 +1,1042 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -62,6 +62,7 @@ +# Rob Campbell <rcampbell(a)mozilla.com> +# Patrick Walton <pcwalton(a)mozilla.com> +# David Dahl <ddahl(a)mozilla.com> ++# Frank Yan <fyan(a)mozilla.com> +# +# 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 @@ -79,6 +80,7 @@ + +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> ++<?xml-stylesheet href="chrome://global/skin/webConsole.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> + +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> @@ -114,7 +116,7 @@ + windowtype="navigator:browser" + screenX="4" screenY="4" + browsingmode="normal" -+ persist="screenX screenY width height sizemode"> ++ persist="screenX screenY width height sizemode"> + +# All JS files which are not content (only) dependent that browser.xul +# wishes to include *must* go into the global-scripts.inc file @@ -139,9 +141,6 @@ + onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;"> + <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;" + oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> -+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" -+ tbattr="tabbrowser-multiple" -+ oncommand="gBrowser.reloadAllTabs();"/> + <menuseparator/> + <menuitem id="context_pinTab" label="&pinAppTab.label;" + accesskey="&pinAppTab.accesskey;" @@ -154,7 +153,7 @@ + <menupopup id="context_tabViewMenuPopup" + onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);"> + <menuseparator id="context_tabViewNamedGroups" hidden="true"/> -+ <menuitem label="&moveToNewGroup.label;" ++ <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;" + oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/> + </menupopup> + </menu> @@ -163,13 +162,16 @@ + tbattr="tabbrowser-multiple" + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> + <menuseparator/> ++ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" ++ tbattr="tabbrowser-multiple" ++ oncommand="gBrowser.reloadAllTabs();"/> + <menuitem id="context_bookmarkAllTabs" + label="&bookmarkAllTabs.label;" + accesskey="&bookmarkAllTabs.accesskey;" + command="Browser:BookmarkAllTabs"/> -+ <menuseparator/> + <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;" + oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/> ++ <menuseparator/> + <menuitem id="context_undoCloseTab" + label="&undoCloseTab.label;" + accesskey="&undoCloseTab.accesskey;" @@ -193,11 +195,12 @@ + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> + +  -+ <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent"> ++ <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> + <description/> + </panel> + + <panel id="editBookmarkPanel" ++ type="arrow" + orient="vertical" + ignorekeys="true" + hidden="true" @@ -325,7 +328,7 @@ + accesskey="&viewCustomizeToolbar.accesskey;"/> + </menupopup> + -+ <menupopup id="blockedPopupOptions" ++ <menupopup id="blockedPopupOptions" + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> + <menuitem observes="blockedPopupAllowSite"/> + <menuitem observes="blockedPopupEditSettings"/> @@ -357,10 +360,14 @@ + + <menupopup id="placesContext"/> + -+ <panel id="notification-popup" type="arrow" position="after_start" noautofocus="true" hidden="true"/> ++ <panel id="notification-popup" type="arrow" position="after_start" ++ hidden="true" orient="vertical"/> + +  -+ <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true" ++ <panel id="identity-popup" ++ type="arrow" ++ hidden="true" ++ noautofocus="true" + onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" + level="top"> + <hbox id="identity-popup-container" align="top"> @@ -455,29 +462,27 @@ + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> + </popupset> + -+#ifdef MENUBAR_CAN_AUTOHIDE -+ <vbox id="titlebar"> ++#ifdef CAN_DRAW_IN_TITLEBAR ++<vbox id="titlebar"> + <hbox id="titlebar-content"> -+ <hbox id="appmenu-button-container" align="start"> -+ <button id="appmenu-button" -+ type="menu" -+#ifdef XP_WIN -+ label="&brandShortName;" -+#else -+ label="&appMenuButton.label;" -+#endif -+ style="-moz-user-focus: ignore;"> ++ <hbox id="appmenu-button-container"> ++ <button id="appmenu-button" ++ type="menu" ++ label="&brandShortName;" ++ style="-moz-user-focus: ignore;"> +#include browser-appmenu.inc -+ </button> -+ </hbox> -+ <spacer id="titlebar-spacer" flex="1"/> -+ <hbox id="titlebar-buttonbox"> -+ <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> -+ <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> -+ <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> -+ </hbox> ++ </button> ++ </hbox> ++ <spacer id="titlebar-spacer" flex="1"/> ++ <hbox id="titlebar-buttonbox-container" align="start"> ++ <hbox id="titlebar-buttonbox"> ++ <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> ++ <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> ++ <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> ++ </hbox> ++ </hbox> + </hbox> -+ </vbox> ++</vbox> +#endif + +<deck flex="1" id="tab-view-deck"> @@ -501,7 +506,7 @@ +#endif + context="toolbar-context-menu"> + <toolbaritem id="menubar-items" align="center"> -+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by ++# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by +# hiddenWindow.xul. +#include browser-menubar.inc + </toolbaritem> @@ -512,10 +517,10 @@ + fullscreentoolbar="true" mode="icons" customizable="true" +#ifdef WINCE + iconsize="small" defaulticonsize="small" -+ defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls" ++ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls" +#else + iconsize="large" -+ defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,fullscreenflex,window-controls" ++ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls" +#endif + context="toolbar-context-menu"> + @@ -534,16 +539,6 @@ + tooltiptext="&forwardButton.tooltip;"/> + </toolbaritem> + -+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" -+ persist="class" removable="true" -+ label="&homeButton.label;" -+ ondragover="homeButtonObserver.onDragOver(event)" -+ ondragenter="homeButtonObserver.onDragOver(event)" -+ ondrop="homeButtonObserver.onDrop(event)" -+ ondragleave="homeButtonObserver.onDragLeave(event)" -+ onclick="BrowserGoHome(event);" -+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> -+ + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" + title="&locationItem.title;" class="chromeclass-location" removable="true"> + <textbox id="urlbar" flex="1" @@ -606,13 +601,16 @@ + onclick="gURLBar.handleCommand(event);"/> + </hbox> + <toolbarbutton id="urlbar-go-button" ++ class="chromeclass-toolbar-additional" + onclick="gURLBar.handleCommand(event);" + tooltiptext="&goEndCap.tooltip;"/> + <toolbarbutton id="urlbar-reload-button" ++ class="chromeclass-toolbar-additional" + command="Browser:ReloadOrDuplicate" + onclick="checkForMiddleClick(this, event);" + tooltiptext="&reloadButton.tooltip;"/> + <toolbarbutton id="urlbar-stop-button" ++ class="chromeclass-toolbar-additional" + command="Browser:Stop" + tooltiptext="&stopButton.tooltip;"/> + </textbox> @@ -635,6 +633,16 @@ + <searchbar id="searchbar" flex="1"/> + </toolbaritem> + ++ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" ++ persist="class" removable="true" ++ label="&homeButton.label;" ++ ondragover="homeButtonObserver.onDragOver(event)" ++ ondragenter="homeButtonObserver.onDragOver(event)" ++ ondrop="homeButtonObserver.onDrop(event)" ++ ondragexit="homeButtonObserver.onDragExit(event)" ++ onclick="BrowserGoHome(event);" ++ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> ++ + <toolbaritem id="bookmarks-menu-button-container" + class="chromeclass-toolbar-additional" + removable="true" @@ -646,7 +654,7 @@ + tooltiptext="&bookmarksMenuButton.tooltip;" + ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" + ondragover="PlacesMenuDNDHandler.onDragOver(event);" -+ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" ++ ondragexit="PlacesMenuDNDHandler.onDragExit(event);" + ondrop="PlacesMenuDNDHandler.onDrop(event);"> + <menupopup id="BMB_bookmarksPopup" + placespopup="true" @@ -666,7 +674,7 @@ + label="&viewBookmarksToolbar.label;"/> + <menuseparator/> + <menuitem id="BMB_bookmarksShowAll" -+ label="&showAllBookmarks.label;" ++ label="&showAllBookmarks2.label;" + command="Browser:ShowAllBookmarks" + key="manBookmarkKb"/> + <menuseparator/> @@ -678,11 +686,17 @@ + command="Browser:AddBookmarkAs" + key="addBookmarkAsKb"/> + <menuitem id="BMB_subscribeToPageMenuitem" ++#ifndef XP_MACOSX ++ class="menuitem-iconic" ++#endif + label="&subscribeToPageMenuitem.label;" + oncommand="return FeedHandler.subscribeToFeed(null, event);" + onclick="checkForMiddleClick(this, event);" + observes="singleFeedMenuitemState"/> + <menu id="BMB_subscribeToPageMenupopup" ++#ifndef XP_MACOSX ++ class="menu-iconic" ++#endif + label="&subscribeToPageMenupopup.label;" + observes="multipleFeedsMenuState"> + <menupopup id="BMB_subscribeToPageSubmenuMenupopup" @@ -780,6 +794,13 @@ + </toolbaritem> + </toolbar> + ++#ifdef MENUBAR_CAN_AUTOHIDE ++#ifndef CAN_DRAW_IN_TITLEBAR ++#define APPMENU_ON_TABBAR ++#endif ++#endif ++ ++ + <toolbar id="TabsToolbar" + fullscreentoolbar="true" + customizable="true" @@ -787,9 +808,23 @@ + iconsize="small" defaulticonsize="small" lockiconsize="true" + aria-label="&tabsToolbar.label;" + context="toolbar-context-menu" ++#ifdef APPMENU_ON_TABBAR ++ defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" ++#else + defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" ++#endif + collapsed="true"> + ++#ifdef APPMENU_ON_TABBAR ++ <toolbarbutton id="appmenu-toolbar-button" ++ class="chromeclass-toolbar-additional" ++ type="menu" ++ label="&brandShortName;" ++ tooltiptext="&appMenuButton.tooltip;"> ++#include browser-appmenu.inc ++ </toolbarbutton> ++#endif ++ + <tabs id="tabbrowser-tabs" + class="tabbrowser-tabs" + tabbrowser="content" @@ -808,7 +843,7 @@ + ondrop="newTabButtonObserver.onDrop(event)" + ondragover="newTabButtonObserver.onDragOver(event)" + ondragenter="newTabButtonObserver.onDragOver(event)" -+ ondragleave="newTabButtonObserver.onDragLeave(event)" ++ ondragexit="newTabButtonObserver.onDragExit(event)" + removable="true"/> + + <toolbarbutton id="alltabs-button" @@ -855,7 +890,7 @@ + ondrop="DownloadsButtonDNDObserver.onDrop(event)" + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" -+ ondragleave="DownloadsButtonDNDObserver.onDragLeave(event)" ++ ondragexit="DownloadsButtonDNDObserver.onDragExit(event)" + label="&downloads.label;" + tooltiptext="&downloads.tooltip;"/> + @@ -869,7 +904,7 @@ + ondrop="bookmarksButtonObserver.onDrop(event)" + ondragover="bookmarksButtonObserver.onDragOver(event)" + ondragenter="bookmarksButtonObserver.onDragOver(event)" -+ ondragleave="bookmarksButtonObserver.onDragLeave(event)"/> ++ ondragexit="bookmarksButtonObserver.onDragExit(event)"/> + + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&newNavigatorCmd.label;" @@ -878,7 +913,7 @@ + ondrop="newWindowButtonObserver.onDrop(event)" + ondragover="newWindowButtonObserver.onDragOver(event)" + ondragenter="newWindowButtonObserver.onDragOver(event)" -+ ondragleave="newWindowButtonObserver.onDragLeave(event)"/> ++ ondragexit="newWindowButtonObserver.onDragExit(event)"/> + + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&cutCmd.label;" @@ -935,6 +970,7 @@ + </toolbox> + + <hbox flex="1" id="browser"> ++ <vbox id="browser-border-start" hidden="true" layer="true"/> + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> + <sidebarheader id="sidebar-header" align="center"> + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> @@ -954,6 +990,7 @@ + autocompletepopup="PopupAutoComplete" + onclick="return contentAreaClick(event, false);"/> + </vbox> ++ <vbox id="browser-border-end" hidden="true" layer="true"/> + </hbox> + + <vbox id="browser-bottombox" layer="true"> @@ -964,7 +1001,11 @@ + context="toolbar-context-menu" toolboxid="navigator-toolbox" + mode="icons" iconsize="small" defaulticonsize="small" + lockiconsize="true" -+ customizable="true" align="right"> ++ defaultset="addonbar-closebutton,spring,status-bar" ++ customizable="true"> ++ <toolbarbutton id="addonbar-closebutton" ++ tooltiptext="&addonBarCloseButton.tooltip;" ++ oncommand="setToolbarVisibility(this.parentNode, false);"/> + <statusbar id="status-bar"/> + </toolbar> + </vbox> @@ -981,6 +1022,42 @@ + </svg:mask> + </svg:svg> +#endif ++#ifdef XP_MACOSX ++ <svg:svg height="0"> ++ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> ++ <svg:circle cx="9" cy="3" r="3" fill="white"/> ++ <svg:rect x="9" y="0" width="3" height="3" fill="white"/> ++ <svg:rect x="6" y="3" width="6" height="19" fill="white"/> ++ <svg:rect x="1" y="17" width="5" height="5" fill="white"/> ++ <svg:circle cx="1" cy="17" r="5"/> ++ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> ++ </svg:mask> ++ <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse"> ++ <svg:circle cx="3" cy="3" r="3" fill="white"/> ++ <svg:rect x="0" y="0" width="3" height="3" fill="white"/> ++ <svg:rect x="0" y="3" width="6" height="19" fill="white"/> ++ <svg:rect x="6" y="17" width="5" height="5" fill="white"/> ++ <svg:circle cx="11" cy="17" r="5"/> ++ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> ++ </svg:mask> ++ <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse"> ++ <svg:circle cx="9" cy="20" r="3" fill="white"/> ++ <svg:rect x="9" y="20" width="3" height="3" fill="white"/> ++ <svg:rect x="6" y="1" width="6" height="19" fill="white"/> ++ <svg:rect x="1" y="1" width="5" height="5" fill="white"/> ++ <svg:circle cx="1" cy="6" r="5"/> ++ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> ++ </svg:mask> ++ <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse"> ++ <svg:circle cx="3" cy="20" r="3" fill="white"/> ++ <svg:rect x="0" y="20" width="3" height="3" fill="white"/> ++ <svg:rect x="0" y="1" width="6" height="19" fill="white"/> ++ <svg:rect x="6" y="1" width="5" height="5" fill="white"/> ++ <svg:circle cx="11" cy="6" r="5"/> ++ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> ++ </svg:mask> ++ </svg:svg> ++#endif + +</vbox> +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. @@ -1466,7 +1543,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -432,16 +432,17 @@ +@@ -441,16 +441,17 @@ #endif #endif ++++++ l10n-4.0b.tar.bz2 ++++++ MozillaFirefox/l10n-4.0b.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/l10n-4.0b.tar.bz2 differ: char 11, line 1 ++++++ mozilla-firefox-sync.patch ++++++ ++++ 2068 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Tue Dec 28 23:51:53 CET 2010. -------- --- Mesa/Mesa.changes 2010-11-06 09:50:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2010-12-20 16:21:06.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Dec 20 14:34:44 UTC 2010 - sndirsch(a)novell.com + +- Update full mesa stack to pre-7.10 (git 32218e4). + Fixes most of intel SandyBridge rendering issues. +- Set Mesa version to 7.9.801 +- obsoletes commit-d316391.diff +- adjusted 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaLib-7.9.tar.bz2 commit-d316391.diff New: ---- MesaLib-7.9.801-32218e4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.McCkZf/_old 2010-12-28 23:51:27.000000000 +0100 +++ /var/tmp/diff_new_pack.McCkZf/_new 2010-12-28 23:51:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.9) +# spec file for package Mesa (Version 7.9.801) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ %define enable_nouveau 1 -%define _version 7.9 +%define _version 7.9.801-32218e4 -Version: 7.9 -Release: 6 +Version: 7.9.801 +Release: 1 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -56,7 +56,6 @@ Patch9: Mesa_indirect_old_xserver_compatibility.diff Patch11: 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # already upstream -Patch10: commit-d316391.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -148,8 +147,7 @@ sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile %patch8 %patch9 -p0 -%patch10 -p1 -%patch11 -p2 +%patch11 -p1 %build ++++++ 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch ++++++ --- /var/tmp/diff_new_pack.McCkZf/_old 2010-12-28 23:51:27.000000000 +0100 +++ /var/tmp/diff_new_pack.McCkZf/_new 2010-12-28 23:51:27.000000000 +0100 @@ -11,11 +11,9 @@ Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -diff --git a/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c b/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c -index ff53ffd..233f225 100644 ---- a/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c -+++ b/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c -@@ -62,6 +62,7 @@ +--- Mesa-7.9.801-32218e4/src/mesa/drivers/dri/swrast/swrast.c.orig 2010-12-16 15:53:09.000000000 +0100 ++++ Mesa-7.9.801-32218e4/src/mesa/drivers/dri/swrast/swrast.c 2010-12-20 15:48:03.000000000 +0100 +@@ -61,6 +61,7 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format, __DRIdrawable *dPriv) { @@ -23,17 +21,14 @@ struct dri_context *dri_ctx; int x, y, w, h; __DRIscreen *sPriv = dPriv->driScreenPriv; -@@ -92,6 +93,10 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, - - _mesa_set_fetch_functions(texImage, 2); +@@ -90,6 +91,10 @@ static void swrastSetTexBuffer2(__DRIcon + _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage, + w, h, 1, 0, internalFormat, texFormat); + ctx->Driver.TexImage2D(ctx, target, 0, internalFormat, -+ w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8, -+ NULL, &ctx->Unpack, texObj, texImage); ++ w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8, ++ NULL, &ctx->Unpack, texObj, texImage); + sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data, dPriv->loaderPrivate); --- -1.7.3.1 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit GraphicsMagick for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package GraphicsMagick for openSUSE:Factory checked in at Tue Dec 28 23:51:39 CET 2010. -------- --- GraphicsMagick/GraphicsMagick.changes 2010-12-14 18:00:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/GraphicsMagick/GraphicsMagick.changes 2010-12-22 11:13:49.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 22 10:11:32 UTC 2010 - neptunia(a)mail.ru + +- restoring *-config scripts as in upstream version: their removal + breaks older software + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ GraphicsMagick.spec ++++++ --- /var/tmp/diff_new_pack.ivN5gZ/_old 2010-12-28 23:51:17.000000000 +0100 +++ /var/tmp/diff_new_pack.ivN5gZ/_new 2010-12-28 23:51:17.000000000 +0100 @@ -24,7 +24,7 @@ %define base_version 1.3.12 Summary: Viewer and Converter for Images Version: 1.3.12 -Release: 5 +Release: 6 License: MIT License (or similar) Group: Productivity/Graphics/Convertors Source: ftp://ftp.GraphicsMagick.org/pub/%{name}/%{name}-%{version}.tar.bz2 @@ -332,8 +332,8 @@ %dir %{_libdir}/%{name}-%{base_version}/modules-Q%{quant} %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}Wand.pc -%exclude %attr(755, root, root) %{_bindir}/%{name}-config -%exclude %attr(755, root, root) %{_bindir}/%{name}Wand-config +%attr(755, root, root) %{_bindir}/%{name}-config +%attr(755, root, root) %{_bindir}/%{name}Wand-config %doc %{_mandir}/man1/%{name}-config.1.gz %doc %{_mandir}/man1/%{name}Wand-config.1.gz @@ -358,7 +358,7 @@ %{_includedir}/%{name}/Magick++/* %{_libdir}/lib%{name}++.so %{_libdir}/pkgconfig/%{name}++.pc -%exclude %attr(755, root, root) %{_bindir}/%{name}++-config +%attr(755, root, root) %{_bindir}/%{name}++-config %doc %{_mandir}/man1/%{name}++-config.1.gz %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gettext-runtime for openSUSE:Factory
by root＠hilbert.suse.de 22 Dec '10

22 Dec '10

Hello community, here is the log from the commit of package gettext-runtime for openSUSE:Factory checked in at Wed Dec 22 09:40:46 CET 2010. -------- --- gettext-runtime/gettext-csharp.changes 2010-03-28 11:07:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/gettext-runtime/gettext-csharp.changes 2010-12-21 13:53:59.000000000 +0100 @@ -1,0 +2,100 @@ +Tue Dec 21 13:43:49 CET 2010 - pth(a)suse.de + +- Update to 0.18.1. Changes since 0.17: + Version 0.18.1 - June 2010 + + * msggrep: A '$' anchor in a regular expression now also matches + the end of the string, even if it does not end in a newline. + + * Dependencies: + The libraries and programs are now linked with libunistring if + this library is already installed. + + * Installation options: + The configure option --with-cvs is deprecated. The 'autopoint' + program will now use the 'git' program by default to compress its + archive. If the configure option --without-git is specified, + 'autopoint' will not rely on 'git', but will instead rely on a + locally installed 3 MB large archive. + + Version 0.18 - May 2010 + + * PO file format: + There is a new field 'Language' in the header entry. It denotes + the language code (plus optional country code) for the PO file. + This field can be used by automated tools, such as spell + checkers. It is expected to be more reliable than looking at the + file name or at the 'Language-Team' field in the header entry. + + msgmerge, msgcat, msgen have a new option --lang that allows to + specify this field. Additionally, msgmerge fills in this new + field by looking at the 'Language-Team' field (if the --lang + option is not given). + + * xgettext and PO file format: + + For messages with plural forms, programmers can inform the + translators about the range of possible values of the numeric + argument, like this: + /* xgettext: range: 0..15 */ + This information 'range: 0..15' is stored in the PO file as a + flag attached to the message. Translators can produce better + translations when they know that the numeric argument is small. + + * Colorized PO files: + msgattrib, msgcomm, msgconv, msgen, msgfilter, msggrep, msginit, + msgmerge, msgunfmt, msguniq, xgettext now have options --color + and --style, like msgcat has since version 0.17. + + * msgmerge is up to 10 times faster when the PO and POT files are + large. This speedup was contributed by Ralf Wildenhues. + + * msgcmp has a new option -N/--no-fuzzy-matching, like msgmerge has + since version 0.12. + + * msgfilter now sets environment variables during the invocation of + the filter, indicating the msgid and location of the messge being + processed. + + * xgettext now can extract plural forms from Qt 4 programs. The + recommended xgettext command-line options for this case are: + --qt --keyword=tr:1,1t --keyword=tr:1,2c,2t --keyword=tr:1,1,2c,3t + + * xgettext --language=GCC-source now recognizes also the format + strings used in the Fortran front-end of the GCC compiler, and + marks them as 'gfc-internal-format'. + + * autopoint can now be used to update several PO directories all + together. + + * PO mode changes: + - PO files with plural entries are now correctly handled. + - Editing a message with previous msgid (in comments) removes these + comments. Contributed by Noritada Kobayashi. + + * The po/Makevars file has a new field MSGMERGE_OPTIONS, that can + be used to adjust msgmerge's operation. + + * The use of the macro AM_GNU_GETTEXT without 'external' argument + and the --intl option of the gettextize program are deprecated + and will be removed in the next release. Instead of including + the intl sources in your package, we suggest making the libintl + library an (optional) prerequisite of your package. + + * Updated the meaning of 'gcc-internal-format' to match GCC 4.3. + + * Installation options: + The configure options --without-cvs and --with-git can be used to + specify whether 'autopoint' will use the 'cvs' program, or the + 'git' program, or none at all. These options allow to trade + dependencies against installed package size: If --without-cvs is + specified and --with-git is not specified, 'autopoint' will not + rely on 'cvs' or 'git', but will instead rely on a locally + installed a 3 MB large archive. + + * Portability: The msgfilter program now also works on native Woe32 + - platforms. Compiled C# message catalogs now also work with + - 'mono' versions from 2009 + or newer. + +------------------------------------------------------------------- gettext-java.changes: same change gettext-runtime.changes: same change calling whatdependson for head-i586 Old: ---- gettext-0.17-no-autoconf-tests.diff gettext-0.17.tar.bz2 gettext-gl_AC_TYPE_LONG_LONG.patch gettext-open_missing_mode.patch gettext-typo_to_segfault.patch po-mode-cvs-2009-07-23.patch New: ---- gettext-0.18.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gettext-csharp.spec ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gettext-csharp (Version 0.17) +# spec file for package gettext-csharp (Version 0.18.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ License: LGPLv2.1+ Group: Development/Tools/Other AutoReqProv: on -Version: 0.17 -Release: 101 +Version: 0.18.1.1 +Release: 1 Summary: Native Language Support (NLS) for C# PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,11 +41,7 @@ Patch5: gettext-initialize_vars.patch Patch6: gettext-0.15-docdir.diff Patch7: gettext-autotools.patch -Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch -Patch10: gettext-open_missing_mode.patch -Patch11: gettext-typo_to_segfault.patch -Patch12: gettext-0.17-no-autoconf-tests.diff %description Mono with its 'resgen' program uses a design that Microsoft created and @@ -81,36 +77,23 @@ %patch3 %patch4 %patch5 -%patch6 -p1 +%patch6 %patch7 -%patch8 %patch9 -%patch10 -%patch11 -%patch12 -# fix build with new autoconf -# see comments in the file and -# http://www.mail-archive.com/bug-gnulib@gnu.org/msg12384.html -rm -f gettext-tools/gnulib-m4/openmp.m4 -pushd gettext-tools/misc -tar xfz archive.tar.gz -find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/$int$ /$long$ /g' -tar cfz archive.tar.gz archive/ -popd -autoreconf -fiv %build -export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" -export CXXFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" +export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" +export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" +autoreconf -fiv %configure --enable-shared --enable-csharp make GMSGFMT=../src/msgfmt %install export LC_CTYPE=ISO-8859-15 -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} mkdir examples -mv $RPM_BUILD_ROOT/%{_datadir}/doc/gettext/examples/*csharp* examples -mv $RPM_BUILD_ROOT/%{_datadir}/doc/gettext/csharpdoc csharpdoc +mv %{buildroot}/%{_datadir}/doc/gettext/examples/*csharp* examples +mv %{buildroot}/%{_datadir}/doc/gettext/csharpdoc csharpdoc cd examples fdupes -r *|while read dupe; do if [ -z "$dupe" ]; then @@ -122,22 +105,22 @@ fi done cd .. -rm -rf $RPM_BUILD_ROOT/%{_datadir}/* -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -mv examples $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -mv csharpdoc $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +rm -rf %{buildroot}/%{_datadir}/* +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name} +mv examples %{buildroot}/%{_defaultdocdir}/%{name} +mv csharpdoc %{buildroot}/%{_defaultdocdir}/%{name} # exclude files packaged via other spec files -rm -Rf $RPM_BUILD_ROOT/%_bindir -rm -f $RPM_BUILD_ROOT/%_libdir/lib* -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/hostname -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/project-id -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/urlget -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/user-email -rm -Rf $RPM_BUILD_ROOT/%_includedir -rm -f $RPM_BUILD_ROOT/%_libdir/preloadable_libintl.so +rm -Rf %{buildroot}/%_bindir +rm -f %{buildroot}/%_libdir/lib* +rm -f %{buildroot}/%_libdir/gettext/hostname +rm -f %{buildroot}/%_libdir/gettext/project-id +rm -f %{buildroot}/%_libdir/gettext/urlget +rm -f %{buildroot}/%_libdir/gettext/user-email +rm -Rf %{buildroot}/%_includedir +rm -f %{buildroot}/%_libdir/preloadable_libintl.so %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) ++++++ gettext-java.spec ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gettext-java (Version 0.17) +# spec file for package gettext-java (Version 0.18.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ License: LGPLv2.1+ Group: Development/Tools/Other AutoReqProv: on -Version: 0.17 -Release: 113 +Version: 0.18.1.1 +Release: 1 Summary: Java Support for Native Language Support (NLS) PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,11 +40,7 @@ Patch5: gettext-initialize_vars.patch Patch6: gettext-0.15-docdir.diff Patch7: gettext-autotools.patch -Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch -Patch10: gettext-open_missing_mode.patch -Patch11: gettext-typo_to_segfault.patch -Patch12: gettext-0.17-no-autoconf-tests.diff %description This package includes the tools needed to support message catalogs in @@ -58,34 +54,21 @@ %patch3 %patch4 %patch5 -%patch6 -p1 +%patch6 %patch7 -%patch8 %patch9 -%patch10 -%patch11 -%patch12 -# fix build with new autoconf -# see comments in the file and -# http://www.mail-archive.com/bug-gnulib@gnu.org/msg12384.html -rm -f gettext-tools/gnulib-m4/openmp.m4 -pushd gettext-tools/misc -tar xfz archive.tar.gz -find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/$int$ /$long$ /g' -tar cfz archive.tar.gz archive/ -popd -autoreconf -fiv %build -export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" -export CXXFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" +export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" +export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" +autoreconf -fiv %configure --enable-shared make GMSGFMT=../src/msgfmt %install export LC_CTYPE=ISO-8859-15 -make -C gettext-tools/gnulib-lib install DESTDIR=$RPM_BUILD_ROOT -make -C gettext-tools/src install DESTDIR=$RPM_BUILD_ROOT +make -C gettext-tools/gnulib-lib install DESTDIR=%{buildroot} +make -C gettext-tools/src install DESTDIR=%{buildroot} make -C gettext-runtime/intl-java install DESTDIR=$PWD docdir=/docs make -C gettext-tools/examples install DESTDIR=$PWD docdir=/allexamples mkdir -p docs/examples @@ -102,9 +85,9 @@ done cd .. find -size 0 -print0 | xargs -0 --no-run-if-empty rm -rm -rf $RPM_BUILD_ROOT/%{_datadir}/* -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -cp -av * $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +rm -rf %{buildroot}/%{_datadir}/* +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name} +cp -av * %{buildroot}/%{_defaultdocdir}/%{name} cd ../allexamples/examples rm -rf *csharp* fdupes -r * | while read dupe; do @@ -125,17 +108,17 @@ ###################################################### END } -ls -l $RPM_BUILD_ROOT/%_datadir +ls -l %{buildroot}/%_datadir # exclude files packaged via other spec files -rm -rf $RPM_BUILD_ROOT/%_prefix/bin -rm -f $RPM_BUILD_ROOT/%_libdir/lib* -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/hostname -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/project-id -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/urlget -rm -f $RPM_BUILD_ROOT/%_libdir/gettext/user-email +rm -rf %{buildroot}/%_prefix/bin +rm -f %{buildroot}/%_libdir/lib* +rm -f %{buildroot}/%_libdir/gettext/hostname +rm -f %{buildroot}/%_libdir/gettext/project-id +rm -f %{buildroot}/%_libdir/gettext/urlget +rm -f %{buildroot}/%_libdir/gettext/user-email %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) ++++++ gettext-runtime.spec ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gettext-runtime (Version 0.17) +# spec file for package gettext-runtime (Version 0.18.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,11 +17,11 @@ # norootforbuild +%define pacname gettext Name: gettext-runtime -%define pacname gettext -Version: 0.17 -Release: 68 +Version: 0.18.1.1 +Release: 1 BuildRequires: gcc-c++ perl-libintl-perl tcl # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: #BuildRequires: fdupes @@ -39,7 +39,7 @@ Summary: Tools for Native Language Support (NLS) PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: %pacname-%version.tar.bz2 +Source: gettext-%{version}.tar.bz2 Source1: gettext-rpmlintrc Source2: suse-start-po-mode.el Source3: gettext-linkdupes.sh @@ -51,12 +51,7 @@ Patch5: gettext-initialize_vars.patch Patch6: gettext-0.15-docdir.diff Patch7: gettext-autotools.patch -Patch8: gettext-gl_AC_TYPE_LONG_LONG.patch Patch9: gettext-needlessly_init_vars.patch -Patch10: gettext-open_missing_mode.patch -Patch11: gettext-typo_to_segfault.patch -Patch12: gettext-0.17-no-autoconf-tests.diff -Patch13: po-mode-cvs-2009-07-23.patch %description This package contains the intl library as well as tools that ease the @@ -109,31 +104,15 @@ %patch3 %patch4 %patch5 -%patch6 -p1 +%patch6 %patch7 -%patch8 %patch9 -%patch10 -%patch11 -%patch12 -%patch13 -p1 -# fix build with new autoconf -# see comments in the file and -# http://www.mail-archive.com/bug-gnulib@gnu.org/msg12384.html -rm -f gettext-tools/gnulib-m4/openmp.m4 -pushd gettext-tools/misc -tar xfz archive.tar.gz -find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/$int$ /$long$ /g' -tar cfz archive.tar.gz archive/ -popd -# force rebuild with non-broken makeinfo -rm -f gettext-tools/doc/*.info %build # expect a couple "You should update your `aclocal.m4' by running aclocal." autoreconf -fiv #sh autogen.sh -export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall -Dgcc_is_lint" +export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" export CXXFLAGS="$CFLAGS -Dgcc_is_lint" %configure --enable-shared make %{?_smp_mflags} GMSGFMT=../src/msgfmt @@ -143,32 +122,32 @@ %install %define my_docdir %{_defaultdocdir}/%{name} export LC_CTYPE=ISO-8859-15 -make install DESTDIR=$RPM_BUILD_ROOT docdir=%{my_docdir} -cp -pr AUTHORS COPYING NEWS README* $RPM_BUILD_ROOT/%{my_docdir} -mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp -install -m 644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/emacs/site-lisp -install -m 644 gettext-tools/misc/po-compat.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp -install -m 644 gettext-tools/misc/po-mode.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp -install -m 644 gettext-tools/misc/start-po.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp -#make -C gettext-tools/doc docdir=$RPM_BUILD_ROOT/%{my_docdir} install-pdf -if [ -e $RPM_BUILD_ROOT/%{_libdir}/preloadable_libintl.so ];then - chmod 755 $RPM_BUILD_ROOT/%{_libdir}/preloadable_libintl.so +make install DESTDIR=%{buildroot} docdir=%{my_docdir} +cp -pr AUTHORS COPYING NEWS README* %{buildroot}/%{my_docdir} +mkdir -p %{buildroot}/usr/share/emacs/site-lisp +install -m 644 %SOURCE2 %{buildroot}/usr/share/emacs/site-lisp +install -m 644 gettext-tools/misc/po-compat.el %{buildroot}/usr/share/emacs/site-lisp +install -m 644 gettext-tools/misc/po-mode.el %{buildroot}/usr/share/emacs/site-lisp +install -m 644 gettext-tools/misc/start-po.el %{buildroot}/usr/share/emacs/site-lisp +#make -C gettext-tools/doc docdir=%{buildroot}/%{my_docdir} install-pdf +if [ -e %{buildroot}/%{_libdir}/preloadable_libintl.so ];then + chmod 755 %{buildroot}/%{_libdir}/preloadable_libintl.so fi # fix rpmlint invalid-lc-messages-dir: -rm -rf $RPM_BUILD_ROOT/%_datadir/locale/en@{bold,}quot +rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot %{find_lang} gettext-tools %{find_lang} gettext-runtime #remove unwanted stuff -rm -f $RPM_BUILD_ROOT/usr/share/doc/packages/gettext/README.{mingw,vms,woe32} +rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32} rm -f %_datadir/%name/gettext.jar -#find $RPM_BUILD_ROOT -maxdepth 2 -name '*html' | xargs rm -f +#find %{buildroot} -maxdepth 2 -name '*html' | xargs rm -f # hardlink the dupes in the documentation: -cd $RPM_BUILD_ROOT/%{my_docdir}/examples +cd %{buildroot}/%{my_docdir}/examples sh %{SOURCE3} # moved to gettext-java and gettext-csharp: rm -rf *csharp* *java* ../javadoc* ../csharpdoc* rm -f %{buildroot}%{_defaultdocdir}/%name/README.woe32 -cd $RPM_BUILD_ROOT/%{_mandir}/man3 +cd %{buildroot}/%{_mandir}/man3 echo ".so man3/dngettext.3" > dcngettext.3 echo ".so man3/dgettext.3" > dcgettext.3 @@ -187,7 +166,7 @@ } %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -275,8 +254,8 @@ %_datadir/%pacname/gettext.h %_datadir/%pacname/msgunfmt.tcl %_datadir/%pacname/javaversion.class -%_datadir/%pacname/archive.tar.gz %_datadir/%pacname/styles +%_datadir/%pacname/archive.dir.tar.gz %_datadir/aclocal/* %changelog ++++++ gettext-0.12.1-gettextize.patch ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- gettext-tools/misc/gettextize.in -+++ gettext-tools/misc/gettextize.in -@@ -1070,20 +1070,6 @@ +Index: gettext-tools/misc/gettextize.in +=================================================================== +--- gettext-tools/misc/gettextize.in.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-tools/misc/gettextize.in 2010-12-20 18:47:11.932132562 +0100 +@@ -1262,20 +1262,6 @@ if $doit; then echo "It is a wrapper around <libintl.h> that implements the configure --disable-nls" echo "option." echo ++++++ gettext-0.12.1-sigfpe.patch ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- gettext-runtime/intl/dcigettext.c -+++ gettext-runtime/intl/dcigettext.c 2002/08/08 10:27:59 -@@ -63,20 +63,7 @@ +Index: gettext-runtime/intl/dcigettext.c +=================================================================== +--- gettext-runtime/intl/dcigettext.c.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-runtime/intl/dcigettext.c 2010-12-20 18:47:11.543133542 +0100 +@@ -68,20 +68,7 @@ extern int errno; #endif #include <locale.h> @@ -22,9 +24,11 @@ #if defined HAVE_SYS_PARAM_H || defined _LIBC # include <sys/param.h> ---- gettext-runtime/intl/eval-plural.h -+++ gettext-runtime/intl/eval-plural.h 2002/08/08 10:27:59 -@@ -68,16 +68,12 @@ +Index: gettext-runtime/intl/eval-plural.h +=================================================================== +--- gettext-runtime/intl/eval-plural.h.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-runtime/intl/eval-plural.h 2010-12-20 18:48:36.928872823 +0100 +@@ -62,16 +62,12 @@ plural_eval (const struct expression *pe case mult: return leftarg * rightarg; case divide: ++++++ gettext-0.15-docdir.diff ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- gettext-0.16/gettext-tools/doc/Makefile.am -+++ gettext-0.16/gettext-tools/doc/Makefile.am -@@ -40,6 +40,7 @@ +Index: gettext-tools/doc/Makefile.am +=================================================================== +--- gettext-tools/doc/Makefile.am.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-tools/doc/Makefile.am 2010-12-20 18:47:12.009132367 +0100 +@@ -42,6 +42,7 @@ gettext_TEXINFOS = \ $(top_srcdir)/../gettext-runtime/doc/rt-ngettext.texi \ $(top_srcdir)/../gettext-runtime/doc/rt-envsubst.texi ++++++ gettext-0.17.tar.bz2 -> gettext-0.18.1.1.tar.bz2 ++++++ gettext-runtime/gettext-0.17.tar.bz2 /mounts/work_src_done/STABLE/gettext-runtime/gettext-0.18.1.1.tar.bz2 differ: byte 11, line 1 ++++++ gettext-autotools.patch ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- gettext-runtime/configure.ac -+++ gettext-runtime/configure.ac -@@ -30,6 +30,7 @@ +Index: gettext-runtime/configure.ac +=================================================================== +--- gettext-runtime/configure.ac.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-runtime/configure.ac 2010-12-20 18:47:12.027132323 +0100 +@@ -30,6 +30,7 @@ test "$docdir" != '${datarootdir}/doc/${ dnl Checks for programs. AC_PROG_CC ++++++ gettext-codecleanup.patch ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,5 +1,7 @@ ---- gettext-runtime/intl/eval-plural.h -+++ gettext-runtime/intl/eval-plural.h +Index: gettext-runtime/intl/eval-plural.h +=================================================================== +--- gettext-runtime/intl/eval-plural.h.orig 2010-12-20 18:47:11.544133539 +0100 ++++ gettext-runtime/intl/eval-plural.h 2010-12-20 18:47:11.952132512 +0100 @@ -16,6 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @@ -9,6 +11,3 @@ #ifndef STATIC #define STATIC static #endif - /* -------------------------- gl_list_t Data Type -------------------------- */ - - static gl_list_t ++++++ gettext-initialize_vars.patch ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- gettext-tools/gnulib-lib/gl_anylinked_list2.h -+++ gettext-tools/gnulib-lib/gl_anylinked_list2.h -@@ -35,6 +35,12 @@ +Index: gettext-tools/gnulib-lib/gl_anylinked_list2.h +=================================================================== +--- gettext-tools/gnulib-lib/gl_anylinked_list2.h.orig 2010-05-24 11:42:37.000000000 +0200 ++++ gettext-tools/gnulib-lib/gl_anylinked_list2.h 2010-12-20 18:47:11.981132438 +0100 +@@ -34,6 +34,12 @@ # define ASYNCSAFE(type) #endif ++++++ gettext-needlessly_init_vars.patch ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- gettext-tools/gnulib-lib/gl_array_list.c -+++ gettext-tools/gnulib-lib/gl_array_list.c -@@ -421,7 +421,7 @@ +Index: gettext-tools/gnulib-lib/gl_array_list.c +=================================================================== +--- gettext-tools/gnulib-lib/gl_array_list.c.orig 2010-12-20 18:47:23.871101502 +0100 ++++ gettext-tools/gnulib-lib/gl_array_list.c 2010-12-20 18:47:37.666063318 +0100 +@@ -454,7 +454,7 @@ gl_array_iterator (gl_list_t list) result.count = list->count; result.p = list->elements + 0; result.q = list->elements + list->count; @@ -9,7 +11,7 @@ result.i = 0; result.j = 0; #endif -@@ -442,7 +442,7 @@ +@@ -475,7 +475,7 @@ gl_array_iterator_from_to (gl_list_t lis result.count = list->count; result.p = list->elements + start_index; result.q = list->elements + end_index; ++++++ po-mode.diff ++++++ --- /var/tmp/diff_new_pack.nYD7TL/_old 2010-12-22 09:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nYD7TL/_new 2010-12-22 09:31:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- gettext-tools/misc/po-mode.el -+++ gettext-tools/misc/po-mode.el -@@ -1110,6 +1110,7 @@ +Index: gettext-tools/misc/po-mode.el +=================================================================== +--- gettext-tools/misc/po-mode.el.orig 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-tools/misc/po-mode.el 2010-12-20 18:47:11.963132483 +0100 +@@ -1242,6 +1242,7 @@ all reachable through 'M-x customize', i ;; mode-line-format usually contains global-mode-string, but some ;; people customize this variable. As a last resort, append at the end. (let ((prev-entry (or (member 'global-mode-string mode-line-format) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ncurses for openSUSE:Factory
by root＠hilbert.suse.de 22 Dec '10

22 Dec '10

Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at Wed Dec 22 09:30:44 CET 2010. -------- --- ncurses/ncurses.changes 2010-10-12 16:33:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/ncurses/ncurses.changes 2010-12-21 18:33:19.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 18:32:15 CET 2010 - werner(a)suse.de + +- Change rxvt-unicode terminfo entry (Thanks darix) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.OTB1bf/_old 2010-12-22 09:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.OTB1bf/_new 2010-12-22 09:11:07.000000000 +0100 @@ -37,7 +37,7 @@ %endif # Version: 5.7 -Release: 11 +Release: 12 Summary: New curses Libraries Url: http://invisible-island.net/ncurses/ncurses.html Source0: ncurses-%{version}.tar.bz2 @@ -277,8 +277,8 @@ %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .gpm %patch -P 6 -p0 -b .fb -%patch -P 7 -p0 -%patch -P 0 -p0 +%patch -P 7 -p0 -b .pthread +%patch -P 0 -p0 -b .p0 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh rm -vf tar-copy.sh ++++++ ncurses-5.7.dif ++++++ --- /var/tmp/diff_new_pack.OTB1bf/_old 2010-12-22 09:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.OTB1bf/_new 2010-12-22 09:11:07.000000000 +0100 @@ -127,8 +127,29 @@ ;; esac done +--- configure.in ++++ configure.in 2010-10-12 08:54:24.000000000 +0000 +@@ -1150,7 +1150,9 @@ if test "$with_reentrant" = yes ; then + CF_ADD_LIB(pthread,TEST_LIBS) + CF_ADD_LIB(pthread,TEST_LIBS2) + fi +- LIB_SUFFIX="t${LIB_SUFFIX}" ++ if test $cf_cv_weak_symbols != yes ; then ++ LIB_SUFFIX="t${LIB_SUFFIX}" ++ fi + AC_DEFINE(USE_REENTRANT) + CF_NCURSES_ABI_6 + else +@@ -1761,6 +1763,7 @@ if test "$with_termlib" != no ; then + TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" + SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" + fi ++ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" + else + # the next lines are needed for linking libtic over libncurses + TINFO_NAME=${LIB_NAME} --- configure -+++ configure 2010-10-12 08:54:45.515926837 +0000 ++++ configure 2010-10-12 08:54:46.000000000 +0000 @@ -5355,7 +5355,7 @@ irix*) #(vi fi ;; @@ -284,27 +305,6 @@ else # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} ---- configure.in -+++ configure.in 2010-10-12 08:54:23.859926357 +0000 -@@ -1150,7 +1150,9 @@ if test "$with_reentrant" = yes ; then - CF_ADD_LIB(pthread,TEST_LIBS) - CF_ADD_LIB(pthread,TEST_LIBS2) - fi -- LIB_SUFFIX="t${LIB_SUFFIX}" -+ if test $cf_cv_weak_symbols != yes ; then -+ LIB_SUFFIX="t${LIB_SUFFIX}" -+ fi - AC_DEFINE(USE_REENTRANT) - CF_NCURSES_ABI_6 - else -@@ -1761,6 +1763,7 @@ if test "$with_termlib" != no ; then - TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" - SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" - fi -+ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" - else - # the next lines are needed for linking libtic over libncurses - TINFO_NAME=${LIB_NAME} --- include/curses.h.in +++ include/curses.h.in 2010-10-11 13:57:42.000000000 +0000 @@ -144,6 +144,9 @@ typedef unsigned @cf_cv_typeof_chtype@ c @@ -381,7 +381,7 @@ fi sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO --- misc/terminfo.src -+++ misc/terminfo.src 2010-10-11 13:59:41.000000000 +0000 ++++ misc/terminfo.src 2010-12-21 17:29:43.388425876 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -593,13 +593,14 @@ kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, -@@ -4185,6 +4221,29 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -4185,6 +4221,39 @@ rxvt-cygwin-native|rxvt terminal emulato acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, +# From: Thomas Dickey <dickey(a)clark.net> 04 Oct 1997 +# Updated: �zg�r Kesim <kesim(a)math.fu-berlin.de> 02 Nov 1997 +# Updated: Marc Lehmann <pcg(a)goof.com>, 17 Feb 2005 ++# Updated: Marc Lehmann <schmorp(a)schmorp.de>, 04 Nov 2008: change init/reset sequences +# +rxvt-unicode|rxvt-unicode terminal (X Window System), + bw, ccc, hs, mc5i, npc, btns#5, colors#88, lm#0, ncv#0, pairs#256, @@ -607,23 +608,32 @@ + dsl=\E]2;\007, ech=\E[%p1%dX, enacs=, flash=\E[?5h$<20/>\E[?5l, + fsl=^G, indn=\E[%p1%dS, + initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, ++ is1=\E[!p, ++ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, + kIC=\E2$, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, + rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, + rmcup=\E[r\E[?1049l, rmkx=\E[?1l\E>, rs1=\Ec, ++ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, + s2ds=\E*B, s3ds=\E+B, + setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm, + setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, + setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, -+ sgr0=\E[m\017, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, ++ sgr0=\E[m\E(B, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, + smcup=\E[?1049h, smkx=\E[?1h\E=, + tsl=\E]2;, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, + use=rxvt-basic, + ++rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), ++ colors#256, ++ pairs#32767, ++ use=rxvt-unicode, ++ ++ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|xterm with 16 colors like aixterm, -@@ -4212,7 +4271,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -4212,7 +4281,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -632,7 +642,7 @@ # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # but does otherwise follow the rxvt+pcfkeys model -TD # remove nonworking flash -TD -@@ -4226,13 +4285,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -4226,13 +4295,13 @@ Eterm|Eterm-color|Eterm with xterm-style csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -648,7 +658,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -4604,7 +4663,7 @@ pty|4bsd pseudo teletype, +@@ -4604,7 +4673,7 @@ pty|4bsd pseudo teletype, smso=\Ea$, smul=\Ea!, use=cbunix, # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -657,7 +667,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -4617,6 +4676,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -4617,6 +4686,13 @@ eterm|gnu emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -671,7 +681,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -4665,7 +4731,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -4665,7 +4741,7 @@ screen|VT 100/ANSI X3.64 virtual termina cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, @@ -680,7 +690,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, -@@ -4842,7 +4908,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -4842,7 +4918,7 @@ screen2|old VT 100/ANSI X3.64 virtual te cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -689,7 +699,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -6561,7 +6627,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -6561,7 +6637,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -698,7 +708,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -9692,6 +9758,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -9692,6 +9768,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to bug-gnu-emacs(a)prep.ai.mit.edu. # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr) @@ -706,7 +716,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -9701,7 +9768,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -9701,7 +9778,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -715,7 +725,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, -@@ -13976,7 +14043,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -13976,7 +14053,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH, @@ -724,7 +734,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;, sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162, -@@ -14204,7 +14271,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -14204,7 +14281,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, @@ -746,7 +756,7 @@ sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h +++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000 -@@ -1866,6 +1866,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ +@@ -1867,6 +1867,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(int) _nc_access (const char *, int); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop mysql-gui-tools from openSUSE:Factory
by root＠hilbert.suse.de 20 Dec '10

20 Dec '10

Hello community, FYI: Package mysql-gui-tools was dropped from openSUSE:Factory at Mon Dec 20 18:27:29 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=my… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0