March 2010 - openSUSE Commits - openSUSE Mailing Lists

commit krb5 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Mar '10

25 Mar '10

Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at Fri Mar 26 00:13:28 CET 2010. -------- --- krb5/krb5-doc.changes 2010-03-04 11:58:11.000000000 +0100 +++ krb5/krb5-doc.changes 2010-03-23 12:40:50.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 23 12:38:29 CET 2010 - mc(a)suse.de + +- add post 1.8 fixes + * Document the ticket_lifetime libdefaults setting + +------------------------------------------------------------------- --- krb5/krb5-mini.changes 2010-03-05 02:08:51.000000000 +0100 +++ krb5/krb5-mini.changes 2010-03-26 00:10:07.492839000 +0100 @@ -1,0 +2,22 @@ +Tue Mar 23 14:32:41 CET 2010 - mc(a)suse.de + +- fix a bug where an unauthenticated remote attacker could cause + a GSS-API application including the Kerberos administration + daemon (kadmind) to crash. + CVE-2010-0628, MITKRB5-SA-2010-002 (bnc#582557) + +------------------------------------------------------------------- +Tue Mar 23 12:33:26 CET 2010 - mc(a)suse.de + +- add post 1.8 fixes + * Add IPv6 support to changepw.c + * fix two problems in kadm5_get_principal mask handling + * Ignore improperly encoded signedpath AD elements + * handle NT_SRV_INST in service principal referrals + * dereference options while checking + KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT + * Fix the kpasswd fallback from the ccache principal name + * Document the ticket_lifetime libdefaults setting + * Change KRB5_AUTHDATA_SIGNTICKET from 142 to 512 + +------------------------------------------------------------------- krb5.changes: same change calling whatdependson for head-i586 New: ---- krb5-1.7-MITKRB5-SA-2010-002.dif krb5-1.8-POST.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-doc.spec ++++++ --- /var/tmp/diff_new_pack.hXrtuB/_old 2010-03-26 00:10:21.000000000 +0100 +++ /var/tmp/diff_new_pack.hXrtuB/_new 2010-03-26 00:10:21.000000000 +0100 @@ -21,7 +21,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.8 -Release: 1 +Release: 2 %define srcRoot krb5-1.8 Summary: MIT Kerberos5 Implementation--Documentation License: MIT License (or similar) @@ -31,6 +31,7 @@ Source3: %{name}-%{version}-rpmlintrc Patch0: krb5-1.3.5-perlfix.dif Patch1: krb5-1.6.3-texi2dvi-fix.dif +Patch2: krb5-1.8-POST.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -53,6 +54,7 @@ %setup -n %{srcRoot} %patch0 %patch1 +%patch2 %build ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.hXrtuB/_old 2010-03-26 00:10:21.000000000 +0100 +++ /var/tmp/diff_new_pack.hXrtuB/_new 2010-03-26 00:10:21.000000000 +0100 @@ -28,7 +28,7 @@ BuildRequires: bison libcom_err-devel ncurses-devel BuildRequires: keyutils keyutils-devel Version: 1.8 -Release: 1 +Release: 2 %if ! 0%{?build_mini} BuildRequires: libopenssl-devel openldap2-devel # bug437293 @@ -55,6 +55,8 @@ Patch41: krb5-1.6.3-kpasswd_tcp.patch Patch44: krb5-1.6.3-ktutil-manpage.dif Patch46: krb5-1.6.3-fix-ipv6-query.dif +Patch47: krb5-1.7-MITKRB5-SA-2010-002.dif +Patch50: krb5-1.8-POST.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -202,6 +204,8 @@ %patch41 %patch44 -p1 %patch46 -p1 +%patch47 +%patch50 # Rename the man pages so that they'll get generated correctly. pushd src cat %{SOURCE10} | while read manpage ; do krb5.spec: same change ++++++ krb5-1.7-MITKRB5-SA-2010-002.dif ++++++ Index: src/lib/gssapi/spnego/spnego_mech.c =================================================================== --- src/lib/gssapi/spnego/spnego_mech.c.orig +++ src/lib/gssapi/spnego/spnego_mech.c @@ -1576,7 +1576,7 @@ spnego_gss_accept_sec_context( spnego_gss_ctx_id_t sc = NULL; spnego_gss_cred_id_t spcred = NULL; OM_uint32 mechstat = GSS_S_FAILURE; - int sendTokenInit = 0; + int sendTokenInit = 0, tmpret; mechtok_in = mic_in = mic_out = GSS_C_NO_BUFFER; @@ -1609,7 +1609,6 @@ spnego_gss_accept_sec_context( if (delegated_cred_handle != NULL) *delegated_cred_handle = GSS_C_NO_CREDENTIAL; if (input_token->length == 0) { - sendTokenInit = 1; ret = acc_ctx_hints(minor_status, context_handle, spcred, &mic_out, @@ -1617,6 +1616,7 @@ spnego_gss_accept_sec_context( &return_token); if (ret != GSS_S_COMPLETE) goto cleanup; + sendTokenInit = 1; ret = GSS_S_CONTINUE_NEEDED; } else { /* Can set negState to REQUEST_MIC */ @@ -1664,27 +1664,21 @@ spnego_gss_accept_sec_context( &negState, &return_token); } cleanup: - if (return_token != NO_TOKEN_SEND && return_token != CHECK_MIC) { - /* For acceptor-sends-first send a tokenInit */ - int tmpret; - + if (return_token == INIT_TOKEN_SEND && sendTokenInit) { assert(sc != NULL); - - if (sendTokenInit) { - tmpret = make_spnego_tokenInit_msg(sc, - 1, - mic_out, - 0, - GSS_C_NO_BUFFER, - return_token, - output_token); - } else { - tmpret = make_spnego_tokenTarg_msg(negState, - sc ? sc->internal_mech : GSS_C_NO_OID, - &mechtok_out, mic_out, - return_token, - output_token); - } + tmpret = make_spnego_tokenInit_msg(sc, 1, mic_out, 0, + GSS_C_NO_BUFFER, + return_token, output_token); + if (tmpret < 0) + ret = GSS_S_FAILURE; + } else if (return_token != NO_TOKEN_SEND && + return_token != CHECK_MIC) { + tmpret = make_spnego_tokenTarg_msg(negState, + sc ? sc->internal_mech : + GSS_C_NO_OID, + &mechtok_out, mic_out, + return_token, + output_token); if (tmpret < 0) ret = GSS_S_FAILURE; } ++++++ krb5-1.8-POST.dif ++++++ Index: doc/admin.texinfo =================================================================== --- doc/admin.texinfo.orig +++ doc/admin.texinfo @@ -516,13 +516,6 @@ DCE do not support the default cache as Kerberos. Use a value of 1 on DCE 1.0.3a systems, and a value of 2 on DCE 1.1 systems. The default value is @value{DefaultCcacheType}. -@ignore -@itemx tkt_lifetime -The default lifetime of a ticket. The default is -@value{DefaultTktLifetime}. This is currently not supported by the -code. -@end ignore - @itemx dns_lookup_kdc Indicate whether DNS SRV records should be used to locate the KDCs and other servers for a realm, if they are not listed in the information for @@ -583,6 +576,11 @@ If this flag is set, then an attempt to fail if the client machine does not have a keytab. The default for the flag is @value{DefaultVerifyApReqNofail}. +@itemx ticket_lifetime +The value of this tag is the default lifetime for +initial tickets. The default value for the tag is +@value{DefaultTktLifetime}. + @itemx renew_lifetime The value of this tag is the default renewable lifetime for initial tickets. The default value for the tag is Index: src/include/krb5/krb5.hin =================================================================== --- src/include/krb5/krb5.hin.orig +++ src/include/krb5/krb5.hin @@ -1066,7 +1066,7 @@ krb5_verify_checksum(krb5_context contex #define KRB5_AUTHDATA_SESAME 65 #define KRB5_AUTHDATA_WIN2K_PAC 128 #define KRB5_AUTHDATA_ETYPE_NEGOTIATION 129 /* RFC 4537 */ -#define KRB5_AUTHDATA_SIGNTICKET 142 +#define KRB5_AUTHDATA_SIGNTICKET 512 /* formerly 142 in krb5 1.8 */ #define KRB5_AUTHDATA_FX_ARMOR 71 /* password change constants */ @@ -1184,6 +1184,19 @@ typedef struct _krb5_pa_data { krb5_octet *contents; } krb5_pa_data; +/* typed data */ +/* + * The FAST error handling logic currently assumes that this structure and + * krb5_pa_data * can be safely cast to each other if this structure changes, + * that code needs to be updated to copy. + */ +typedef struct _krb5_typed_data { + krb5_magic magic; + krb5_int32 type; + unsigned int length; + krb5_octet *data; +} krb5_typed_data; + typedef struct _krb5_kdc_req { krb5_magic magic; krb5_msgtype msg_type; /* AS_REQ or TGS_REQ? */ Index: src/include/k5-int-pkinit.h =================================================================== --- src/include/k5-int-pkinit.h.orig +++ src/include/k5-int-pkinit.h @@ -101,17 +101,6 @@ typedef struct _krb5_trusted_ca { } u; } krb5_trusted_ca; -/* typed data */ -/* The FAST error handling logic currently assumes that this structure and krb5_pa_data * can be safely cast to each other - * if this structure changes, that code needs to be updated to copy. - */ -typedef struct _krb5_typed_data { - krb5_magic magic; - krb5_int32 type; - unsigned int length; - krb5_octet *data; -} krb5_typed_data; - /* PA-PK-AS-REQ (Draft 9 -- PA TYPE 14) */ typedef struct _krb5_pa_pk_as_req_draft9 { krb5_octet_data signedAuthPack; Index: src/kdc/kdc_authdata.c =================================================================== --- src/kdc/kdc_authdata.c.orig +++ src/kdc/kdc_authdata.c @@ -934,8 +934,12 @@ verify_ad_signedpath(krb5_context contex enc_sp.length = sp_authdata[0]->length; code = decode_krb5_ad_signedpath(&enc_sp, &sp); - if (code != 0) + if (code != 0) { + /* Treat an invalid signedpath authdata element as a missing one, since + * we believe MS is using the same number for something else. */ + code = 0; goto cleanup; + } code = verify_ad_signedpath_checksum(context, krbtgt, Index: src/kdc/do_tgs_req.c =================================================================== --- src/kdc/do_tgs_req.c.orig +++ src/kdc/do_tgs_req.c @@ -1215,6 +1215,7 @@ prep_reprocess_req(krb5_kdc_req *request strlcpy(comp1_str,comp1->data,comp1->length+1); if ((krb5_princ_type(kdc_context, request->server) == KRB5_NT_SRV_HST || + krb5_princ_type(kdc_context, request->server) == KRB5_NT_SRV_INST || (krb5_princ_type(kdc_context, request->server) == KRB5_NT_UNKNOWN && kdc_active_realm->realm_host_based_services != NULL && (krb5_match_config_pattern(kdc_active_realm->realm_host_based_services, Index: src/clients/kpasswd/kpasswd.c =================================================================== --- src/clients/kpasswd/kpasswd.c.orig +++ src/clients/kpasswd/kpasswd.c @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { krb5_error_code ret; krb5_context context; - krb5_principal princ; + krb5_principal princ = NULL; char *pname; krb5_ccache ccache; krb5_get_init_creds_opt *opts = NULL; @@ -84,23 +84,27 @@ int main(int argc, char *argv[]) com_err(argv[0], ret, "parsing client name"); exit(1); } - } else if ((ret = krb5_cc_default(context, &ccache)) != KRB5_CC_NOTFOUND) { - if (ret) { + } else { + ret = krb5_cc_default(context, &ccache); + if (ret != 0) { com_err(argv[0], ret, "opening default ccache"); exit(1); } - if ((ret = krb5_cc_get_principal(context, ccache, &princ))) { + ret = krb5_cc_get_principal(context, ccache, &princ); + if (ret != 0 && ret != KRB5_CC_NOTFOUND && ret != KRB5_FCC_NOFILE) { com_err(argv[0], ret, "getting principal from ccache"); exit(1); } - if ((ret = krb5_cc_close(context, ccache))) { + ret = krb5_cc_close(context, ccache); + if (ret != 0) { com_err(argv[0], ret, "closing ccache"); exit(1); } - } else { - get_name_from_passwd_file(argv[0], context, &princ); + + if (princ == NULL) + get_name_from_passwd_file(argv[0], context, &princ); } if ((ret = krb5_get_init_creds_opt_alloc(context, &opts))) { Index: src/config-files/krb5.conf.M =================================================================== --- src/config-files/krb5.conf.M.orig +++ src/config-files/krb5.conf.M @@ -220,6 +220,10 @@ If this flag is set, then an attempt to fail if the client machine does not have a keytab. The default for the flag is false. +.IP ticket_lifetime +The value of this tag is the default lifetime for initial tickets. The +default value for the tag is 1 day (1d). + .IP renew_lifetime The value of this tag is the default renewable lifetime for initial tickets. The default value for the tag is 0. Index: src/lib/gssapi/spnego/spnego_mech.c =================================================================== --- src/lib/gssapi/spnego/spnego_mech.c.orig +++ src/lib/gssapi/spnego/spnego_mech.c @@ -1687,6 +1687,7 @@ cleanup: if (sc->internal_name != GSS_C_NO_NAME && src_name != NULL) { *src_name = sc->internal_name; + sc->internal_name = GSS_C_NO_NAME; } release_spnego_ctx(&sc); } else if (ret != GSS_S_CONTINUE_NEEDED) { @@ -2572,6 +2573,8 @@ release_spnego_ctx(spnego_gss_ctx_id_t * (void) generic_gss_release_oid(&minor_stat, &context->internal_mech); + (void) gss_release_name(&minor_stat, &context->internal_name); + if (context->optionStr != NULL) { free(context->optionStr); context->optionStr = NULL; Index: src/lib/kadm5/srv/svr_principal.c =================================================================== --- src/lib/kadm5/srv/svr_principal.c.orig +++ src/lib/kadm5/srv/svr_principal.c @@ -858,8 +858,8 @@ kadm5_get_principal(void *server_handle, if (! (mask & KADM5_MOD_TIME)) entry->mod_date = 0; if (! (mask & KADM5_MOD_NAME)) { - krb5_free_principal(handle->context, entry->principal); - entry->principal = NULL; + krb5_free_principal(handle->context, entry->mod_name); + entry->mod_name = NULL; } } @@ -871,10 +871,12 @@ kadm5_get_principal(void *server_handle, if (kdb.key_data[i].key_data_kvno > entry->kvno) entry->kvno = kdb.key_data[i].key_data_kvno; - ret = krb5_dbe_get_mkvno(handle->context, &kdb, master_keylist, - &entry->mkvno); - if (ret) - goto done; + if (mask & KADM5_MKVNO) { + ret = krb5_dbe_get_mkvno(handle->context, &kdb, master_keylist, + &entry->mkvno); + if (ret) + goto done; + } if (mask & KADM5_MAX_RLIFE) entry->max_renewable_life = kdb.max_renewable_life; Index: src/lib/krb5/os/changepw.c =================================================================== --- src/lib/krb5/os/changepw.c.orig +++ src/lib/krb5/os/changepw.c @@ -65,20 +65,23 @@ locate_kpasswd(krb5_context context, con int sockType = (useTcp ? SOCK_STREAM : SOCK_DGRAM); code = krb5int_locate_server (context, realm, addrlist, - locate_service_kpasswd, sockType, AF_INET); + locate_service_kpasswd, sockType, AF_UNSPEC); if (code == KRB5_REALM_CANT_RESOLVE || code == KRB5_REALM_UNKNOWN) { code = krb5int_locate_server (context, realm, addrlist, locate_service_kadmin, SOCK_STREAM, - AF_INET); + AF_UNSPEC); if (!code) { /* Success with admin_server but now we need to change the port number to use DEFAULT_KPASSWD_PORT and the socktype. */ size_t i; for (i=0; i<addrlist->naddrs; i++) { struct addrinfo *a = addrlist->addrs[i].ai; + krb5_ui_2 kpasswd_port = htons(DEFAULT_KPASSWD_PORT); if (a->ai_family == AF_INET) - sa2sin (a->ai_addr)->sin_port = htons(DEFAULT_KPASSWD_PORT); + sa2sin (a->ai_addr)->sin_port = kpasswd_port; + if (a->ai_family == AF_INET6) + sa2sin6 (a->ai_addr)->sin6_port = kpasswd_port; if (sockType != SOCK_STREAM) a->ai_socktype = sockType; } @@ -131,10 +134,16 @@ kpasswd_sendto_msg_callback(struct conn_ /* some brain-dead OS's don't return useful information from * the getsockname call. Namely, windows and solaris. */ - if (ss2sin(&local_addr)->sin_addr.s_addr != 0) { + if (local_addr.ss_family == AF_INET && + ss2sin(&local_addr)->sin_addr.s_addr != 0) { local_kaddr.addrtype = ADDRTYPE_INET; local_kaddr.length = sizeof(ss2sin(&local_addr)->sin_addr); local_kaddr.contents = (krb5_octet *) &ss2sin(&local_addr)->sin_addr; + } else if (local_addr.ss_family == AF_INET6 && + ss2sin6(&local_addr)->sin6_addr.s6_addr != 0) { + local_kaddr.addrtype = ADDRTYPE_INET6; + local_kaddr.length = sizeof(ss2sin6(&local_addr)->sin6_addr); + local_kaddr.contents = (krb5_octet *) &ss2sin6(&local_addr)->sin6_addr; } else { krb5_address **addrs; @@ -290,9 +299,19 @@ change_set_password(krb5_context context break; } - remote_kaddr.addrtype = ADDRTYPE_INET; - remote_kaddr.length = sizeof(ss2sin(&remote_addr)->sin_addr); - remote_kaddr.contents = (krb5_octet *) &ss2sin(&remote_addr)->sin_addr; + if (remote_addr.ss_family == AF_INET) { + remote_kaddr.addrtype = ADDRTYPE_INET; + remote_kaddr.length = sizeof(ss2sin(&remote_addr)->sin_addr); + remote_kaddr.contents = + (krb5_octet *) &ss2sin(&remote_addr)->sin_addr; + } else if (remote_addr.ss_family == AF_INET6) { + remote_kaddr.addrtype = ADDRTYPE_INET6; + remote_kaddr.length = sizeof(ss2sin6(&remote_addr)->sin6_addr); + remote_kaddr.contents = + (krb5_octet *) &ss2sin6(&remote_addr)->sin6_addr; + } else { + break; + } if ((code = krb5_auth_con_setaddrs(callback_ctx.context, callback_ctx.auth_context, Index: src/lib/krb5/krb/gic_pwd.c =================================================================== --- src/lib/krb5/krb/gic_pwd.c.orig +++ src/lib/krb5/krb/gic_pwd.c @@ -218,7 +218,7 @@ krb5_get_init_creds_password(krb5_contex * to prompt. Prompting is only disabled if the option has been set * and the value has been set to false. */ - if (!(options->flags & KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT)) + if (options && !(options->flags & KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT)) goto cleanup; /* ok, we have an expired password. Give the user a few chances ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-fonts-devel for openSUSE:Factory
by root＠Hilbert.suse.de 25 Mar '10

25 Mar '10

Hello community, here is the log from the commit of package xorg-x11-fonts-devel for openSUSE:Factory checked in at Fri Mar 26 00:08:47 CET 2010. -------- --- xorg-x11-fonts-devel/xorg-x11-fonts-devel.changes 2009-08-08 12:36:48.000000000 +0200 +++ xorg-x11-fonts-devel/xorg-x11-fonts-devel.changes 2010-03-17 18:35:33.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 17 18:29:50 CET 2010 - ro(a)suse.de + +- font-util 1.1.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- font-util-1.0.2.tar.bz2 New: ---- font-util-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts-devel.spec ++++++ --- /var/tmp/diff_new_pack.ixWfo3/_old 2010-03-26 00:07:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ixWfo3/_new 2010-03-26 00:07:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-fonts-devel (Version 7.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,11 +19,11 @@ Name: xorg-x11-fonts-devel -%define dirsuffix 1.0.2 +%define dirsuffix 1.1.1 BuildRequires: pkgconfig xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 4 +Release: 5 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Fonts ++++++ font-util-1.0.2.tar.bz2 -> font-util-1.1.1.tar.bz2 ++++++ ++++ 11660 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/COPYING new/font-util-1.1.1/COPYING --- old/font-util-1.0.2/COPYING 2009-08-07 21:46:19.000000000 +0200 +++ new/font-util-1.1.1/COPYING 2009-10-08 05:27:59.000000000 +0200 @@ -95,3 +95,32 @@ Unicode Standard, and to make copies of this file in any form for internal or external distribution as long as this notice remains attached. + + ------------------------------------------------------------------------ + +Copyright 2009 Sun Microsystems, Inc. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above +copyright notice(s) and this permission notice appear in all copies of +the Software and that both the above copyright notice(s) and this +permission notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/ChangeLog new/font-util-1.1.1/ChangeLog --- old/font-util-1.0.2/ChangeLog 2009-08-07 21:48:35.000000000 +0200 +++ new/font-util-1.1.1/ChangeLog 2009-10-12 17:50:16.000000000 +0200 @@ -1,3 +1,64 @@ +commit 640a11b930dde29a5a74bcecec858d0a8255c013 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Mon Oct 12 08:49:02 2009 -0700 + + font-util 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit e1a84f5c30de633767dc4c05a38a34c3f114a138 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Sat Oct 10 21:50:26 2009 -0700 + + Make fontrootdir capitalization consistently lowercase + + Fixes installation of mapfiles, which were going to /util because + ${fontrootdir} was undefined in Makefile. Found by tinderbox. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit b10044e1cdb8f1656b6f61d79512bf4d49ee3339 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Oct 7 20:23:36 2009 -0700 + + font-util 1.1.0: Add new macros to replace code common to many font modules + + XORG_FONT_MACROS_VERSION(required-version) + XORG_FONT_CHECK_ENCODING(encoding) + XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....) + XORG_FONT_REQUIRED_PROG(VARNAME, progname) + XORG_FONT_FCCACHE() + XORG_FONT_COMMON_UTILS() + XORG_FONT_BDF_UTILS() + XORG_FONT_SCALED_UTILS() + XORG_FONT_CHECK_COMPRESSION() + XORG_FONT_UCS2ANY() + XORG_FONTROOTDIR() + XORG_FONTSUBDIR(variable, flag, subdir) + XORG_FONTDIR(subdir) + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + Acked-by: Dan Nicholson <dbn.lists(a)gmail.com> + Acked-by: Rémi Cardona <remi(a)gentoo.org> + +commit 59557a6f4a28f38edcb6251ac04c9cb0e582bb3e +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Oct 6 14:19:57 2009 -0700 + + Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 032e3cb6c41c720412ab3403dad2ab800f45a817 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Sep 23 23:12:08 2009 -0700 + + Fix parsing of hexadecimal arguments to bdftruncate + + Since bdftruncate suggests running itself with "0x3200", that should work. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + commit ca16bc230e73bfbf651acb9010ba695bbbef0e8a Author: Julien Cristau <jcristau(a)debian.org> Date: Fri Aug 7 21:47:25 2009 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/Makefile.am new/font-util-1.1.1/Makefile.am --- old/font-util-1.0.2/Makefile.am 2009-08-07 21:46:19.000000000 +0200 +++ new/font-util-1.1.1/Makefile.am 2009-10-06 23:20:11.000000000 +0200 @@ -76,7 +76,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/README new/font-util-1.1.1/README --- old/font-util-1.0.2/README 2009-08-07 21:46:19.000000000 +0200 +++ new/font-util-1.1.1/README 2009-10-08 05:27:59.000000000 +0200 @@ -1,5 +1,10 @@ X.Org font package creation/installation utilities +If the --with-fontrootdir option is specified when configuring this +package, it will be recorded in the fontutil pkg-config file to be used +as the default parent directory for font modules built using the fontutil +macros from version 1.1 or later of this package. + All questions regarding this software should be directed at the Xorg mailing list: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/bdftruncate.c new/font-util-1.1.1/bdftruncate.c --- old/font-util-1.0.2/bdftruncate.c 2008-10-25 21:58:17.000000000 +0200 +++ new/font-util-1.1.1/bdftruncate.c 2009-09-24 08:10:41.000000000 +0200 @@ -57,7 +57,7 @@ if (!isdigit((unsigned char)*str)) return 1; - if (str[0] == 0 && (str[1] == 'x' || str[1] == 'X')) + if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) base = 16; else base = 10; @@ -140,7 +140,7 @@ if (argc != 1 || (opt_plus_w && opt_minus_w)) usage(); if (parse_threshold(*argv)) { - fprintf(stderr, "Illegal threshold %s", *argv); + fprintf(stderr, "Illegal threshold %s\n", *argv); usage(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/config.h.in new/font-util-1.1.1/config.h.in --- old/font-util-1.0.2/config.h.in 2009-08-07 21:48:28.000000000 +0200 +++ new/font-util-1.1.1/config.h.in 2009-10-12 17:49:41.000000000 +0200 @@ -42,9 +42,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/configure.ac new/font-util-1.1.1/configure.ac --- old/font-util-1.0.2/configure.ac 2009-08-07 21:47:12.000000000 +0200 +++ new/font-util-1.1.1/configure.ac 2009-10-12 17:47:26.000000000 +0200 @@ -22,27 +22,34 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-util, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] font-util) +AC_INIT(font-util, [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] font-util) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS AC_PROG_CC AC_PROG_INSTALL -mapdir=${libdir}/X11/fonts/util -AC_ARG_WITH(mapdir, AC_HELP_STRING([--with-mapdir=<pathname>], - [Path to install font maps]), [mapdir="$withval"]) +AC_MSG_CHECKING([for root directory for font files]) +fontrootdir='${datadir}/fonts/X11' +AC_ARG_WITH(fontrootdir, [AC_HELP_STRING([--with-fontrootdir=DIR], + [Path to parent of font subdirectories [DATADIR/fonts/X11]])], + [fontrootdir="${withval}"]) +AC_SUBST(fontrootdir) +AC_MSG_RESULT([${fontrootdir}]) + +mapdir='${fontrootdir}/util' +AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR], + [Path to install font maps [FONTROOTDIR/util]])], + [mapdir="${withval}"]) MAPDIR="$mapdir" AC_SUBST(MAPDIR) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - -AC_OUTPUT([Makefile fontutil.pc]) +AC_OUTPUT([Makefile fontutil.m4 fontutil.pc]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/fontutil.m4 new/font-util-1.1.1/fontutil.m4 --- old/font-util-1.0.2/fontutil.m4 2008-10-25 21:58:17.000000000 +0200 +++ new/font-util-1.1.1/fontutil.m4 2009-10-12 17:49:51.000000000 +0200 @@ -1,3 +1,7 @@ +dnl fontutil.m4. Generated from fontutil.m4.in by configure. +dnl +dnl This file comes from X.Org's font-util 1.1.1 +dnl dnl Copyright 2005 Red Hat, Inc dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -22,206 +26,299 @@ dnl other dealings in this Software without prior written authorization dnl from the copyright holders. dnl +dnl -------------------------------------------------------------------- +dnl +dnl Copyright 2009 Sun Microsystems, Inc. All rights reserved. +dnl +dnl Permission is hereby granted, free of charge, to any person obtaining a +dnl copy of this software and associated documentation files (the +dnl "Software"), to deal in the Software without restriction, including +dnl without limitation the rights to use, copy, modify, merge, publish, +dnl distribute, and/or sell copies of the Software, and to permit persons +dnl to whom the Software is furnished to do so, provided that the above +dnl copyright notice(s) and this permission notice appear in all copies of +dnl the Software and that both the above copyright notice(s) and this +dnl permission notice appear in supporting documentation. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Except as contained in this notice, the name of a copyright holder +dnl shall not be used in advertising or otherwise to promote the sale, use +dnl or other dealings in this Software without prior written authorization +dnl of the copyright holder. + +# XORG_FONT_MACROS_VERSION(required-version) +# ------------------------------------------ +# Minimum version: 1.1.0 +# +# If you're using a macro added in Version 1.1 or newer, include this in +# your configure.ac with the minimum required version, such as: +# XORG_FONT_MACROS_VERSION(1.1) +# +# To ensure that this macro is defined, also add: +# m4_ifndef([XORG_FONT_MACROS_VERSION], +# [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +# +# +# See the "minimum version" comment for each macro you use to see what +# version you require. +m4_defun([XORG_FONT_MACROS_VERSION],[ +m4_define([vers_have], [1.1.1]) +m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) +m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) +m4_if(m4_cmp(maj_have, maj_needed), 0,, + [m4_fatal([font-util major version ]maj_needed[ is required but ]vers_have[ found])]) +m4_if(m4_version_compare(vers_have, [$1]), -1, + [m4_fatal([font-util version $1 or higher is required but ]vers_have[ found])]) +m4_undefine([vers_have]) +m4_undefine([maj_have]) +m4_undefine([maj_needed]) +]) # XORG_FONT_MACROS_VERSION # XORG_FONT_CHECK_{maps}() # ------------------------ +# Minimum version: 1.0.0 # These macros add --enable/disable-{maps} where {maps} are ISO8859-*, # JISX0201 or KOI8_R. By default, they are all enabled. -AC_DEFUN([XORG_FONT_CHECK_ISO8859_1],[ - AC_ARG_ENABLE(iso8859-1, - AS_HELP_STRING([--disable-iso8859-1], - [Build ISO8859-1 fonts (default: yes)]), - [ISO8859_1=$enableval], - [ISO8859_1=yes]) - AC_MSG_CHECKING([whether to build ISO8859-1 fonts]) - AC_MSG_RESULT([$ISO8859_1]) - AM_CONDITIONAL(ISO8859_1, [test "x$ISO8859_1" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_2],[ - AC_ARG_ENABLE(iso8859-2, - AS_HELP_STRING([--disable-iso8859-2], - [Build ISO8859-2 fonts (default: yes)]), - [ISO8859_2=$enableval], - [ISO8859_2=yes]) - AC_MSG_CHECKING([whether to build ISO8859-2 fonts]) - AC_MSG_RESULT([$ISO8859_2]) - AM_CONDITIONAL(ISO8859_2, [test "x$ISO8859_2" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_3],[ - AC_ARG_ENABLE(iso8859-3, - AS_HELP_STRING([--disable-iso8859-3], - [Build ISO8859-3 fonts (default: yes)]), - [ISO8859_3=$enableval], - [ISO8859_3=yes]) - AC_MSG_CHECKING([whether to build ISO8859-3 fonts]) - AC_MSG_RESULT([$ISO8859_3]) - AM_CONDITIONAL(ISO8859_3, [test "x$ISO8859_3" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_4],[ - AC_ARG_ENABLE(iso8859-4, - AS_HELP_STRING([--disable-iso8859-4], - [Build ISO8859-4 fonts (default: yes)]), - [ISO8859_4=$enableval], - [ISO8859_4=yes]) - AC_MSG_CHECKING([whether to build ISO8859-4 fonts]) - AC_MSG_RESULT([$ISO8859_4]) - AM_CONDITIONAL(ISO8859_4, [test "x$ISO8859_4" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_5],[ - AC_ARG_ENABLE(iso8859-5, - AS_HELP_STRING([--disable-iso8859-5], - [Build ISO8859-5 fonts (default: yes)]), - [ISO8859_5=$enableval], - [ISO8859_5=yes]) - AC_MSG_CHECKING([whether to build ISO8859-5 fonts]) - AC_MSG_RESULT([$ISO8859_5]) - AM_CONDITIONAL(ISO8859_5, [test "x$ISO8859_5" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_6],[ - AC_ARG_ENABLE(iso8859-6, - AS_HELP_STRING([--disable-iso8859-6], - [Build ISO8859-6 fonts (default: yes)]), - [ISO8859_6=$enableval], - [ISO8859_6=yes]) - AC_MSG_CHECKING([whether to build ISO8859-6 fonts]) - AC_MSG_RESULT([$ISO8859_6]) - AM_CONDITIONAL(ISO8859_6, [test "x$ISO8859_6" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_7],[ - AC_ARG_ENABLE(iso8859-7, - AS_HELP_STRING([--disable-iso8859-7], - [Build ISO8859-7 fonts (default: yes)]), - [ISO8859_7=$enableval], - [ISO8859_7=yes]) - AC_MSG_CHECKING([whether to build ISO8859-7 fonts]) - AC_MSG_RESULT([$ISO8859_7]) - AM_CONDITIONAL(ISO8859_7, [test "x$ISO8859_7" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_8],[ - AC_ARG_ENABLE(iso8859-8, - AS_HELP_STRING([--disable-iso8859-8], - [Build ISO8859-8 fonts (default: yes)]), - [ISO8859_8=$enableval], - [ISO8859_8=yes]) - AC_MSG_CHECKING([whether to build ISO8859-8 fonts]) - AC_MSG_RESULT([$ISO8859_8]) - AM_CONDITIONAL(ISO8859_8, [test "x$ISO8859_8" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_9],[ - AC_ARG_ENABLE(iso8859-9, - AS_HELP_STRING([--disable-iso8859-9], - [Build ISO8859-9 fonts (default: yes)]), - [ISO8859_9=$enableval], - [ISO8859_9=yes]) - AC_MSG_CHECKING([whether to build ISO8859-9 fonts]) - AC_MSG_RESULT([$ISO8859_9]) - AM_CONDITIONAL(ISO8859_9, [test "x$ISO8859_9" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_10],[ - AC_ARG_ENABLE(iso8859-10, - AS_HELP_STRING([--disable-iso8859-10], - [Build ISO8859-10 fonts (default: yes)]), - [ISO8859_10=$enableval], - [ISO8859_10=yes]) - AC_MSG_CHECKING([whether to build ISO8859-10 fonts]) - AC_MSG_RESULT([$ISO8859_10]) - AM_CONDITIONAL(ISO8859_10, [test "x$ISO8859_10" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_11],[ - AC_ARG_ENABLE(iso8859-11, - AS_HELP_STRING([--disable-iso8859-11], - [Build ISO8859-11 fonts (default: yes)]), - [ISO8859_11=$enableval], - [ISO8859_11=yes]) - AC_MSG_CHECKING([whether to build ISO8859-11 fonts]) - AC_MSG_RESULT([$ISO8859_11]) - AM_CONDITIONAL(ISO8859_11, [test "x$ISO8859_11" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_12],[ - AC_ARG_ENABLE(iso8859-12, - AS_HELP_STRING([--disable-iso8859-12], - [Build ISO8859-12 fonts (default: yes)]), - [ISO8859_12=$enableval], - [ISO8859_12=yes]) - AC_MSG_CHECKING([whether to build ISO8859-12 fonts]) - AC_MSG_RESULT([$ISO8859_12]) - AM_CONDITIONAL(ISO8859_12, [test "x$ISO8859_12" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_13],[ - AC_ARG_ENABLE(iso8859-13, - AS_HELP_STRING([--disable-iso8859-13], - [Build ISO8859-13 fonts (default: yes)]), - [ISO8859_13=$enableval], - [ISO8859_13=yes]) - AC_MSG_CHECKING([whether to build ISO8859-13 fonts]) - AC_MSG_RESULT([$ISO8859_13]) - AM_CONDITIONAL(ISO8859_13, [test "x$ISO8859_13" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_14],[ - AC_ARG_ENABLE(iso8859-14, - AS_HELP_STRING([--disable-iso8859-14], - [Build ISO8859-14 fonts (default: yes)]), - [ISO8859_14=$enableval], - [ISO8859_14=yes]) - AC_MSG_CHECKING([whether to build ISO8859-14 fonts]) - AC_MSG_RESULT([$ISO8859_14]) - AM_CONDITIONAL(ISO8859_14, [test "x$ISO8859_14" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_15],[ - AC_ARG_ENABLE(iso8859-15, - AS_HELP_STRING([--disable-iso8859-15], - [Build ISO8859-15 fonts (default: yes)]), - [ISO8859_15=$enableval], - [ISO8859_15=yes]) - AC_MSG_CHECKING([whether to build ISO8859-15 fonts]) - AC_MSG_RESULT([$ISO8859_15]) - AM_CONDITIONAL(ISO8859_15, [test "x$ISO8859_15" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_ISO8859_16],[ - AC_ARG_ENABLE(iso8859-16, - AS_HELP_STRING([--disable-iso8859-16], - [Build ISO8859-16 fonts (default: yes)]), - [ISO8859_16=$enableval], - [ISO8859_16=yes]) - AC_MSG_CHECKING([whether to build ISO8859-16 fonts]) - AC_MSG_RESULT([$ISO8859_16]) - AM_CONDITIONAL(ISO8859_16, [test "x$ISO8859_16" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_JISX0201],[ - AC_ARG_ENABLE(jisx0201, - AS_HELP_STRING([--disable-jisx0201], - [Build JISX0201 fonts (default: yes)]), - [JISX0201=$enableval], - [JISX0201=yes]) - AC_MSG_CHECKING([whether to build JISX0201 fonts]) - AC_MSG_RESULT([$JISX0201]) - AM_CONDITIONAL(JISX0201, [test "x$JISX0201" = xyes]) -]) - -AC_DEFUN([XORG_FONT_CHECK_KOI8_R],[ - AC_ARG_ENABLE(koi8-r, - AS_HELP_STRING([--disable-koi8-r], - [Build KOI8-R fonts (default: yes)]), - [KOI8_R=$enableval], - [KOI8_R=yes]) - AC_MSG_CHECKING([whether to build KOI8-R fonts]) - AC_MSG_RESULT([$KOI8_R]) - AM_CONDITIONAL(KOI8_R, [test "x$KOI8_R" = xyes]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_1], [XORG_FONT_CHECK_ENCODING(ISO8859-1)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_2], [XORG_FONT_CHECK_ENCODING(ISO8859-2)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_3], [XORG_FONT_CHECK_ENCODING(ISO8859-3)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_4], [XORG_FONT_CHECK_ENCODING(ISO8859-4)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_5], [XORG_FONT_CHECK_ENCODING(ISO8859-5)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_6], [XORG_FONT_CHECK_ENCODING(ISO8859-6)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_7], [XORG_FONT_CHECK_ENCODING(ISO8859-7)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_8], [XORG_FONT_CHECK_ENCODING(ISO8859-8)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_9], [XORG_FONT_CHECK_ENCODING(ISO8859-9)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_10],[XORG_FONT_CHECK_ENCODING(ISO8859-10)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_11],[XORG_FONT_CHECK_ENCODING(ISO8859-11)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_12],[XORG_FONT_CHECK_ENCODING(ISO8859-12)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_13],[XORG_FONT_CHECK_ENCODING(ISO8859-13)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_14],[XORG_FONT_CHECK_ENCODING(ISO8859-14)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_15],[XORG_FONT_CHECK_ENCODING(ISO8859-15)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_16],[XORG_FONT_CHECK_ENCODING(ISO8859-16)]) +AC_DEFUN([XORG_FONT_CHECK_JISX0201], [XORG_FONT_CHECK_ENCODING(JISX0201)]) +AC_DEFUN([XORG_FONT_CHECK_KOI8_R], [XORG_FONT_CHECK_ENCODING(KOI8-R)]) + +# XORG_FONT_CHECK_ENCODING(encoding) +# ---------------------------------- +# Minimum version: 1.1.0 +# This macro adds --enable/disable-<encoding>, enabled by default. +# It replaced individual copies of this code in the above macros in 1.1. +# Currently assumes encoding names will be all upper-case - add m4_toupper +# calls if this is not true in the future. + +AC_DEFUN([XORG_FONT_CHECK_ENCODING],[ + AC_ARG_ENABLE(m4_tolower($1), + AS_HELP_STRING(m4_join([-], [--disable], m4_tolower($1)), + [Build $1 fonts (default: yes)]), + [AS_TR_SH($1)=$enableval], [AS_TR_SH($1)=yes]) + AC_MSG_CHECKING([whether to build $1 fonts]) + AC_MSG_RESULT($[AS_TR_SH($1)]) + AM_CONDITIONAL(AS_TR_SH($1), [test "x$AS_TR_SH($1)" = xyes]) +]) # XORG_FONT_CHECK_ENCODING + +# XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....) +# ----------------------------------------------------- +# Minimum version: 1.1.0 +# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once + +AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[ + m4_foreach_w([enc], [$1], [XORG_FONT_CHECK_ENCODING(enc)]) +]) # XORG_FONT_CHECK_ENCODING_LIST + +# XORG_FONT_REQUIRED_PROG(VARNAME, progname) +# ------------------------------------------ +# Minimum version: 1.1.0 +# +# Simple wrapper around AC_PATH_PROG that errors if not found +# + +AC_DEFUN([XORG_FONT_REQUIRED_PROG],[ + AC_PATH_PROG($1, $2) + if test x"$1" = x; then + AC_MSG_ERROR([$2 is required to build $PACKAGE_NAME.]) + fi +]) + + +# XORG_FONT_FCCACHE() +# ------------------- +# Minimum version: 1.1.0 +# +# Set FCCACHE to path to fc-cache (fontconfig cache builder) if found +# Set RUN_FCCACHE to a rule suitable for substituting into a makefile +# to run fc-cache if found and not installing to $DESTDIR +# +# fc-cache is optional, not required, and should be skipped when making +# packages (installing to $DESTDIR). +# +AC_DEFUN([XORG_FONT_FCCACHE],[ + AC_PATH_PROG(FCCACHE, fc-cache) + FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"' + if test x"$FCCACHE" = x ; then + RUN_FCCACHE="${FCCACHE_WARN}" + else + RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else' + RUN_FCCACHE="${RUN_FCCACHE} ${FCCACHE_WARN} ; fi)" + fi + AC_SUBST([RUN_FCCACHE]) ]) + + +# XORG_FONT_COMMON_UTILS() +# ------------------------ +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for programs needed for all font types + +AC_DEFUN([XORG_FONT_COMMON_UTILS],[ + XORG_FONT_FCCACHE + XORG_FONT_REQUIRED_PROG(MKFONTDIR, mkfontdir) +]) + +# XORG_FONT_SCALED_UTILS() +# ------------------------ +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for programs needed for scalable fonts +# (TrueType, OpenType, Type1) + +AC_DEFUN([XORG_FONT_SCALED_UTILS],[ + XORG_FONT_COMMON_UTILS + XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale) +]) + +# XORG_FONT_BDF_UTILS() +# --------------------- +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for programs needed for BDF format bitmap fonts +# Also call XORG_FONT_CHECK_COMPRESSION to determine how to compress the +# PCF output files created by bdftopcf + +AC_DEFUN([XORG_FONT_BDF_UTILS],[ + XORG_FONT_COMMON_UTILS + XORG_FONT_REQUIRED_PROG(BDFTOPCF, bdftopcf) + XORG_FONT_CHECK_COMPRESSION +]) + +# XORG_FONT_CHECK_COMPRESSION() +# ----------------------------- +# Minimum version: 1.1.0 +# +# Offer a --with-compression flag to control what compression method is +# used for pcf font files. Offers all the methods currently supported +# by libXfont, including no compression. + +AC_DEFUN([XORG_FONT_CHECK_COMPRESSION],[ + AC_MSG_CHECKING([font compression method]) + AC_ARG_WITH(compression, + [AS_HELP_STRING([--with-compression=<no|compress|gzip|bzip2>], + [compression method to use on pcf fonts])], + [compression="$withval"], [compression="yes"]) + if test x"$compression" = "xyes" ; then + compression="gzip" + fi + AC_MSG_RESULT([${compression}]) + case ${compression} in + *compress) COMPRESS_SUFFIX=".Z" ;; + *gzip) COMPRESS_SUFFIX=".gz" ;; + *bzip2) COMPRESS_SUFFIX=".bz2" ;; + no|none) COMPRESS_SUFFIX="" ; COMPRESS="cat" ;; + *) AC_MSG_ERROR([${compression} is not a supported compression method]) ;; + esac + if test x"$COMPRESS_SUFFIX" != "x" ; then + XORG_FONT_REQUIRED_PROG(COMPRESS, ${compression}) + fi + AC_SUBST([COMPRESS_SUFFIX]) +]) + +# XORG_FONT_UCS2ANY() +# ------------------- +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for ucs2any program needed for splitting +# Unicode-encoded BDF format bitmap fonts into subsets for older encodings. +# Also call pkg-config to find the directory with the encoding files needed +# by ucs2any, and export it as MAPFILES_PATH to the Makefiles + +AC_DEFUN([XORG_FONT_UCS2ANY],[ + XORG_FONT_REQUIRED_PROG(UCS2ANY, ucs2any) + PKG_CHECK_MODULES(MAPS, [fontutil]) + AC_MSG_CHECKING([for ucs2any encoding data files]) + MAPFILES_PATH=`pkg-config --variable=mapdir fontutil` + AC_SUBST(MAPFILES_PATH) + AC_MSG_RESULT([${MAPFILES_PATH}]) +]) + + + +# XORG_FONTROOTDIR() +# -------------------- +# Minimum version: 1.1.0 +# +# Sets FONTROOTDIR to the root directory for font files. Uses the first +# found from: +# --with-fontrootdir +# pkg-config --variable=fontrootdir fontutil +# ${datadir}/fonts/X11 + +AC_DEFUN([XORG_FONTROOTDIR],[ + dnl Ensure $PKG_CONFIG is set first + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + AC_MSG_CHECKING([for root directory for font files]) + AC_ARG_WITH(fontrootdir, + AS_HELP_STRING([--with-fontrootdir=DIR], + [Path to root directory for font files]), + [FONTROOTDIR="$withval"]) + # if --with-fontrootdir not specified... + if test "x${FONTROOTDIR}" = "x"; then + FONTROOTDIR=`$PKG_CONFIG --variable=fontrootdir fontutil` + fi + # ...and if pkg-config didn't find fontdir in fontutil.pc... + if test "x${FONTROOTDIR}" = "x"; then + FONTROOTDIR="${datadir}/fonts/X11" + fi + AC_SUBST(FONTROOTDIR) + AC_MSG_RESULT([${FONTROOTDIR}]) +]) + +# XORG_FONTSUBDIR(variable, flag, subdir) +# --------------------------------------- +# Minimum version: 1.1.0 +# +# Offer a --with-<flag> flag to control directory for font installation +# Default is the specified <subdir> of the font root directory. +# Sets <variable> to the selected directory + +AC_DEFUN([XORG_FONTSUBDIR],[ + AC_REQUIRE([XORG_FONTROOTDIR]) + + AC_MSG_CHECKING([for directory for $3 files]) + AC_ARG_WITH($2, + [AS_HELP_STRING([--with-$2=DIR], + [Path to $3 files [FONTROOTDIR/$3]])], + [$1="${withval}"], [$1='${FONTROOTDIR}/$3']) + AC_SUBST($1) + AC_MSG_RESULT([${$1}]) +]) # XORG_FONTSUBDIR + +# XORG_FONTDIR(subdir) +# -------------------- +# Minimum version: 1.1.0 +# +# Offer a --with-fontdir flag to control directory for font installation +# Default is the specified subdir of the font root directory. +# Sets FONTDIR to the selected directory + +AC_DEFUN([XORG_FONTDIR],[XORG_FONTSUBDIR([FONTDIR], [fontdir], [$1])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/fontutil.m4.in new/font-util-1.1.1/fontutil.m4.in --- old/font-util-1.0.2/fontutil.m4.in 1970-01-01 01:00:00.000000000 +0100 +++ new/font-util-1.1.1/fontutil.m4.in 2009-10-08 05:27:59.000000000 +0200 @@ -0,0 +1,324 @@ +dnl @configure_input@ +dnl +dnl This file comes from X.Org's @PACKAGE_STRING@ +dnl +dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl +dnl -------------------------------------------------------------------- +dnl +dnl Copyright 2009 Sun Microsystems, Inc. All rights reserved. +dnl +dnl Permission is hereby granted, free of charge, to any person obtaining a +dnl copy of this software and associated documentation files (the +dnl "Software"), to deal in the Software without restriction, including +dnl without limitation the rights to use, copy, modify, merge, publish, +dnl distribute, and/or sell copies of the Software, and to permit persons +dnl to whom the Software is furnished to do so, provided that the above +dnl copyright notice(s) and this permission notice appear in all copies of +dnl the Software and that both the above copyright notice(s) and this +dnl permission notice appear in supporting documentation. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Except as contained in this notice, the name of a copyright holder +dnl shall not be used in advertising or otherwise to promote the sale, use +dnl or other dealings in this Software without prior written authorization +dnl of the copyright holder. + +# XORG_FONT_MACROS_VERSION(required-version) +# ------------------------------------------ +# Minimum version: 1.1.0 +# +# If you're using a macro added in Version 1.1 or newer, include this in +# your configure.ac with the minimum required version, such as: +# XORG_FONT_MACROS_VERSION(1.1) +# +# To ensure that this macro is defined, also add: +# m4_ifndef([XORG_FONT_MACROS_VERSION], +# [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +# +# +# See the "minimum version" comment for each macro you use to see what +# version you require. +m4_defun([XORG_FONT_MACROS_VERSION],[ +m4_define([vers_have], [@VERSION@]) +m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) +m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) +m4_if(m4_cmp(maj_have, maj_needed), 0,, + [m4_fatal([font-util major version ]maj_needed[ is required but ]vers_have[ found])]) +m4_if(m4_version_compare(vers_have, [$1]), -1, + [m4_fatal([font-util version $1 or higher is required but ]vers_have[ found])]) +m4_undefine([vers_have]) +m4_undefine([maj_have]) +m4_undefine([maj_needed]) +]) # XORG_FONT_MACROS_VERSION + +# XORG_FONT_CHECK_{maps}() +# ------------------------ +# Minimum version: 1.0.0 +# These macros add --enable/disable-{maps} where {maps} are ISO8859-*, +# JISX0201 or KOI8_R. By default, they are all enabled. + +AC_DEFUN([XORG_FONT_CHECK_ISO8859_1], [XORG_FONT_CHECK_ENCODING(ISO8859-1)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_2], [XORG_FONT_CHECK_ENCODING(ISO8859-2)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_3], [XORG_FONT_CHECK_ENCODING(ISO8859-3)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_4], [XORG_FONT_CHECK_ENCODING(ISO8859-4)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_5], [XORG_FONT_CHECK_ENCODING(ISO8859-5)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_6], [XORG_FONT_CHECK_ENCODING(ISO8859-6)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_7], [XORG_FONT_CHECK_ENCODING(ISO8859-7)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_8], [XORG_FONT_CHECK_ENCODING(ISO8859-8)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_9], [XORG_FONT_CHECK_ENCODING(ISO8859-9)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_10],[XORG_FONT_CHECK_ENCODING(ISO8859-10)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_11],[XORG_FONT_CHECK_ENCODING(ISO8859-11)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_12],[XORG_FONT_CHECK_ENCODING(ISO8859-12)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_13],[XORG_FONT_CHECK_ENCODING(ISO8859-13)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_14],[XORG_FONT_CHECK_ENCODING(ISO8859-14)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_15],[XORG_FONT_CHECK_ENCODING(ISO8859-15)]) +AC_DEFUN([XORG_FONT_CHECK_ISO8859_16],[XORG_FONT_CHECK_ENCODING(ISO8859-16)]) +AC_DEFUN([XORG_FONT_CHECK_JISX0201], [XORG_FONT_CHECK_ENCODING(JISX0201)]) +AC_DEFUN([XORG_FONT_CHECK_KOI8_R], [XORG_FONT_CHECK_ENCODING(KOI8-R)]) + +# XORG_FONT_CHECK_ENCODING(encoding) +# ---------------------------------- +# Minimum version: 1.1.0 +# This macro adds --enable/disable-<encoding>, enabled by default. +# It replaced individual copies of this code in the above macros in 1.1. +# Currently assumes encoding names will be all upper-case - add m4_toupper +# calls if this is not true in the future. + +AC_DEFUN([XORG_FONT_CHECK_ENCODING],[ + AC_ARG_ENABLE(m4_tolower($1), + AS_HELP_STRING(m4_join([-], [--disable], m4_tolower($1)), + [Build $1 fonts (default: yes)]), + [AS_TR_SH($1)=$enableval], [AS_TR_SH($1)=yes]) + AC_MSG_CHECKING([whether to build $1 fonts]) + AC_MSG_RESULT($[AS_TR_SH($1)]) + AM_CONDITIONAL(AS_TR_SH($1), [test "x$AS_TR_SH($1)" = xyes]) +]) # XORG_FONT_CHECK_ENCODING + +# XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....) +# ----------------------------------------------------- +# Minimum version: 1.1.0 +# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once + +AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[ + m4_foreach_w([enc], [$1], [XORG_FONT_CHECK_ENCODING(enc)]) +]) # XORG_FONT_CHECK_ENCODING_LIST + +# XORG_FONT_REQUIRED_PROG(VARNAME, progname) +# ------------------------------------------ +# Minimum version: 1.1.0 +# +# Simple wrapper around AC_PATH_PROG that errors if not found +# + +AC_DEFUN([XORG_FONT_REQUIRED_PROG],[ + AC_PATH_PROG($1, $2) + if test x"$1" = x; then + AC_MSG_ERROR([$2 is required to build $PACKAGE_NAME.]) + fi +]) + + +# XORG_FONT_FCCACHE() +# ------------------- +# Minimum version: 1.1.0 +# +# Set FCCACHE to path to fc-cache (fontconfig cache builder) if found +# Set RUN_FCCACHE to a rule suitable for substituting into a makefile +# to run fc-cache if found and not installing to $DESTDIR +# +# fc-cache is optional, not required, and should be skipped when making +# packages (installing to $DESTDIR). +# +AC_DEFUN([XORG_FONT_FCCACHE],[ + AC_PATH_PROG(FCCACHE, fc-cache) + FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"' + if test x"$FCCACHE" = x ; then + RUN_FCCACHE="${FCCACHE_WARN}" + else + RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else' + RUN_FCCACHE="${RUN_FCCACHE} ${FCCACHE_WARN} ; fi)" + fi + AC_SUBST([RUN_FCCACHE]) +]) + + +# XORG_FONT_COMMON_UTILS() +# ------------------------ +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for programs needed for all font types + +AC_DEFUN([XORG_FONT_COMMON_UTILS],[ + XORG_FONT_FCCACHE + XORG_FONT_REQUIRED_PROG(MKFONTDIR, mkfontdir) +]) + +# XORG_FONT_SCALED_UTILS() +# ------------------------ +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for programs needed for scalable fonts +# (TrueType, OpenType, Type1) + +AC_DEFUN([XORG_FONT_SCALED_UTILS],[ + XORG_FONT_COMMON_UTILS + XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale) +]) + +# XORG_FONT_BDF_UTILS() +# --------------------- +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for programs needed for BDF format bitmap fonts +# Also call XORG_FONT_CHECK_COMPRESSION to determine how to compress the +# PCF output files created by bdftopcf + +AC_DEFUN([XORG_FONT_BDF_UTILS],[ + XORG_FONT_COMMON_UTILS + XORG_FONT_REQUIRED_PROG(BDFTOPCF, bdftopcf) + XORG_FONT_CHECK_COMPRESSION +]) + +# XORG_FONT_CHECK_COMPRESSION() +# ----------------------------- +# Minimum version: 1.1.0 +# +# Offer a --with-compression flag to control what compression method is +# used for pcf font files. Offers all the methods currently supported +# by libXfont, including no compression. + +AC_DEFUN([XORG_FONT_CHECK_COMPRESSION],[ + AC_MSG_CHECKING([font compression method]) + AC_ARG_WITH(compression, + [AS_HELP_STRING([--with-compression=<no|compress|gzip|bzip2>], + [compression method to use on pcf fonts])], + [compression="$withval"], [compression="yes"]) + if test x"$compression" = "xyes" ; then + compression="gzip" + fi + AC_MSG_RESULT([${compression}]) + case ${compression} in + *compress) COMPRESS_SUFFIX=".Z" ;; + *gzip) COMPRESS_SUFFIX=".gz" ;; + *bzip2) COMPRESS_SUFFIX=".bz2" ;; + no|none) COMPRESS_SUFFIX="" ; COMPRESS="cat" ;; + *) AC_MSG_ERROR([${compression} is not a supported compression method]) ;; + esac + if test x"$COMPRESS_SUFFIX" != "x" ; then + XORG_FONT_REQUIRED_PROG(COMPRESS, ${compression}) + fi + AC_SUBST([COMPRESS_SUFFIX]) +]) + +# XORG_FONT_UCS2ANY() +# ------------------- +# Minimum version: 1.1.0 +# +# Call XORG_FONT_REQUIRED_PROG for ucs2any program needed for splitting +# Unicode-encoded BDF format bitmap fonts into subsets for older encodings. +# Also call pkg-config to find the directory with the encoding files needed +# by ucs2any, and export it as MAPFILES_PATH to the Makefiles + +AC_DEFUN([XORG_FONT_UCS2ANY],[ + XORG_FONT_REQUIRED_PROG(UCS2ANY, ucs2any) + PKG_CHECK_MODULES(MAPS, [fontutil]) + AC_MSG_CHECKING([for ucs2any encoding data files]) + MAPFILES_PATH=`pkg-config --variable=mapdir fontutil` + AC_SUBST(MAPFILES_PATH) + AC_MSG_RESULT([${MAPFILES_PATH}]) +]) + + + +# XORG_FONTROOTDIR() +# -------------------- +# Minimum version: 1.1.0 +# +# Sets FONTROOTDIR to the root directory for font files. Uses the first +# found from: +# --with-fontrootdir +# pkg-config --variable=fontrootdir fontutil +# ${datadir}/fonts/X11 + +AC_DEFUN([XORG_FONTROOTDIR],[ + dnl Ensure $PKG_CONFIG is set first + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + AC_MSG_CHECKING([for root directory for font files]) + AC_ARG_WITH(fontrootdir, + AS_HELP_STRING([--with-fontrootdir=DIR], + [Path to root directory for font files]), + [FONTROOTDIR="$withval"]) + # if --with-fontrootdir not specified... + if test "x${FONTROOTDIR}" = "x"; then + FONTROOTDIR=`$PKG_CONFIG --variable=fontrootdir fontutil` + fi + # ...and if pkg-config didn't find fontdir in fontutil.pc... + if test "x${FONTROOTDIR}" = "x"; then + FONTROOTDIR="${datadir}/fonts/X11" + fi + AC_SUBST(FONTROOTDIR) + AC_MSG_RESULT([${FONTROOTDIR}]) +]) + +# XORG_FONTSUBDIR(variable, flag, subdir) +# --------------------------------------- +# Minimum version: 1.1.0 +# +# Offer a --with-<flag> flag to control directory for font installation +# Default is the specified <subdir> of the font root directory. +# Sets <variable> to the selected directory + +AC_DEFUN([XORG_FONTSUBDIR],[ + AC_REQUIRE([XORG_FONTROOTDIR]) + + AC_MSG_CHECKING([for directory for $3 files]) + AC_ARG_WITH($2, + [AS_HELP_STRING([--with-$2=DIR], + [Path to $3 files [FONTROOTDIR/$3]])], + [$1="${withval}"], [$1='${FONTROOTDIR}/$3']) + AC_SUBST($1) + AC_MSG_RESULT([${$1}]) +]) # XORG_FONTSUBDIR + +# XORG_FONTDIR(subdir) +# -------------------- +# Minimum version: 1.1.0 +# +# Offer a --with-fontdir flag to control directory for font installation +# Default is the specified subdir of the font root directory. +# Sets FONTDIR to the selected directory + +AC_DEFUN([XORG_FONTDIR],[XORG_FONTSUBDIR([FONTDIR], [fontdir], [$1])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/fontutil.pc.in new/font-util-1.1.1/fontutil.pc.in --- old/font-util-1.0.2/fontutil.pc.in 2008-10-25 21:58:17.000000000 +0200 +++ new/font-util-1.1.1/fontutil.pc.in 2009-10-11 06:32:56.000000000 +0200 @@ -1,6 +1,9 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ +datarootdir=@datarootdir@ +datadir=@datadir@ +fontrootdir=@fontrootdir@ mapdir=@MAPDIR@ Name: FontUtil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.0.2/missing new/font-util-1.1.1/missing --- old/font-util-1.0.2/missing 2009-08-07 21:48:29.000000000 +0200 +++ new/font-util-1.1.1/missing 2009-10-12 17:49:44.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-proto-devel for openSUSE:Factory
by root＠Hilbert.suse.de 25 Mar '10

25 Mar '10

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at Fri Mar 26 00:07:34 CET 2010. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-01-16 18:56:07.000000000 +0100 +++ xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-03-17 18:04:13.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 17 18:03:48 CET 2010 - ro(a)suse.de + +- util-macros-1.6.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- util-macros-1.3.0.tar.bz2 New: ---- util-macros-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.JRFKJj/_old 2010-03-26 00:04:07.000000000 +0100 +++ /var/tmp/diff_new_pack.JRFKJj/_new 2010-03-26 00:04:07.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: python-base Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 22 +Release: 23 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -45,7 +45,7 @@ Source15: resourceproto-X11R7.0-1.0.2.tar.bz2 Source16: scrnsaverproto-X11R7.1-1.1.0.tar.bz2 Source17: trapproto-X11R7.0-3.4.3.tar.bz2 -Source18: util-macros-1.3.0.tar.bz2 +Source18: util-macros-1.6.0.tar.bz2 Source19: videoproto-X11R7.0-2.2.2.tar.bz2 Source20: windowswmproto-X11R7.0-1.0.3.tar.bz2 Source21: xcmiscproto-1.2.0.tar.bz2 @@ -113,6 +113,7 @@ # Bug 260745 mv $RPM_BUILD_ROOT/usr/share/doc/*/*.txt . rmdir $RPM_BUILD_ROOT/usr/share/doc/* +rm -f $RPM_BUILD_ROOT/usr/share/util-macros/INSTALL %clean rm -rf "$RPM_BUILD_ROOT" @@ -143,6 +144,7 @@ /usr/%{_lib}/python2.6/site-packages/xcbgen/ %endif /usr/%{_lib}/pkgconfig/*.pc +/usr/share/pkgconfig/*.pc /usr/share/aclocal/*.m4 /usr/share/xcb/ ++++++ util-macros-1.3.0.tar.bz2 -> util-macros-1.6.0.tar.bz2 ++++++ ++++ 2363 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/COPYING new/util-macros-1.6.0/COPYING --- old/util-macros-1.3.0/COPYING 2006-07-13 20:38:07.000000000 +0200 +++ new/util-macros-1.6.0/COPYING 2010-01-15 00:49:17.000000000 +0100 @@ -24,26 +24,20 @@ Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/ChangeLog new/util-macros-1.6.0/ChangeLog --- old/util-macros-1.3.0/ChangeLog 2009-09-09 22:32:13.000000000 +0200 +++ new/util-macros-1.6.0/ChangeLog 2010-02-05 15:08:34.000000000 +0100 @@ -1,3 +1,295 @@ +commit 0851a3455fddbbaef73fae088469a48f2f975783 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Jan 29 14:02:26 2010 -0500 + + Version bump: 1.6.0 + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit a8f386498bb18c7f95f874a56e3526a1b0b3029c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Feb 2 17:14:00 2010 -0500 + + doc: add XORG_ENABLE_DEVEL_DOCS and XORG_ENABLE_SPECS + + Identical to XORG_ENABLE_DOCS, this macros allows modules + to classify docs per type and selectively control their building. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 1df1e7fd649b4ff3e00a908d4ade54bc6b32892f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Jan 31 08:56:50 2010 -0500 + + XORG_WITH_GROFF: add tests for -ms and -mm macro packages + + OS and distros often splits groff in a basic and full package, the former + having the groff program and the later having devices, fonts and macros + Checking for the groff executable is not enough. + + Use HAVE_GROFF if you do not use -ms or -mm + Use HAVE_GROFF_MS and/or HAVE_GROFF_MM otherwise + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 6fce3ec9157794d1a90ae28b2615c00ce84f95ed +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Jan 29 10:47:40 2010 -0500 + + Add XORG_ENABLE_DOCS to control the building of documentation + + This macro is intended for modules to control, in a single option, + the building of the documentaion. Using --enable-docs=no, all + documentation is skipped, regardless of the tool used to build it. + + It should be used in conjunction with other XORG_WITH_* macros + which handle cases where some specific tool is not available. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit df1fe112b8fca77ce10ecfe2b9e4a082b29b732d +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Jan 29 10:25:00 2010 -0500 + + Additional doc macros for GROFF, FOP and PS2PDF + + Identical to XMLTO, DOXYGEN and ASCIIDOC. + Allow platform builders to selectively turn off tools that + are not present or back level. Matching documentation target + will be shipped. + + For example, --without-fop will skip the pdf format while + allowing other formats to proceed. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 4411328d3200392e9b8d830a45d9ac679abb4ead +Author: Jeremy Huddleston <jeremyhu(a)apple.com> +Date: Wed Feb 3 23:39:37 2010 -0800 + + Add -Wformat=2 to the default CWARNFLAGS + + This will include -Wformat-security to catch possible security problems in formatting in printf, scanf, etc. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)apple.com> + Reviewed-by: Matt Turner <mattst88(a)gmail.com> + +commit 46d22716aed8d7e8ee188c2f2d2b3ba600dc3dd3 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Jan 17 21:21:10 2010 -0500 + + Version bump: 1.5.0 + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 7e89b1cecfdb8115fa159584762f4d0db7455305 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Jan 17 21:01:44 2010 -0500 + + Add XORG_WITH_ASCIIDOC and XORG_WITH_DOXYGEN + + Based on XORG_WITH_XMLTO + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 296c390247553b0070dd05260fe6f55f793a374c +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Tue Jan 5 23:04:25 2010 +0100 + + Add XORG_WITH_XMLTO to factorize xmlto tests. + + This also allow to configure with --without-xmlto to ignore + a 3rd party xmlto tool on systems that normally don't have it, + in order to have reproducable builds. + + Reviewed-by: Rémi Cardona <remi(a)gentoo.org> + Signed-off-by: Matthieu Herrb <matthieu.herrb(a)laas.fr> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 2e75ae9b22de0fa36adde6de7b7e5c1c1a825d69 +Author: Julien Cristau <jcristau(a)debian.org> +Date: Sat Jan 16 15:00:38 2010 +0000 + + Bump to 1.4.2 + +commit 1c8cfa5cd1881f810ed62ff082e67777985c7599 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 09:32:32 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 43e41a5537ba892613f2a9f79cdf209fd7c915b3 +Author: Julien Cristau <jcristau(a)debian.org> +Date: Sat Jan 2 20:44:37 2010 +0000 + + INSTALL doesn't belong in docdir, use pkgdatadir instead + + docdir stays in xorg-macros.pc so we don't break the existing + $(INSTALL_CMD). + + Tested-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Julien Cristau <jcristau(a)debian.org> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 29f4c09cc252d834278e6e1ad77ad56dc0545d29 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Dec 15 14:25:17 2009 -0500 + + configure.ac: use single statement for file generation + + Reported-by: Peter Hutterer <peter.hutterer at who-t.net> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit c3c40da5392c2f1fe4b15c6e90dc8325b3c26561 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Dec 15 14:01:05 2009 -0500 + + macros.m4.in: use backticks rather than $() for cmd subs + + Reviewed-by: Dan Nicholson <dbn.lists at gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 48e2b3d0ee8d637d83b88bf29c6d417f61aaa0e4 +Author: Colin Watson <cjwatson(a)canonical.com> +Date: Sat Oct 10 13:28:28 2009 +0100 + + Use conservative default for malloc(0) when cross-compiling #24460 + + When cross-compiling, AC_RUN_IFELSE can't run test programs. + MALLOC_ZERO_RETURNS_NULL=yes is a conservative default in this case. + + Signed-off-by: Colin Watson <cjwatson(a)canonical.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 2c83c9068167729652994cf3203ca27245745482 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Dec 14 17:12:13 2009 -0500 + + util-macros 1.4.1 + + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 8e126170a4bf23ae73a08d254f6c6fb7e6b46748 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Dec 14 17:05:48 2009 -0500 + + Don't mention libdir in the .pc file + + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 862911eb71165c9409044986171b8ce2c1ec70b7 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Dec 14 17:05:10 2009 -0500 + + Install the .pc file in $(datadir) + + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 03b04a6b5d61aafbd2705f7d29e58e0c92553a4a +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Dec 14 16:54:41 2009 -0500 + + macros 1.4.0 + +commit 64e61146ecf6cde01a72d95f905f8d3790b78b58 +Author: Carl Worth <cworth(a)cworth.org> +Date: Mon Nov 30 20:00:31 2009 -0800 + + Install .pc file in $libdir where it belongs (not $datadir). + + The .pc file was previously being installed in ${prefix}/share/pkgconfig + but all other modules install their .pc files to ${prefix}/lib/pkgconfig + +commit 1e50b971bf7273f958e11cbcf3dc07a6fab04335 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Nov 21 17:28:32 2009 -0500 + + xorg-macros.pc.in: create a meta data file for util-macros + + This is motivated primarly by XORG_INSTALL who needs to locate + the docdir when invoked from any module that may not be installed + using same prefix (default or otherwise). + + There are other potential use for this file. + +commit ceecddadf923ceae76c12057103ec7a409718a34 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:20:42 2009 -0400 + + Add an XORG_INSTALL macro to allow comps to copy the INSTALL file #24206 + + The Makefile installs INSTALL in share/doc/util-macros + An INSTALL_CMD is provided in the new XORG_INSTALL macro + which is added to XORG_DEFAULT_OPTIONS. + + Components add INSTALL target to their Makefile similar to ChangeLog + +commit e6ceec1bc497ce9d311fd17e9a171e83148362ad +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 12 11:07:14 2009 -0400 + + Add an XORG_INSTALL macro to allow comps to copy the INSTALL file #24206 + + The Makefile installs INSTALL in share/doc/util-macros + An INSTALL_CMD is provided in the new XORG_INSTALL macro + which is added to XORG_DEFAULT_OPTIONS. + + Components add INSTALL target to their Makefile similar to ChangeLog + +commit 22d7360510553775650e6a4e134f165937db4abe +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 10 15:38:19 2009 -0400 + + INSTALL file missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + For all X.Org components. + +commit bf44a8df3831ac465fd79937b059e54c4dc34486 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 10 15:33:58 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + For all X.Org components. + +commit 98c7586b04dea14d89df6e7ad1c733e6539cd095 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Nov 7 07:58:33 2009 -0500 + + Lower version from 2.63 to 2.60 Tinderbox failed + +commit b47a30d3c91fbd5b230a11b1a5ddbfb943bcd7b2 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 12 10:57:13 2009 -0400 + + configuration: update, fix warnings, apply global maintenance #24450 + + Update configure.ac using autotools utilities and wiki guidelines + + configure.ac: AM_MAINTAINER_MODE missing #24238 + + This turns off maintainer mode build rules in tarballs. + For all X.Org components. + +commit f8695cf7b892028bf7c502e85f26f0a756edd316 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 12 10:37:36 2009 -0400 + + ChangeLog: generated file not cleaned from the dist directory #24278 + + CHANGELOG_CMD was written in the wrong directory. + Update cmd to generate in $(top_srcdir) + + Tested in regular build with git: dist, distcheck and distclean + Tested in VPATH build with git: dist, distcheck and distclean + Tested above scenario from tarballs with git not available + commit d6584a4a52a6fb0eaf979555097bb32621c13cb1 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Wed Sep 9 13:31:38 2009 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/INSTALL new/util-macros-1.6.0/INSTALL --- old/util-macros-1.3.0/INSTALL 1970-01-01 01:00:00.000000000 +0100 +++ new/util-macros-1.6.0/INSTALL 2009-11-07 15:34:49.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/Makefile.am new/util-macros-1.6.0/Makefile.am --- old/util-macros-1.3.0/Makefile.am 2008-12-16 23:47:36.000000000 +0100 +++ new/util-macros-1.6.0/Makefile.am 2010-01-09 15:06:17.000000000 +0100 @@ -21,6 +21,7 @@ aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-macros.m4 +dist_pkgdata_DATA = INSTALL # Previous versions used to install xorgversion.m4, now integrated # into xorg-macros.m4. Explicitly remove that old file in order not @@ -28,6 +29,11 @@ install-data-hook: rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 +pkgconfigdir = $(datadir)/pkgconfig +pkgconfig_DATA = xorg-macros.pc + +EXTRA_DIST = xorg-macros.pc.in + .PHONY: ChangeLog ChangeLog: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/configure.ac new/util-macros-1.6.0/configure.ac --- old/util-macros-1.3.0/configure.ac 2009-09-09 22:05:41.000000000 +0200 +++ new/util-macros-1.6.0/configure.ac 2010-02-05 15:03:27.000000000 +0100 @@ -21,11 +21,17 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([util-macros], - [1.3.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] + [1.6.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] + [util-macros]) +AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +# Checks for programs. +AC_PROG_INSTALL # This is the package that installs xorgversion.m4 as part of xorg-macros.m4. # In order to use xorgversion.m4 here, we include it explicitly. @@ -34,4 +40,6 @@ XORG_RELEASE_VERSION XORG_CHANGELOG -AC_OUTPUT([Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4]) +AC_CONFIG_FILES([xorg-macros.pc + Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/xorg-macros.m4.in new/util-macros-1.6.0/xorg-macros.m4.in --- old/util-macros-1.3.0/xorg-macros.m4.in 2009-09-08 18:57:27.000000000 +0200 +++ new/util-macros-1.6.0/xorg-macros.m4.in 2010-02-05 15:03:27.000000000 +0100 @@ -3,29 +3,23 @@ dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a -dnl copy of this software and associated documentation files (the -dnl "Software"), to deal in the Software without restriction, including -dnl without limitation the rights to use, copy, modify, merge, publish, -dnl distribute, and/or sell copies of the Software, and to permit persons -dnl to whom the Software is furnished to do so, provided that the above -dnl copyright notice(s) and this permission notice appear in all copies of -dnl the Software and that both the above copyright notice(s) and this -dnl permission notice appear in supporting documentation. +dnl copy of this software and associated documentation files (the "Software"), +dnl to deal in the Software without restriction, including without limitation +dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, +dnl and/or sell copies of the Software, and to permit persons to whom the +dnl Software is furnished to do so, subject to the following conditions: dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl The above copyright notice and this permission notice (including the next +dnl paragraph) shall be included in all copies or substantial portions of the +dnl Software. dnl -dnl Except as contained in this notice, the name of a copyright holder -dnl shall not be used in advertising or otherwise to promote the sale, use -dnl or other dealings in this Software without prior written authorization -dnl of the copyright holder. +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +dnl DEALINGS IN THE SOFTWARE. # XORG_MACROS_VERSION(required-version) # ------------------------------------- @@ -310,6 +304,448 @@ AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK +# XORG_WITH_XMLTO +# ---------------- +# Minimum version: 1.5.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-xmlto option, it allows maximum flexibilty in making decisions +# as whether or not to use the xmlto package. +# +# Interface to module: +# HAVE_XMLTO: used in makefiles to conditionally generate documentation +# XMLTO: returns the path of the xmlto program found +# returns the path set by the user in the environment +# --with-xmlto: 'yes' user instructs the module to use xmlto +# 'no' user instructs the module not to use xmlto +# +# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_XMLTO],[ +AC_ARG_VAR([XMLTO], [Path to xmlto command]) +AC_ARG_WITH(xmlto, + AS_HELP_STRING([--with-xmlto], + [Use xmlto to regenerate documentation (default: yes, if installed)]), + [use_xmlto=$withval], [use_xmlto=auto]) + +if test "x$use_xmlto" = x"auto"; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_WARN([xmlto not found - documentation targets will be skipped]) + have_xmlto=no + else + have_xmlto=yes + fi +elif test "x$use_xmlto" = x"yes" ; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH]) + fi + have_xmlto=yes +elif test "x$use_xmlto" = x"no" ; then + if test "x$XMLTO" != "x"; then + AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified]) + fi + have_xmlto=no +else + AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) +]) # XORG_CHECK_XMLTO + +# XORG_WITH_ASCIIDOC +# ---------------- +# Minimum version: 1.5.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# as whether or not to use the asciidoc package. +# +# Interface to module: +# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation +# ASCIIDOC: returns the path of the asciidoc program found +# returns the path set by the user in the environment +# --with-asciidoc: 'yes' user instructs the module to use asciidoc +# 'no' user instructs the module not to use asciidoc +# +# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_ASCIIDOC],[ +AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +AC_ARG_WITH(asciidoc, + AS_HELP_STRING([--with-asciidoc], + [Use asciidoc to regenerate documentation (default: yes, if installed)]), + [use_asciidoc=$withval], [use_asciidoc=auto]) + +if test "x$use_asciidoc" = x"auto"; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_WARN([asciidoc not found - documentation targets will be skipped]) + have_asciidoc=no + else + have_asciidoc=yes + fi +elif test "x$use_asciidoc" = x"yes" ; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH]) + fi + have_asciidoc=yes +elif test "x$use_asciidoc" = x"no" ; then + if test "x$ASCIIDOC" != "x"; then + AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified]) + fi + have_asciidoc=no +else + AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) +]) # XORG_CHECK_ASCIIDOC + +# XORG_WITH_DOXYGEN +# ---------------- +# Minimum version: 1.5.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-doxygen option, it allows maximum flexibilty in making decisions +# as whether or not to use the doxygen package. +# +# Interface to module: +# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation +# DOXYGEN: returns the path of the doxygen program found +# returns the path set by the user in the environment +# --with-doxygen: 'yes' user instructs the module to use doxygen +# 'no' user instructs the module not to use doxygen +# +# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_DOXYGEN],[ +AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +AC_ARG_WITH(doxygen, + AS_HELP_STRING([--with-doxygen], + [Use doxygen to regenerate documentation (default: yes, if installed)]), + [use_doxygen=$withval], [use_doxygen=auto]) + +if test "x$use_doxygen" = x"auto"; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_WARN([doxygen not found - documentation targets will be skipped]) + have_doxygen=no + else + have_doxygen=yes + fi +elif test "x$use_doxygen" = x"yes" ; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH]) + fi + have_doxygen=yes +elif test "x$use_doxygen" = x"no" ; then + if test "x$DOXYGEN" != "x"; then + AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified]) + fi + have_doxygen=no +else + AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) +]) # XORG_CHECK_DOXYGEN + +# XORG_WITH_GROFF +# ---------------- +# Minimum version: 1.6.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-groff option, it allows maximum flexibilty in making decisions +# as whether or not to use the groff package. +# +# Interface to module: +# HAVE_GROFF: used in makefiles to conditionally generate documentation +# HAVE_GROFF_MM: the memorandum macros (-mm) package +# HAVE_GROFF_MS: the -ms macros package +# GROFF: returns the path of the groff program found +# returns the path set by the user in the environment +# --with-groff: 'yes' user instructs the module to use groff +# 'no' user instructs the module not to use groff +# +# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path. +# +# OS and distros often splits groff in a basic and full package, the former +# having the groff program and the later having devices, fonts and macros +# Checking for the groff executable is not enough. +# +# If macros are missing, we cannot assume that groff is useless, so we don't +# unset HAVE_GROFF or GROFF env variables. +# HAVE_GROFF_?? can never be true while HAVE_GROFF is false. +# +AC_DEFUN([XORG_WITH_GROFF],[ +AC_ARG_VAR([GROFF], [Path to groff command]) +AC_ARG_WITH(groff, + AS_HELP_STRING([--with-groff], + [Use groff to regenerate documentation (default: yes, if installed)]), + [use_groff=$withval], [use_groff=auto]) + +if test "x$use_groff" = x"auto"; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_WARN([groff not found - documentation targets will be skipped]) + have_groff=no + else + have_groff=yes + fi +elif test "x$use_groff" = x"yes" ; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH]) + fi + have_groff=yes +elif test "x$use_groff" = x"no" ; then + if test "x$GROFF" != "x"; then + AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified]) + fi + have_groff=no +else + AC_MSG_ERROR([--with-groff expects 'yes' or 'no']) +fi +# We have groff, test for the presence of the macro packages +if test "x$have_groff" = x"yes"; then + AC_MSG_CHECKING([for ${GROFF} -ms macros]) + if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then + groff_ms_works=yes + else + groff_ms_works=no + fi + AC_MSG_RESULT([$groff_ms_works]) + AC_MSG_CHECKING([for ${GROFF} -mm macros]) + if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then + groff_mm_works=yes + else + groff_mm_works=no + fi + AC_MSG_RESULT([$groff_mm_works]) +fi +AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) +]) # XORG_WITH_GROFF + +# XORG_WITH_FOP +# ---------------- +# Minimum version: 1.6.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-fop option, it allows maximum flexibilty in making decisions +# as whether or not to use the fop package. +# +# Interface to module: +# HAVE_FOP: used in makefiles to conditionally generate documentation +# FOP: returns the path of the fop program found +# returns the path set by the user in the environment +# --with-fop: 'yes' user instructs the module to use fop +# 'no' user instructs the module not to use fop +# +# If the user sets the value of FOP, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_FOP],[ +AC_ARG_VAR([FOP], [Path to fop command]) +AC_ARG_WITH(fop, + AS_HELP_STRING([--with-fop], + [Use fop to regenerate documentation (default: yes, if installed)]), + [use_fop=$withval], [use_fop=auto]) + +if test "x$use_fop" = x"auto"; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_WARN([fop not found - documentation targets will be skipped]) + have_fop=no + else + have_fop=yes + fi +elif test "x$use_fop" = x"yes" ; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH]) + fi + have_fop=yes +elif test "x$use_fop" = x"no" ; then + if test "x$FOP" != "x"; then + AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified]) + fi + have_fop=no +else + AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) +]) # XORG_WITH_FOP + +# XORG_WITH_PS2PDF +# ---------------- +# Minimum version: 1.6.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# as whether or not to use the ps2pdf package. +# +# Interface to module: +# HAVE_PS2PDF: used in makefiles to conditionally generate documentation +# PS2PDF: returns the path of the ps2pdf program found +# returns the path set by the user in the environment +# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf +# 'no' user instructs the module not to use ps2pdf +# +# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PS2PDF],[ +AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +AC_ARG_WITH(ps2pdf, + AS_HELP_STRING([--with-ps2pdf], + [Use ps2pdf to regenerate documentation (default: yes, if installed)]), + [use_ps2pdf=$withval], [use_ps2pdf=auto]) + +if test "x$use_ps2pdf" = x"auto"; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped]) + have_ps2pdf=no + else + have_ps2pdf=yes + fi +elif test "x$use_ps2pdf" = x"yes" ; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH]) + fi + have_ps2pdf=yes +elif test "x$use_ps2pdf" = x"no" ; then + if test "x$PS2PDF" != "x"; then + AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified]) + fi + have_ps2pdf=no +else + AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) +]) # XORG_WITH_PS2PDF + +# XORG_ENABLE_DOCS (enable_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a builder to skip all +# documentation targets except traditional man pages. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DOCS: used in makefiles to conditionally generate documentation +# --enable-docs: 'yes' user instructs the module to generate docs +# 'no' user instructs the module not to generate docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DOCS],[ +default=$1 +if test "x$default" = x ; then + default="yes" +fi +AC_ARG_ENABLE(docs, + AS_HELP_STRING([--enable-docs], + [Enable building the documentation (default: yes)]), + [build_docs=$enableval], [build_docs=$default]) +AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) +AC_MSG_CHECKING([whether to build documentation]) +AC_MSG_RESULT([$build_docs]) +]) # XORG_ENABLE_DOCS + +# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all developer documentation. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DEVEL_DOCS: used in makefiles to conditionally generate developer docs +# --enable-devel-docs: 'yes' user instructs the module to generate developer docs +# 'no' user instructs the module not to generate developer docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ +devel_default=$1 +if test "x$devel_default" = x ; then + devel_default="yes" +fi +AC_ARG_ENABLE(devel-docs, + AS_HELP_STRING([--enable-devel-docs], + [Enable building the developer documentation (default: yes)]), + [build_devel_docs=$enableval], [build_devel_docs=$devel_default]) +AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) +AC_MSG_CHECKING([whether to build developer documentation]) +AC_MSG_RESULT([$build_devel_docs]) +]) # XORG_ENABLE_DEVEL_DOCS + +# XORG_ENABLE_SPECS (enable_specs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all functional specification targets. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_SPECS: used in makefiles to conditionally generate specs +# --enable-specs: 'yes' user instructs the module to generate specs +# 'no' user instructs the module not to generate specs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_SPECS],[ +spec_default=$1 +if test "x$spec_default" = x ; then + spec_default="yes" +fi +AC_ARG_ENABLE(specs, + AS_HELP_STRING([--enable-specs], + [Enable building the specs (default: yes)]), + [build_specs=$enableval], [build_specs=$spec_default]) +AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) +AC_MSG_CHECKING([whether to build functional specifications]) +AC_MSG_RESULT([$build_specs]) +]) # XORG_ENABLE_SPECS + # XORG_CHECK_MALLOC_ZERO # ---------------------- # Minimum version: 1.0.0 @@ -339,7 +775,8 @@ exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); }], [MALLOC_ZERO_RETURNS_NULL=yes], - [MALLOC_ZERO_RETURNS_NULL=no]) + [MALLOC_ZERO_RETURNS_NULL=no], + [MALLOC_ZERO_RETURNS_NULL=yes]) fi AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) @@ -441,7 +878,7 @@ if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ --Wbad-function-cast" +-Wbad-function-cast -Wformat=2" case `$CC -dumpversion` in 3.4.* | 4.*) CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" @@ -497,5 +934,23 @@ XORG_STRICT_OPTION XORG_RELEASE_VERSION XORG_CHANGELOG +XORG_INSTALL XORG_MANPAGE_SECTIONS ]) # XORG_DEFAULT_OPTIONS + +# XORG_INSTALL() +# ---------------- +# Minimum version: 1.4.0 +# +# Defines the variable INSTALL_CMD as the command to copy +# INSTALL from $prefix/share/util-macros. +# +AC_DEFUN([XORG_INSTALL], [ +AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ +mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ +echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +AC_SUBST([INSTALL_CMD]) +]) # XORG_INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/xorg-macros.pc.in new/util-macros-1.6.0/xorg-macros.pc.in --- old/util-macros-1.3.0/xorg-macros.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/util-macros-1.6.0/xorg-macros.pc.in 2010-01-09 15:06:17.000000000 +0100 @@ -0,0 +1,16 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +datarootdir=@datarootdir@ +datadir=@datadir@ +PACKAGE=@PACKAGE@ +# Used by XORG_INSTALL +pkgdatadir=${datadir}/${PACKAGE} +# docdir is kept for backwards compatibility with XORG_INSTALL from +# util-macros 1.4 +docdir=${pkgdatadir} + +Name: X.Org Macros +Description: A set of autoconf project macros for X.Org modules +Version: @PACKAGE_VERSION@ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/util-macros-1.3.0/xorgversion.m4 new/util-macros-1.6.0/xorgversion.m4 --- old/util-macros-1.3.0/xorgversion.m4 2009-09-08 18:57:27.000000000 +0200 +++ new/util-macros-1.6.0/xorgversion.m4 2009-10-12 16:29:27.000000000 +0200 @@ -67,12 +67,11 @@ # Defines the variable CHANGELOG_CMD as the command to generate # ChangeLog from git. # -# Arrange that distcleancheck ignores ChangeLog left over by distclean. # AC_DEFUN([XORG_CHANGELOG], [ -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ -mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ +|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ echo 'git directory not found: installing possibly empty changelog.' >&2)" AC_SUBST([CHANGELOG_CMD]) -AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) ]) # XORG_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 binutils for openSUSE:Factory
by root＠Hilbert.suse.de 25 Mar '10

25 Mar '10

Hello community, here is the log from the commit of package binutils for openSUSE:Factory checked in at Fri Mar 26 00:03:46 CET 2010. -------- --- binutils/binutils.changes 2010-02-12 16:56:18.000000000 +0100 +++ binutils/binutils.changes 2010-03-24 17:30:12.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Mar 24 17:23:32 CET 2010 - matz(a)suse.de + +- Fix testcase breaking with MALLOC_PERTURB. [bnc #590820] + +------------------------------------------------------------------- +Wed Feb 17 17:11:18 CET 2010 - matz(a)suse.de + +- Add xsave64, xrstor64 and vpermil2p support (XOP). + +------------------------------------------------------------------- +Sat Feb 13 17:52:11 CET 2010 - rguenther(a)suse.de + +- Drop build counter from the libbfd and libopcode SONAMEs. + +------------------------------------------------------------------- cross-alpha-binutils.changes: same change cross-arm-binutils.changes: same change cross-avr-binutils.changes: same change cross-hppa-binutils.changes: same change cross-hppa64-binutils.changes: same change cross-i386-binutils.changes: same change cross-ia64-binutils.changes: same change cross-mips-binutils.changes: same change cross-ppc-binutils.changes: same change cross-ppc64-binutils.changes: same change cross-s390-binutils.changes: same change cross-s390x-binutils.changes: same change cross-sh4-binutils.changes: same change cross-sparc-binutils.changes: same change cross-spu-binutils.changes: same change cross-x86_64-binutils.changes: same change calling whatdependson for head-i586 New: ---- fixup-testcase-perturb.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ binutils.spec ++++++ --- /var/tmp/diff_new_pack.hc8CXH/_old 2010-03-26 00:00:31.000000000 +0100 +++ /var/tmp/diff_new_pack.hc8CXH/_new 2010-03-26 00:00:31.000000000 +0100 @@ -25,7 +25,7 @@ BuildRequires: zlib-devel %endif Version: 2.20.0 -Release: 4 +Release: 5 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -83,6 +83,7 @@ Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff Patch14: binutils-build-as-needed.diff +Patch15: fixup-testcase-perturb.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch100: xop.diff.gz @@ -293,6 +294,7 @@ %patch11 %patch12 %patch14 +%patch15 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -302,7 +304,7 @@ # # test_vanilla %endif -sed -i -e '/BFD_VERSION_DATE/s/$/-%{release}/' bfd/version.h +sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" cross-alpha-binutils.spec: same change cross-arm-binutils.spec: same change cross-avr-binutils.spec: same change cross-hppa-binutils.spec: same change cross-hppa64-binutils.spec: same change cross-i386-binutils.spec: same change cross-ia64-binutils.spec: same change cross-mips-binutils.spec: same change cross-ppc-binutils.spec: same change cross-ppc64-binutils.spec: same change cross-s390-binutils.spec: same change cross-s390x-binutils.spec: same change cross-sh4-binutils.spec: same change cross-sparc-binutils.spec: same change cross-spu-binutils.spec: same change cross-x86_64-binutils.spec: same change ++++++ fixup-testcase-perturb.diff ++++++ MALLOC_PERTURB_ will make inval-equ-1.l fail, because with errors fixups aren't run, which means the space for displacement operands remains uninitialized. The testcase invalidly expects zeros there. See bnc #590820 . --- gas/testsuite/gas/i386/inval-equ-1.l.mm 2008-03-03 15:28:58.000000000 +0000 +++ gas/testsuite/gas/i386/inval-equ-1.l 2010-03-24 16:16:30.000000000 +0000 @@ -9,6 +9,6 @@ GAS LISTING .* [ ]*3[ ]+\.equ bar1,%eax [ ]*4[ ]+\.equ bar2,%eax [ ]*5[ ]+\.globl bar2 -[ ]*6[ ]+\?\?\?\? A1000000 mov bar1,%eax -[ ]*6[ ]+00 -[ ]*7[ ]+\?\?\?\? 89C0 mov bar2,%eax +[ ]*6[ ]+.*[ ]+mov bar1,%eax +[ ]*6[ ]+.* +[ ]*7[ ]+.*[ ]+mov bar2,%eax --- gas/testsuite/gas/i386/inval-equ-2.l.mm 2008-03-03 15:28:58.000000000 +0000 +++ gas/testsuite/gas/i386/inval-equ-2.l 2010-03-24 16:18:05.000000000 +0000 @@ -7,13 +7,13 @@ GAS LISTING .* [ ]*1[ ]+\.globl bar1 [ ]*2[ ]+\.set bar1,$%eax\+1$ -[ ]*3[ ]+\?\?\?\? A12A0000 mov bar1,%eax -[ ]*3[ ]+00 +[ ]*3[ ]+.*[ ]+mov bar1,%eax +[ ]*3[ ]+.* [ ]*4[ ]+\.set bar2,$%eax\+1$ -[ ]*5[ ]+\?\?\?\? A12A0000 mov bar2,%eax -[ ]*5[ ]+00 +[ ]*5[ ]+.*[ ]+mov bar2,%eax +[ ]*5[ ]+.* [ ]*6[ ]+\.globl bar2 [ ]*7[ ]+\.set bar3,$%eax\+1$ -[ ]*8[ ]+\?\?\?\? A12A0000 mov bar3,%eax +[ ]*8[ ]+.*[ ]+mov bar3,%eax \*\*\*\* Error:can't make global register symbol `bar3' -[ ]*8[ ]+00 +[ ]*8[ ]+.* ++++++ xop.diff.gz ++++++ ++++ 43765 lines (skipped) ++++ between binutils/xop.diff.gz ++++ and binutils/xop.diff.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virt-manager for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Tue Mar 23 22:38:47 CET 2010. -------- --- virt-manager/virt-manager.changes 2010-03-19 18:23:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2010-03-23 22:11:56.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 23 15:10:52 MDT 2010 - carnold(a)novell.com + +- Enable the following utilities. Submitted by Stephan Kleine + (bitdealer(a)gmail.com) + virt-clone + virt-convert + virt-image + virt-install + virt-manager + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.uFNPY1/_old 2010-03-23 22:37:58.000000000 +0100 +++ /var/tmp/diff_new_pack.uFNPY1/_new 2010-03-23 22:37:58.000000000 +0100 @@ -28,7 +28,7 @@ Name: virt-manager Summary: Virtual Machine Manager Version: 0.8.3 -Release: 2 +Release: 3 Group: System/Monitoring License: LGPLv2.1+ Url: http://virt-manager.et.redhat.com @@ -50,7 +50,7 @@ Patch82: virtinst-storage-ocfs2.diff ExclusiveArch: %{ix86} x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +#%gconf_schemas_prereq # #rpmlint BuildRequires: python BuildRequires: gtk2-devel @@ -155,33 +155,17 @@ make install DESTDIR=$RPM_BUILD_ROOT pushd $RPM_BUILD_DIR/%{virtinst_name} python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{_datadir}/virt-manager -rm -f $RPM_BUILD_ROOT/usr/bin/virt-clone -rm -f $RPM_BUILD_ROOT/usr/bin/virt-image -rm -f $RPM_BUILD_ROOT/usr/bin/virt-install -rm -f $RPM_BUILD_ROOT/usr/bin/virt-convert -rm -f $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/pl/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/fr/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/it/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/sr/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/ru/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/sr(a)latin/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/locale/es/LC_MESSAGES/virtinst.mo -rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-clone.1 -rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-image.1 -rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1 -rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1 -rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5 popd #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la # Unsupport languages: rm -rf $RPM_BUILD_ROOT/usr/share/locale/or %find_gconf_schemas -%find_lang %{name} -cat %{name}.schemas_list %{name}.lang > %{name}.lst +for lang_file in %{name} virtinst +do + %find_lang $lang_file single_lang_file.lang +done +cat %{name}.schemas_list single_lang_file.lang > %{name}.lst sed -i '\^/usr/share/gnome/help/^d' %{name}.lst %suse_update_desktop_file %{name} X-SuSE-YaST-Virtualization sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;/' $RPM_BUILD_ROOT/%{_datadir}/applications/YaST2/%{name}.desktop @@ -212,6 +196,10 @@ %config %{gsysconfdir}/gconf/schemas/%{name}.schemas %endif %{_bindir}/%{name} +%{_bindir}/virt-clone +%{_bindir}/virt-convert +%{_bindir}/virt-image +%{_bindir}/virt-install %{_libexecdir}/%{name}-launch %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade @@ -232,7 +220,12 @@ %{_datadir}/gnome/help %{_datadir}/applications/YaST2/%{name}.desktop %{_datadir}/dbus-1/services/%{name}.service -%{_datadir}/man/man1/%{name}.1* +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/virt-clone.1* +%{_mandir}/man1/virt-convert.1* +%{_mandir}/man1/virt-image.1* +%{_mandir}/man1/virt-install.1* +%{_mandir}/man5/virt-image.5* # new files for virt-manager-0.8.1 %dir %{_datadir}/%{name}/virtconv %{_datadir}/%{name}/virtconv/*.py ++++++ virtman-autoconnect.diff ++++++ --- /var/tmp/diff_new_pack.uFNPY1/_old 2010-03-23 22:37:58.000000000 +0100 +++ /var/tmp/diff_new_pack.uFNPY1/_new 2010-03-23 22:37:58.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.8.3.orig/src/virtManager/engine.py +++ virt-manager-0.8.3/src/virtManager/engine.py -@@ -471,7 +471,7 @@ class vmmEngine(gobject.GObject): +@@ -474,7 +474,7 @@ class vmmEngine(gobject.GObject): self.emit("connection-added", conn) self.config.add_connection(conn.get_uri()) if autoconnect: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-printer for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at Tue Mar 23 22:37:22 CET 2010. -------- --- yast2-printer/yast2-printer.changes 2010-03-03 14:46:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2010-03-18 16:36:04.000000000 +0100 @@ -1,0 +2,35 @@ +Thu Mar 18 16:17:41 CET 2010 - jsmeix(a)suse.de + +- Major cleanup of the AutoYaST printer client printer_auto.ycp + (see Novell/Suse Bugzilla bnc#588679): + Now there is verbatim cupsd.conf and client.conf + as XML CDATA in the AutoYaST control file. + This results a new AutoYaST control file structure: + <printer> + <client_conf_content> + <file_contents><![CDATA[ + ... verbatim content of /etc/cups/client.conf ... + ]]></file_contents> + </client_conf_content> + <cupsd_conf_content> + <file_contents><![CDATA[ + ... verbatim content of /etc/cups/cupsd.conf ... + ]]></file_contents> + </cupsd_conf_content> + </printer> + Provide a new src/printer.rnc to match the + new AutoYaST control file structure. +- In src/printer.desktop added the line + X-SuSE-YaST-AutoInstSchema=printer.rnc + to pull in printer.rnc when yast2-schema is build + (see Novell/Suse Bugzilla bnc#588998). +- In printer_proposal.ycp use Printer::DeriveModelName + and Printer::DeriveDriverFilterString the same way + as in basicadd.ycp so that the proposal results now + the same queue setup as if the user would have just + clicked [OK] in the BasicAddDialog. +- Prefer "manufacturer-PPD" over "recommended" PPD + (see Novell/Suse Bugzilla bnc#589371). +- 2.19.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.19.5.tar.bz2 New: ---- yast2-printer-2.19.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.jerYfA/_old 2010-03-23 22:36:02.000000000 +0100 +++ /var/tmp/diff_new_pack.jerYfA/_new 2010-03-23 22:36:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.19.5) +# spec file for package yast2-printer (Version 2.19.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-printer -Version: 2.19.5 +Version: 2.19.6 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.19.5.tar.bz2 +Source0: yast2-printer-2.19.6.tar.bz2 Prefix: /usr @@ -35,12 +35,6 @@ Requires: /bin/mktemp /bin/ping /usr/bin/sed Requires: yast2 >= 2.16.12 -Provides: yast2-config-cups yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups yast2-trans-printer yast2-trans-libprinter yast2-trans-cups yast2-cups-devel -Obsoletes: yast2-config-cups yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups yast2-trans-printer yast2-trans-libprinter yast2-trans-cups yast2-cups-devel - -Provides: yast2-agent-cups-devel y2d_prnt y2t_prnt -Obsoletes: yast2-agent-cups-devel y2d_prnt y2t_prnt - # Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list # which are pulled in by Autoreqprov because of the basicadd_displaytest tool: %define my_requires /tmp/my-requires @@ -60,7 +54,7 @@ Developer documentation for yast2-printer. %prep -%setup -n yast2-printer-2.19.5 +%setup -n yast2-printer-2.19.6 %build %{prefix}/bin/y2tool y2autoconf @@ -72,7 +66,9 @@ %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" @@ -103,8 +99,6 @@ /usr/share/YaST2/clients/printer* /usr/share/YaST2/include/printer/* /usr/share/YaST2/schema/autoyast/rnc/printer.rnc -/usr/share/YaST2/scrconf/* -/usr/lib/YaST2/servers_non_y2/* /usr/share/YaST2/data/testprint.ps %{prefix}/lib/YaST2/bin/autodetect_print_queues %{prefix}/lib/YaST2/bin/autodetect_printers ++++++ yast2-printer-2.19.5.tar.bz2 -> yast2-printer-2.19.6.tar.bz2 ++++++ ++++ 6004 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/Makefile.am new/yast2-printer-2.19.6/Makefile.am --- old/yast2-printer-2.19.5/Makefile.am 2010-03-03 12:34:57.000000000 +0100 +++ new/yast2-printer-2.19.6/Makefile.am 2010-03-20 09:26:41.000000000 +0100 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ @@ -214,4 +214,4 @@ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents data doc src testsuite tools +SUBDIRS = data doc src testsuite tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/VERSION new/yast2-printer-2.19.6/VERSION --- old/yast2-printer-2.19.5/VERSION 2010-03-03 12:15:26.000000000 +0100 +++ new/yast2-printer-2.19.6/VERSION 2010-03-11 18:00:36.000000000 +0100 @@ -1 +1 @@ -2.19.5 +2.19.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/agents/Makefile.am new/yast2-printer-2.19.6/agents/Makefile.am --- old/yast2-printer-2.19.5/agents/Makefile.am 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/agents/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -agent_SCRIPTS = ag_cups - -scrconf_DATA = cfg_cups.scr - -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/agents/ag_cups new/yast2-printer-2.19.6/agents/ag_cups --- old/yast2-printer-2.19.5/agents/ag_cups 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/agents/ag_cups 1970-01-01 01:00:00.000000000 +0100 @@ -1,210 +0,0 @@ -#!/usr/bin/perl -w -package ag_cups_server; -BEGIN { push( @INC, '/usr/share/YaST2/modules/' ); } -use ycp; -use YaST::SCRAgent; -use YaPI; -textdomain "printer"; -our @ISA = ("YaST::SCRAgent"); -use strict; - - use Data::Dumper; - - - -sub createOrInsert { - my ($line, $data_ref) = @_; - if ( $line=~/\s*(\w*)\s+([\w\W]*)/){ - # add to existing list - if (exists $$data_ref{$1}){ - push(@{$$data_ref{$1}}, $2); - # new item - } else{ - $$data_ref{$1}=[$2]; - } - } -} - -sub createOrInsertSection { - my ($line, $section, $data_ref) = @_; - foreach (@$data_ref){ - if($$section eq "$_->{'Key'} $_->{'Value'}"){ - createOrInsert($line, $_); - } - } -} - -sub parseSection{ - my ($sec_r, $line, $data_r) = @_; - #new section - if ($line =~ /<([\w]*)\s*([\w\W]*)>/){ - push(@$sec_r, "$1 $2"); - - if(scalar @$sec_r==2){ - my $pos=0; - foreach (@{$$data_r{'sections'}}){ - if(@$sec_r[0] eq "$_->{'Key'} $_->{'Value'}"){ - @{$$data_r{'sections'}[$pos]{'sections'}}=() if (!exists $$data_r{'sections'}[$pos]{'sections'}); - $data_r=$$data_r{'sections'}[$pos]; - } - $pos++; - } - } - - $$data_r{'sections'}=[] if(!exists $$data_r{'sections'}); - push(@{$$data_r{'sections'}}, {'Key'=>$1, 'Value'=>$2}); - - } else{ - # global section only - if (scalar @$sec_r==0 or @$sec_r[0] eq ""){ - createOrInsert($line, \%$data_r); - #inside sections - }else{ - my $ref = \@{$$data_r{'sections'}}; - # in case of sub-section ... - if(scalar @$sec_r==2){ - my $pos=0; - foreach (@{$$data_r{'sections'}}){ - if(@$sec_r[0] eq "$_->{'Key'} $_->{'Value'}"){ - $ref=\@{$$data_r{'sections'}[$pos]{'sections'}}; - } - $pos++; - } - } - createOrInsertSection($line, \@$sec_r[scalar @$sec_r-1], $ref); - } - } -} - -sub parse_conf { -# my $class = shift; - my $file = shift; - - my %data=(); - my @section=(); - if( open( FILE, $file ) ) { - while( my $line = <FILE> ) { - chomp($line); - # remove comments - next if ( $line =~ /^\s*#/ || $line =~ /^\s*$/); - - # end of the section - if($line=~/<\/([\w\W]*)>/){ - pop(@section); - } else{ - parseSection(\@section, $line, \%data); - } - } - close(FILE); - } - return \%data; -} - -sub Execute { - my $class = shift; - my ($path, @args) = @_; - - return 1; -} - -sub write_params { - my ($key, $options) = @_; - - my @output=(); - foreach my $params (@$options){ - push (@output, "$key $params"); - } - return @output; -} - -sub write_conf { - my ($file, $data) = @_; - my @output = (); - -foreach my $key(keys %$data){ - foreach my $options ($$data{$key}){ - if ($key eq "sections"){ - foreach my $item (@$options){ - - my $section=$$item{'Key'}; - push(@output, "<$section $$item{'Value'}>"); - delete $$item{'Key'}; - delete $$item{'Value'}; - foreach my $key2 (keys %$item){ - if ($key2 eq "sections"){ - - foreach my $subitem (@{$$item{'sections'}}){ - my $subsection=$$subitem{'Key'}; - push(@output, "<$subsection $$subitem{'Value'}>"); - delete $$subitem{'Key'}; - delete $$subitem{'Value'}; - foreach my $key2 (keys %$subitem){ - @output=(@output, write_params($key2, $$subitem{$key2})); - } - push(@output, "</$subsection>"); - } - - } else{ - @output=(@output, write_params($key2, $$item{$key2})); - } - } - push(@output, "</$section>"); - } - }else{ - @output=(@output, write_params($key, $options)); - } - } -} - - open( OUT, $file ); - foreach my $line (@output){ - print OUT "$line\n"; - } - close(OUT); - - return 1; -} - -sub Read { - my $class = shift; - my ($path, @args) = @_; - my $server = "< /etc/cups/cupsd.conf"; - my $client = "< /etc/cups/client.conf"; - - if ($path eq ".server"){ - return parse_conf($server); - } - elsif ($path eq ".client"){ - return parse_conf($client); - } - elsif ($path eq "."){ - return [('server'=> parse_conf($server), 'client'=>parse_conf($client))]; - }else{ - #not implemented - } -} - -sub Write { - my $class = shift; - my ($path, @args) = @_; - my $server = "> /etc/cups/cupsd.conf"; - my $client = "> /etc/cups/client.conf"; - - if ($path eq ".client"){ - return write_conf($client, $args[0]); - } - elsif ($path eq ".server"){ - return write_conf($server, $args[0]); - } - else{ - #not implemented - } -} - -sub Dir { -} - -package main; - -ag_cups_server->Run (); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/agents/cfg_cups.scr new/yast2-printer-2.19.6/agents/cfg_cups.scr --- old/yast2-printer-2.19.5/agents/cfg_cups.scr 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/agents/cfg_cups.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -/** - * File: - * tty.scr - * Summary: - * SCR Agent for reading/writing CUPS configuration - * Access: - * read/write - * Authors: - * See: - * anyagent - * libscr - * Example: - - * $Id: cfg_icups_server.scr 14516 2009-01-20 16:34:50Z mzugec $ - * - */ -.cups - -`ag_cups () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/autodocs-ycp.ami new/yast2-printer-2.19.6/autodocs-ycp.ami --- old/yast2-printer-2.19.5/autodocs-ycp.ami 2010-03-03 12:34:57.000000000 +0100 +++ new/yast2-printer-2.19.6/autodocs-ycp.ami 2010-03-20 09:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/configure.in new/yast2-printer-2.19.6/configure.in --- old/yast2-printer-2.19.5/configure.in 2010-03-03 12:34:57.000000000 +0100 +++ new/yast2-printer-2.19.6/configure.in 2010-03-20 09:26:41.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-printer dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.19.5, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.19.6, http://bugs.opensuse.org/, yast2-printer) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.5" +VERSION="2.19.6" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -157,8 +157,7 @@ ]) -AC_CONFIG_FILES(Makefile agents/Makefile -data/Makefile +AC_CONFIG_FILES(Makefile data/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/missing new/yast2-printer-2.19.6/missing --- old/yast2-printer-2.19.5/missing 2010-03-03 12:35:03.000000000 +0100 +++ new/yast2-printer-2.19.6/missing 2010-03-20 09:26:46.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/Printer.ycp new/yast2-printer-2.19.6/src/Printer.ycp --- old/yast2-printer-2.19.5/src/Printer.ycp 2010-03-03 12:15:27.000000000 +0100 +++ new/yast2-printer-2.19.6/src/Printer.ycp 2010-03-18 15:40:13.000000000 +0100 @@ -51,16 +51,6 @@ global boolean modified = false; /** - */ -global boolean proposal_valid = false; - -/** - * Write only, used during autoinstallation. - * Don't run services and SuSEconfig, it's all done at one place. - */ -global boolean write_only = false; - -/** * Abort function * return boolean return true if abort */ @@ -90,6 +80,43 @@ // Settings: // Define all variables needed for configuration of a printer: +/* + * Global variables: + */ + +/** + * Used by AutoYaST by calling in printer_auto.ycp the "Summary" function. + */ +global string printer_auto_summary = +_(" +AutoYaST settings for printing with CUPS via network. +There is no AutoYaST support for local print queues. +"); + +/** + * Set to 'true' by AutoYaST by calling in printer_auto.ycp the "SetModified" function. + * Read by AutoYaST by calling in printer_auto.ycp the "GetModified" function. + * Preset to false which is the right default for AutoYast. + */ +global boolean printer_auto_modified = false; + +/** + * Filled in by AutoYaST by calling in printer_auto.ycp the "Import" function. + * Reset to the empty map by AutoYaST by calling in printer_auto.ycp the "Reset" function. + * Preset to the empty map which is the right default for AutoYast. + */ +global map autoyast_printer_settings = $[]; + +/** + * Set to 'true' by AutoYaST by calling in printer_auto.ycp the "Change" function. + * Lets the Overview dialog disable the checkbox to show local queues + * which disables as a consequence in particular the [Delete] button. + * Lets the Printing via Network dialog disable the button to + * run the Connection Wizard (to set up a local queue for a network printer). + * Preset to false which is the right default for all dialogs. + */ +global boolean printer_auto_dialogs = false; + /** * Explicite listing of all alphanumeric ASCII characters. * The reason is that in certain special locales for example [a-z] is not equivalent @@ -267,10 +294,10 @@ /** * Queue filter string: - * Can be either "all" or "local" or "remote" depending on - * which kind of queues from the queues list (of queue maps) - * the user wants to see in the overview dialog. - * Preset to "all" which indicates that all queues are shown. + * Both boolean variables queue_filter_show_local and queue_filter_show_remote + * can be either 'true' or 'false' depending on which kind of queues + * from the queues list (of queue maps) the user wants to see in the overview dialog. + * Both are preset to 'true' which indicates that all queues are shown. */ global boolean queue_filter_show_local = true; global boolean queue_filter_show_remote = true; @@ -1754,12 +1781,12 @@ // This is a PPD which was downloaded by the user: string downloaded = "\\[downloaded/"; integer downloaded_weight = 32; - // This is a recommended PPD: - string recommended = "\$recommended\$"; - integer recommended_weight = 16; // This is an original PPD from a manufacturer: string manufacturerPPD = "\\[manufacturer-PPDs/"; - integer manufacturerPPD_weight = 8; + integer manufacturerPPD_weight = 16; + // This is a recommended PPD: + string recommended = "\$recommended\$"; + integer recommended_weight = 8; // This is a PPD from the HPLIP project (HP Linux Imaging and Printing): string hplip = "/hplip/"; integer hplip_weight = 4; @@ -2249,47 +2276,6 @@ return true; } -/** - * Get all printer settings from the first parameter - * (For use by autoinstallation.) - * @param settings The YCP structure to be imported. - * @return boolean True on success - */ -global boolean Import (map settings) { - Printerlib::WriteClientSettings(settings["cups_remote_server"]:$[]); - Printerlib::WriteCupsSettings(settings["server_settings"]:$[]); - return true; -} - -/** - * Dump the printer settings to a single map - * (For use by autoinstallation.) - * @return map Dumped settings (later acceptable by Import ()) - */ -global map Export () { - Printerlib::DetermineClientOnly(); - AutodetectQueues(); - list <map> p_queues = filter(map queue, queues, { return (queue["config"]:""=="local"); }); - map exp = $[ -// "queues" : p_queues, -// "filters" : Printerlib::ExportFilters( p_queues ), - "server_settings" : (map)SCR::Read(.cups.server), - "cups_remote_server" : (map)SCR::Read(.cups.client) - ]; -//y2internal("export %1", exp); - return exp; -} - -/** - * Return packages needed to be installed and removed during - * Autoinstallation to insure module has all needed software - * installed. - * @return map with 2 lists. - */ -global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; -} - /* EOF */ } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/Printerlib.ycp new/yast2-printer-2.19.6/src/Printerlib.ycp --- old/yast2-printer-2.19.5/src/Printerlib.ycp 2009-11-12 12:39:35.000000000 +0100 +++ new/yast2-printer-2.19.6/src/Printerlib.ycp 2010-03-18 15:40:13.000000000 +0100 @@ -630,20 +630,5 @@ return false; } -global boolean WriteCupsSettings(map ay){ - string cups_file="/etc/cups/cupsd.conf"; - y2milestone("Create backup of %1 file:%2", cups_file, SCR::Execute(.target.bash, sformat("mv %1 %1.$(date -I)", cups_file))); - SCR::Write(.cups.server, ay); - return true; -} - -global boolean WriteClientSettings(map ay){ - string cups_file="/etc/cups/client.conf"; - y2milestone("Create backup of %1 file:%2", cups_file, SCR::Execute(.target.bash, sformat("mv %1 %1.$(date -I)", cups_file))); - SCR::Write(.cups.client, ay); - return true; -} - - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/dialogs.ycp new/yast2-printer-2.19.6/src/dialogs.ycp --- old/yast2-printer-2.19.5/src/dialogs.ycp 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/src/dialogs.ycp 2010-03-12 17:45:24.000000000 +0100 @@ -141,5 +141,63 @@ return ret; } +map< string, map< string, any > > AutoDialog_widgets_handling = + $[ "OVERVIEW" : + $[ "widget" : `custom, + "custom_widget" : widgetOverview, + "init" : initOverview, + "handle" : handleOverview, + "help" : HELPS["AutoYaSToverview"]:"" + ], + "NETWORKPRINTING" : + $[ "widget" : `custom, + "custom_widget" : widgetNetworkPrinting, + "init" : initNetworkPrinting, + "handle" : handleNetworkPrinting, + "help" : HELPS["printing_via_network_dialog"]:"" + ] + ]; + +map< string, map< string, any > > AutoDialog_tabs_description = + $[ "overview" : + $[ "header" : _("AutoYaST Printer Configurations"), + "tree_item_label" : _("Printer Configurations"), + "caption" : _("AutoYaST Printer Configurations"), + "contents" : `VBox( "OVERVIEW" ), + "widget_names" : ["OVERVIEW"] + ], + "network" : + $[ "header" : _("AutoYaST Print via Network Settings"), + "tree_item_label" : _("Print via Network"), + "caption" : _("AutoYaST Print via Network Settings"), + "contents" : `VBox( "NETWORKPRINTING" ), + "widget_names" : ["NETWORKPRINTING"] + ] + ]; + +symbol runAutoDialog() +{ string caption = _("AutoYaST Settings for Printing with CUPS via Network"); + symbol ret = DialogTree::ShowAndRun + ( $[ "ids_order" : [ "overview", "network" ], + "initial_screen" : "overview", + "screens" : AutoDialog_tabs_description, + "widget_descr" : AutoDialog_widgets_handling, + // All the dialogs in "ids_order" are single (step) configuration dialogs + // and according to the new YaST style guide at + // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // there is no longer a "abort" functionality which exits the whole module. + // Instead this button is now named "Cancel" and its functionality is + // to go back to the Overview dialog (i.e. what the "back" button would do) + // because it reads "Cancel - Closes the window and returns to the overview." + // Therefore the button with the "abort" functionality is not shown at all + // and the button with the "back" functionality is named "Cancel". + "abort_button" : nil, + "back_button" : Label::CancelButton(), + "next_button" : Label::OKButton() + ] + ); + return ret; +} + /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/helps.ycp new/yast2-printer-2.19.6/src/helps.ycp --- old/yast2-printer-2.19.5/src/helps.ycp 2010-02-16 16:14:19.000000000 +0100 +++ new/yast2-printer-2.19.6/src/helps.ycp 2010-03-12 17:45:24.000000000 +0100 @@ -106,6 +106,14 @@ of available remote queues. "), +"AutoYaSToverview" : +// AutoYaST Overview dialog help 1/1: +_(" +<big>AutoYaST Print Queue Overview</big> +AutoYaST supports only settings for printing with CUPS via network. +There is no AutoYaST support to set up local print queues. +"), + "basic_add_dialog" : // BasicAddDialog help 1/5: _(" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/overview.ycp new/yast2-printer-2.19.6/src/overview.ycp --- old/yast2-printer-2.19.5/src/overview.ycp 2010-02-18 13:54:12.000000000 +0100 +++ new/yast2-printer-2.19.6/src/overview.ycp 2010-03-12 17:45:24.000000000 +0100 @@ -222,6 +222,16 @@ } } } + if( Printer::printer_auto_dialogs ) + { // When the Overview dialog is called by AutoYaST + // (by calling in printer_auto.ycp the "Change" function) + // it does not make sense to let the user show local queues: + UI::ChangeWidget( `local_content_checkbox, `Enabled, false ); + // Disable also the [Add] Button. + // It stays disabled as long as the dialog runs because + // it is nowhere again re-enabled below. + UI::ChangeWidget( `add, `Enabled, false ); + } UI::ChangeWidget( `local_content_checkbox, `Value, local_content_selected ); UI::ChangeWidget( `remote_content_checkbox, `Value, remote_content_selected ); UI::ChangeWidget( `overview_table, `Items, @@ -477,7 +487,10 @@ // Body of a Popup::AnyMessage when no queue was selected from the list: _("Select an entry.") ); - return nil; + // When testpage printing failed there might be whatever reason + // so that a refresh of the overview content is needed to be on the safe side. + // Re-run the OverviewDialog (with re-created queue status) via the sequencer: + return `refresh; } if( "yes" == Printer::queues[selected_queue_index,"rejecting"]:"no" ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when the queue rejects print jobs: @@ -485,7 +498,10 @@ // Body of a Popup::AnyMessage when the queue rejects print jobs: _("The testpage cannot be printed because print jobs are rejected.") ); - return nil; + // When testpage printing failed there might be whatever reason + // so that a refresh of the overview content is needed to be on the safe side. + // Re-run the OverviewDialog (with re-created queue status) via the sequencer: + return `refresh; } if( "yes" == Printer::queues[selected_queue_index,"disabled"]:"no" ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when printing is disabled for the queue: @@ -493,7 +509,10 @@ // Body of a Popup::AnyMessage when printing is disabled for the queue: _("The testpage cannot be printed because printout is disabled.") ); - return nil; + // When testpage printing failed there might be whatever reason + // so that a refresh of the overview content is needed to be on the safe side. + // Re-run the OverviewDialog (with re-created queue status) via the sequencer: + return `refresh; } if( "local" == Printer::queues[selected_queue_index,"config"]:"remote" ) { // When it is a local queue, remember it as the currently selected queue @@ -586,7 +605,6 @@ ), Printerlib::result["stderr"]:"" ); - // When submitting the testpage to the queue failed (also for non-local queues) // there might be whatever reason (e.g. a remote queue might have been deleted in the meantime) // so that a refresh of the overview content is needed to be on the safe side. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/printer.desktop new/yast2-printer-2.19.6/src/printer.desktop --- old/yast2-printer-2.19.5/src/printer.desktop 2010-01-15 15:11:49.000000000 +0100 +++ new/yast2-printer-2.19.6/src/printer.desktop 2010-03-18 16:09:00.000000000 +0100 @@ -6,16 +6,17 @@ X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 -X-SuSE-YaST-Call=printer +X-SuSE-YaST-Call=printer X-SuSE-YaST-Group=Hardware X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true -X-SuSE-YaST-AutoInst=all X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInst=all X-SuSE-YaST-AutoInstResource=printer X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=printer.rnc Icon=yast-printer Exec=xdg-su -c "/sbin/yast2 printer" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/printer.rnc new/yast2-printer-2.19.6/src/printer.rnc --- old/yast2-printer-2.19.5/src/printer.rnc 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/src/printer.rnc 2010-03-18 16:09:00.000000000 +0100 @@ -2,117 +2,12 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -# -# redone. I used "Anything*" because for me it looks like a generic parser -# with unpredictable keys - ug(a)suse.de -# printer = element printer { - element cups_remote_server { text }? & - element server_settings { - Anything* + element client_conf_content { + element file_contents { text }? + }? & + element cupsd_conf_content { + element file_contents { text }? }? } - -# removed (read above) -# -#printer = -# element printer { -# (text -# | printer_default -# | printcap -# | cups_installation -# | server_hostname -# | spooler)* -# } - - -# -# old stuff -# -config = element config { text } -printer_default = element default { text } -create_remote_queue = - element create_remote_queue { BOOLEAN } -accepting = - element accepting { BOOLEAN } -cups-state = element cups-state { text } -# <!ELEMENT default (#PCDATA)> - -# <!ELEMENT device (#PCDATA)>: redefined -device_ieee = element device_ieee { text } -ff = - element ff { BOOLEAN } -info = element info { text } -job-sheets = element job-sheets { text } -lprng-state = element lprng-state { text } -name = element name { text } -ownppd = element ownppd { text } -printcap = - element printcap { - LIST, - printcap_entry* - } -y2_printcap_entry = - accepting - | allowusers - | bannerend - | bannerstart - | denyusers - | ff - | info - | location - | manufacturer - | model - | name - | nick - | printcap_entry_options - | ppd_options - | raw - | printcap_entry_state - | uri -location = element location { text } -bannerstart = element bannerstart { text } -bannerend = element bannerend { text } -manufacturer = element manufacturer { text } -model = element model { text } -nick = element nick { text } -printcap_entry_state = element state { text } -printcap_entry_options = element options { text } -ppd_options = - element ppd_options { - LIST, - ppd_option* - } -ppd_option = element ppd_option { ppd_option_key, ppd_option_val } -ppd_option_key = element key { text } -ppd_option_val = element value { text } -denyusers = - element denyusers { - LIST, - denyuser* - } -denyuser = element denyuser { text } -allowusers = - element allowusers { - LIST, - allowuser* - } -allowuser = element allowuser { text } -printcap_entry = element printcap_entry { y2_printcap_entry* } -printers = - element printers { - LIST, - printer+ - } -cups_installation = - element cups_installation { SYMBOL } -raw = - element raw { - attribute config:type { text }, - text - } -type = element type { text } -spooler = element spooler { text } -server_hostname = element server_hostname { text } -uri = element uri { text } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/printer.ycp new/yast2-printer-2.19.6/src/printer.ycp --- old/yast2-printer-2.19.5/src/printer.ycp 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/src/printer.ycp 2010-03-12 17:45:24.000000000 +0100 @@ -79,7 +79,7 @@ /* main ui function */ any ret = nil; -if(propose) ret = PrinterAutoSequence(); +if(propose) ret = PrinterProposalSequence(); else ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/printer_auto.ycp new/yast2-printer-2.19.6/src/printer_auto.ycp --- old/yast2-printer-2.19.5/src/printer_auto.ycp 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/src/printer_auto.ycp 2010-03-18 15:40:13.000000000 +0100 @@ -22,7 +22,8 @@ * File: clients/printer_auto.ycp * Package: Configuration of printer * Summary: Client for autoinstallation - * Authors: Johannes Meixner <jsmeix(a)suse.de> + * Authors: Michal Zugec <mzugec(a)suse.cz> + * Johannes Meixner <jsmeix(a)suse.de> * * $Id: printer_auto.ycp 27914 2006-02-13 14:32:08Z locilka $ * @@ -32,6 +33,21 @@ */ /** + * It is perfectly correct and sufficient that the + * AutoYaST printer profile contains only the content + * of /etc/cups/client.conf and /etc/cups/cupsd.conf + * because: + * The current AutoYaST printer documentation + * in Suse/Novell Bugzilla attachment #269970 in + * https://bugzilla.novell.com/show_bug.cgi?id=464364#c22 + * describes why there cannot be support for + * local print queues for USB printers + * which is a reason that there is only support + * for printing with CUPS via network, + * and + * https://bugzilla.novell.com/show_bug.cgi?id=464364#c25 + * describes that AutoYaST support regarding whether or not + * the cupsd should run belongs to the runlevel module. * @param function to execute * @param map/list of printer settings * @return map edited settings, Summary or boolean on success depending on called function @@ -47,6 +63,8 @@ y2milestone("Printer auto started"); import "Printer"; +import "Printerlib"; +import "Progress"; include "printer/wizards.ycp"; any ret = nil; @@ -59,52 +77,201 @@ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) param = (map) WFM::Args(1); } -y2debug("func=%1", func); -y2debug("param=%1", param); +y2milestone("Printer auto func='%1'", func); +y2milestone("Printer auto param='%1'", param); -/* Create a summary*/ -if(func == "Summary") { - ret = Printer::QueueItems( true, true )[0]:[]; -} -/* Reset configuration */ -else if (func == "Reset") { - Printer::Import($[]); - ret = $[]; -} -// TODO: use global value to set Printer::dirty -else if (func == "GetModified") { - ret = true; - } -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - ret = PrinterAutoSequence(); -} -/* Import configuration */ -else if (func == "Import") { - ret = Printer::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = Printer::Export(); -} -/* Return needed packages */ -else if (func == "Packages") { - ret = Printer::AutoPackages(); -} -/* Read current state */ -else if (func == "Read") { - import "Progress"; - boolean progress_orig = Progress::set (false); - ret = Printer::Read(); - Progress::set (progress_orig); -} -/* Write givven settings */ -else if (func == "Write") { - import "Progress"; - boolean progress_orig = Progress::set (false); - Printer::write_only = true; - ret = Printer::Write(); - Progress::set (progress_orig); +string ReadFileContent( string file_name ) +{ if( -1 == SCR::Read( .target.size, file_name ) ) + { // No user information popup because this would block autoinstallation. + // It is no error when /etc/cups/cupsd.conf or /etc/cups/client.conf + // cannot be read when those files just do not exist because + // it is perfectly o.k. to have a system without the package "cups" + // (e.g. a client-only setup without the "cups" RPM which provides /etc/cups/cupsd.conf) + // or even without a /etc/cups/client.conf file which is provided by the cups-libs RPM + // (e.g. a CUPS default setup where CUPS browsing is used and /etc/cups/client.conf was deleted) + y2milestone( "Warning: Cannot read %1 (file may not exist).", file_name ); + Printer::printer_auto_summary = Printer::printer_auto_summary + + "" + + sformat( // Warning message in the AutoYaST printer client + // which is added to its "Summary" text for AutoYaST + // where %1 is replaced by the file name which cannot be read. + _("Warning: Cannot read %1 (file may not exist)."), + file_name + ) + + ""; + return ""; + } + string content = (string)SCR::Read( .target.string, file_name ); + if( "" == filterchars( content, Printer::alnum_chars ) ) + { // No user information popup because this would block autoinstallation. + // It is an error when /etc/cups/cupsd.conf or /etc/cups/client.conf exist + // but are effectively empty because this indicates a broken CUPS config. + y2milestone( "Error: Failed to read %1 (possibly empty file).", file_name ); + Printer::printer_auto_summary = Printer::printer_auto_summary + + "" + + sformat( // Error message in the AutoYaST printer client + // which is added to its "Summary" text for AutoYaST + // where %1 is replaced by the file name which cannot be read. + _("Error: Failed to read %1 (possibly empty file)."), + file_name + ) + + ""; + return ""; + } + return content; +} + +/* Create a summary string */ +if (func == "Summary") +{ ret = Printer::printer_auto_summary; +} +/* + * Reset the AutoYaST related printer settings to system defaults + * which means /etc/cups/cupsd.conf is overwritten by /etc/cups/cupsd.conf.default + * (/etc/cups/cupsd.conf.default is provided by our cups RPM for such cases) + * and all entries in /etc/cups/client.conf are commented out. + * Then read the content form those system config files + * (exactly the same way as it is done in the Export function) + * and store it in the Printer::autoyast_printer_settings map + * (exactly the same is done in the Import function) + * so that a subsequent call of the Export function by AutoYaST + * would export the system default values to AutoYaST + * and a subsequent call of the Write function by AutoYaST would + * write the same system default values again to /etc/cups/client.conf + * and to /etc/cups/cupsd.conf (regardless that their content + * is already reset to system defaults). + * Accordingly return the Printer::autoyast_printer_settings map + * to AutoYaST so that also the printer related settings inside AutoYaST + * are reset to system defaults so that a subsequent call of the Import + * function by AutoYaST would provide the correct system default values. + */ +else if (func == "Reset") +{ // It is o.k. to ignore when the next two commands fail + // because then /etc/cups/cupsd.conf and/or /etc/cups/client.conf + // were (hopefully) not changed at all which is the right fallback + // so that there is no change of system config files in case of errors. + Printerlib::ExecuteBashCommand( "cp /etc/cups/cupsd.conf.default /etc/cups/cupsd.conf" ); + Printerlib::ExecuteBashCommand( "sed -i -e '/^[^#]/s/^/#/' /etc/cups/client.conf" ); + // Ignore read failures and reset to even empty content because to what else could it be reset instead: + Printer::autoyast_printer_settings = $[ "cupsd_conf_content" : + $[ "file_contents" : ReadFileContent( "/etc/cups/cupsd.conf" ) ], + "client_conf_content" : + $[ "file_contents" : ReadFileContent( "/etc/cups/client.conf" ) ] + ]; + ret = Printer::autoyast_printer_settings; +} +/* Called appropriately by the AutoYaST framework */ +else if (func == "SetModified") +{ Printer::printer_auto_modified = true; + ret = true; +} +/* Provide to AutoYaST what it did set before (or the default "false") */ +else if (func == "GetModified") +{ ret = Printer::printer_auto_modified; +} +/* Change configuration (run the wizards AutoSequence dialogs) */ +else if (func == "Change") +{ // Call Printer::Read() here (compare the 'func == "Read"' case below) + // to make sure that when the full printer module dialogs are launched + // it asks the user to install the packages cups-client and cups: + boolean progress_orig = Progress::set( false ); + Printer::Read(); + Progress::set( progress_orig ); + // Let the Overview dialog disable the checkbox to show local queues + // which disables as a consequence in particular the [Delete] button. + // Lets the Printing via Network dialog disable the button to + // run the Connection Wizard (to set up a local queue for a network printer). + Printer::printer_auto_dialogs = true; + // Let the Overview dialog only show remote queues: + Printer::queue_filter_show_remote = true; + Printer::queue_filter_show_local = false; + // PrinterAutoSequence in wizards.ycp runs only the AutoSequence + // which is only the "Printing via Network" and the "Overview" dialog + // (starting with the "Printing via Network" dialog) + // but without running before ReadDialog (which calls only Printer::Read) + // and running afterwards WriteDialog (which calls only Printer::Write) + // which is the reason that Printer::Read is called explicitely above. + ret = PrinterAutoSequence(); +} +/* + * Import the AutoYaST related printer settings map from AutoYaST + * and store it to be used later when the Write function is called. + */ +else if (func == "Import") +{ Printer::autoyast_printer_settings = param; + ret = true; +} +/* + * Read AutoYaST related printer configuration from this system's config files + * and export them to AutoYaST as a single map so that it can be imported later + * on another system from AutoYaST when AutoYaST on the other system + * calls the above Import function. + */ +else if (func == "Export") +{ // Ignore read failures and export even empty content because what else could be exported instead: + ret = $[ "cupsd_conf_content" : $[ "file_contents" : ReadFileContent( "/etc/cups/cupsd.conf" ) ], + "client_conf_content" : $[ "file_contents" : ReadFileContent( "/etc/cups/client.conf" ) ] + ]; +} +/* + * Return packages needed to be installed and removed during + * Autoinstallation to insure it has all needed software installed. + * @return map with 2 lists of strings $["install":[],"remove":[]] + */ +else if (func == "Packages") +{ list< string > to_be_installed_packages = []; + if( Printerlib::TestAndInstallPackage( "cups-client", "installed" ) ) + { to_be_installed_packages = add( to_be_installed_packages, "cups-client" ); + } + if( Printerlib::TestAndInstallPackage( "cups", "installed" ) ) + { to_be_installed_packages = add( to_be_installed_packages, "cups" ); + } + ret = $[ "install":to_be_installed_packages, + "remove":[] + ]; +} +/* Dummy to provide a Read function for the AutoYaST framework */ +else if (func == "Read") +{ // Do not call Printer::Read() here to + // avoid that the AutoYaST printer client asks the user + // to install the packages cups-client and cups, see + // https://bugzilla.novell.com/show_bug.cgi?id=445719#c13 + y2milestone("Not calling Printer::Read() to avoid that printer_auto asks to install cups-client and cups."); + ret = true; +} +/* + * Write the AutoYaST related printer settings to the system + * according to the Printer::autoyast_printer_settings_import map + * which was stored by a previous call of the Import function by AutoYaST + * or reset to an empty map by a previous call of the Reset function. + */ +else if (func == "Write") +{ y2milestone("Writing to system '%1'", Printer::autoyast_printer_settings); + if( ! SCR::Write( .target.string, + "/etc/cups/cupsd.conf", + Printer::autoyast_printer_settings["cupsd_conf_content","file_contents"]:"" + ) + ) + { // No user information popup because this would block autoinstallation: + y2milestone( "Error: Failed to write /etc/cups/cupsd.conf" ); + Printer::printer_auto_summary = Printer::printer_auto_summary + + "" + + _("Error: Failed to write /etc/cups/cupsd.conf") + + ""; + } + if( ! SCR::Write( .target.string, + "/etc/cups/client.conf", + Printer::autoyast_printer_settings["client_conf_content","file_contents"]:"" + ) + ) + { // No user information popup because this would block autoinstallation: + y2milestone( "Error: Failed to write /etc/cups/client.conf" ); + Printer::printer_auto_summary = Printer::printer_auto_summary + + "" + + _("Error: Failed to write /etc/cups/client.conf") + + ""; + } + return true; } /* Unknown function */ else { @@ -112,7 +279,7 @@ ret = false; } -y2debug("ret=%1", ret); +y2milestone("Printer auto ret='%1'", ret); y2milestone("Printer auto finished"); y2milestone("----------------------------------------"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/printer_proposal.ycp new/yast2-printer-2.19.6/src/printer_proposal.ycp --- old/yast2-printer-2.19.5/src/printer_proposal.ycp 2009-10-29 12:29:33.000000000 +0100 +++ new/yast2-printer-2.19.6/src/printer_proposal.ycp 2010-03-18 15:40:13.000000000 +0100 @@ -51,25 +51,20 @@ map param = (map) WFM::Args(1); map ret = $[]; -/* create a textual proposal */ +/* create a textual proposal and write it instantly to the system */ if( func == "MakeProposal" ) { list<string> proposal = []; string warning = nil; symbol warning_level = nil; boolean force_reset = param["force_reset"]:false; - if( force_reset || ! Printer::proposal_valid ) - { Printer::proposal_valid = true; - // Do not call Printer::Read() here to + if( force_reset ) + { // Do not call Printer::Read() here to // avoid that the hardware proposal asks the user // to install the packages cups-client and cups, see // https://bugzilla.novell.com/show_bug.cgi?id=445719#c13 - //boolean progress_orig = Progress::set( false ); - //Printer::Read(); - //Progress::set( progress_orig ); y2milestone("Not calling Printer::Read() to avoid that the proposal asks to install cups-client and cups."); } // Propose configuration for each local printer: - // TODO: replace by cups-autoconfig // Check if the packages cups-client and cups are installed // and skip the automated queue setup if one of them is missing, see // https://bugzilla.novell.com/show_bug.cgi?id=445719#c13 @@ -205,14 +200,19 @@ { string uri = String::CutBlanks(printer[2]:""); if( "" != uri ) { y2internal("Setting up a queue for URI '%1'", uri); + // See basicadd.ycp how a queue_name_proposal is set there: string queue_name = Printer::NewQueueName( tolower( model ) ); if( contains( already_set_up_uris, uri ) ) { y2internal("Skipping printer '%1' because a queue with the same URI already exists.", printer); continue; } y2milestone("Proposed queue name: %1", queue_name); - string driver_filter_string = "^" + filterchars( tolower( model ), Printer::lower_alnum_chars ); - if( "^" != driver_filter_string ) + // See basicadd.ycp how driver_filter_input_text and driver_filter_string are set there. + // The same is done here so that the proposal results the same as if the user + // would have blindly clicked [OK] in the BasicAddDialog: + string driver_filter_input_text = Printer::DeriveModelName( model, 0 ); + string driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); + if( "" != driver_filter_string ) { list drivers = Printer::DriverItems( driver_filter_string, true ); // Printer::DriverItems may result a drivers list with one single element // [ `item( `id( -1 ), _("No matching driver found.") ) ] @@ -232,7 +232,11 @@ && Printer::selected_connections_index >= 0 ) { y2internal("Selected driver: %1", drivers[0]:nil); - if( Printer::AddQueue( queue_name, "" ) ) + // An empty default_paper_size results CUPS's default paper size + // (see the Printer::AddQueue function) so that the proposal results the same + // as if the user would have blindly clicked [OK] in the BasicAddDialog: + string default_paper_size = ""; + if( Printer::AddQueue( queue_name, default_paper_size ) ) { already_set_up_uris = add( already_set_up_uris, uri ); // Autodetect queues again so that Printer::NewQueueName // can compare with existing queue names but ignore whatever failures @@ -271,20 +275,21 @@ "warning" : warning, ]; } -/* run the module */ +/* run the full printer module dialogs */ else if(func == "AskUser") { // Call Printer::Read() here (compare "MakeProposal" above) - // to make sure that when the full printer module is launched + // to make sure that when the full printer module dialogs are launched // it asks the user to install the packages cups-client and cups: boolean progress_orig = Progress::set( false ); Printer::Read(); Progress::set( progress_orig ); - // TODO FIXME: Printer::Export exists but there is nothing implemented - map stored = Printer::Export(); + // In printer.ycp the .propose argument calls PrinterAutoSequence and + // PrinterAutoSequence in wizards.ycp runs only the MainSequence + // which are all the usual dialogs (starting with the "Overview") + // but without running before ReadDialog (which calls only Printer::Read) + // and running afterwards WriteDialog (which calls only Printer::Write) + // which is the reason that Printer::Read is called explicitely above. symbol seq = (symbol) WFM::CallFunction("printer", [.propose]); - // TODO FIXME: Printer::Import exists but there is nothing implemented - if(seq != `next) Printer::Import(stored); - y2debug("stored=%1",stored); y2debug("seq=%1",seq); ret = $[ "workflow_sequence" : seq ]; } @@ -303,7 +308,6 @@ // it does actually nothing except to exit verbosely, see // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implement…: // for background information. - //Printer::Write(); y2milestone("No need to call Printer::Write() because it does nothing."); } /* unknown function */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/printingvianetwork.ycp new/yast2-printer-2.19.6/src/printingvianetwork.ycp --- old/yast2-printer-2.19.5/src/printingvianetwork.ycp 2009-12-11 17:49:15.000000000 +0100 +++ new/yast2-printer-2.19.6/src/printingvianetwork.ycp 2010-03-12 17:45:24.000000000 +0100 @@ -802,7 +802,8 @@ initial_client_conf_input_value = ""; UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); // Only the "Connection Wizard" button is enabled by default - // and disabled in case of "client_only", see "Client only settings" below: + // and disabled in case of "client_only" (see "Client only settings" below) + // and also disabled in case of Printer::printer_auto_dialogs. UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); // Make the actual Browsing settings: // If "none" is present as a BrowseAllow value it is actually no Browsing config. @@ -937,6 +938,13 @@ // Fill in the client-only values of the current settings in the system // regardless if it is actually a client-only config or not (see above): UI::ChangeWidget( `id(`client_conf_input), `Value, Printerlib::client_conf_server_name ); + if( Printer::printer_auto_dialogs ) + { // When the Overview dialog is called by AutoYaST + // (by calling in printer_auto.ycp the "Change" function) + // it does not make sense to let the user set up a local queue + // for a network printer via the "Connection Wizard": + UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); + } initial_client_conf_input_value = Printerlib::client_conf_server_name; y2milestone( "leaving initNetworkPrinting with\ninitial_browsing = '%1'\ninitial_browse_allow = '%2'\ninitial_browse_allow_input_value = '%3'\ninitial_browse_poll = '%4'\ninitial_browse_poll_input_value = '%5'\ninitial_client_only = '%6'\ninitial_client_conf_input_value = '%7'", initial_browsing, initial_browse_allow, initial_browse_allow_input_value, initial_browse_poll, initial_browse_poll_input_value, initial_client_only, initial_client_conf_input_value ); } @@ -1000,10 +1008,12 @@ } UI::ChangeWidget( `id(`client_conf_input), `Enabled, false ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); - if( ! Printerlib::client_only ) + if( ! Printerlib::client_only && ! Printer::printer_auto_dialogs ) { // The "Connection Wizard" button is enabled by default // and disabled if currently a "client_only" config is active. - // In this case it is never again enabled as long as the dialog runs, see above: + // In this case it is never again enabled as long as the dialog runs, see above. + // It is also disabled in case of Printer::printer_auto_dialogs + // and then it must stay disabled as long as the dialog runs. UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.19.5/src/wizards.ycp new/yast2-printer-2.19.6/src/wizards.ycp --- old/yast2-printer-2.19.5/src/wizards.ycp 2010-02-17 15:32:36.000000000 +0100 +++ new/yast2-printer-2.19.6/src/wizards.ycp 2010-03-12 17:45:24.000000000 +0100 @@ -113,7 +113,7 @@ "printing_via_network_connection_wizard" : $[ `abort : `abort, `back : "overview", `next : "add" - ], + ] ]; return Sequencer::Run( aliases, sequence ); } @@ -146,7 +146,36 @@ } /** - * Whole configuration of printer but without reading and writing. + * Workflow of the printer configuration for AutoYaST + * @return sequence result + */ +any AutoSequence() +{ map aliases = $[ "overview" : ``( runAutoDialog() ) + ]; + map sequence = $[ "ws_start" : "overview", + "overview": $[ `abort : `abort, + `back : "overview", + `next : `next, + `add : "overview", + `modify : "overview", + `delete : "overview", + `refresh : "overview", + `printing_via_network_back : "overview", + `printing_via_network_next : "overview", + `printing_via_network_connection_wizard : "overview", + `sharing_back : "overview", + `sharing_next : "overview", + `policies_back : "overview", + `policies_next : "overview", + `autoconfig_back : "overview", + `autoconfig_next : "overview" + ] + ]; + return Sequencer::Run( aliases, sequence ); +} + +/** + * Only "Printing via Network" configuration of printer. * For use with autoinstallation. * @return sequence result */ @@ -154,6 +183,28 @@ { /* Initialization dialog caption */ string caption = _("Printer Configuration"); /* Initialization dialog contents */ + term contents = `Label( _("Initializing...") ); + Wizard::CreateDialog(); + Wizard::SetContentsButtons( caption, + contents, + "", + Label::BackButton(), + Label::NextButton() + ); + any ret = AutoSequence(); + UI::CloseDialog(); + return ret; +} + +/** + * Whole configuration of printer but without reading and writing. + * For use with proposal at the end of the system installation. + * @return sequence result + */ +any PrinterProposalSequence() +{ /* Initialization dialog caption */ + string caption = _("Printer Configuration"); + /* Initialization dialog contents */ term contents = `Label( _("Initializing...") ); Wizard::CreateDialog(); Wizard::SetContentsButtons( caption, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-iscsi-client for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at Tue Mar 23 22:35:37 CET 2010. -------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2010-03-11 13:00:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-iscsi-client/yast2-iscsi-client.changes 2010-03-23 09:58:40.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 23 09:57:19 CET 2010 - mzugec(a)suse.cz + +- read iBFT before start daemon (bnc#573864) +- 2.19.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-iscsi-client-2.19.2.tar.bz2 New: ---- yast2-iscsi-client-2.19.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.BTk57q/_old 2010-03-23 22:35:21.000000000 +0100 +++ /var/tmp/diff_new_pack.BTk57q/_new 2010-03-23 22:35:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.19.2) +# spec file for package yast2-iscsi-client (Version 2.19.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-iscsi-client -Version: 2.19.2 +Version: 2.19.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.19.2.tar.bz2 +Source0: yast2-iscsi-client-2.19.3.tar.bz2 Prefix: /usr @@ -46,7 +46,7 @@ client. %prep -%setup -n yast2-iscsi-client-2.19.2 +%setup -n yast2-iscsi-client-2.19.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-iscsi-client-2.19.2.tar.bz2 -> yast2-iscsi-client-2.19.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/VERSION new/yast2-iscsi-client-2.19.3/VERSION --- old/yast2-iscsi-client-2.19.2/VERSION 2010-03-11 12:57:50.000000000 +0100 +++ new/yast2-iscsi-client-2.19.3/VERSION 2010-03-23 09:56:58.000000000 +0100 @@ -1 +1 @@ -2.19.2 +2.19.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/iscsi-client.pot new/yast2-iscsi-client-2.19.3/iscsi-client.pot --- old/yast2-iscsi-client-2.19.2/iscsi-client.pot 2010-02-01 17:21:35.000000000 +0100 +++ new/yast2-iscsi-client-2.19.3/iscsi-client.pot 2010-03-23 09:58:15.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-01 17:21+0100\n" +"POT-Creation-Date: 2010-03-23 09:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -86,7 +86,7 @@ msgid "Configuration summary..." msgstr "" -#: src/IscsiClientLib.ycp:315 +#: src/IscsiClientLib.ycp:333 msgid "" "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ.\n" "The old initiatorname will be replaced by the value of iBFT and create a backup.\n" @@ -330,7 +330,7 @@ #: src/helps.ycp:86 msgid "" -"InitiatorName is value a from <tt>/etc/initiatorname.iscsi</tt>. \n" +"InitiatorName is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.19.3/src/IscsiClientLib.ycp --- old/yast2-iscsi-client-2.19.2/src/IscsiClientLib.ycp 2010-03-03 10:44:49.000000000 +0100 +++ new/yast2-iscsi-client-2.19.3/src/IscsiClientLib.ycp 2010-03-23 09:56:49.000000000 +0100 @@ -414,41 +414,14 @@ return ret; } -/* global boolean autoLogOn(){ y2milestone("begin of autoLogOn function"); - map<string, any> b = getiBFT(); -y2milestone("data read from iBFT card %1", b); - if ( b != $[] ){ - y2milestone("checking size of %1 and %2", b["node.name"]:"", b["node.conn[0].address"]:""); - if (size(b["node.name"]:"")>0 && size(b["node.conn[0].address"]:"")>0){ - list <string> curr_rec = [sformat("%1:%2", b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260"), b["node.name"]:""]; - y2milestone("variable curr_rec %1", curr_rec); - if (connected( curr_rec , false) == false){ - y2milestone("in case not connected do discovery"); - // do discovery - SCR::Execute(.target.bash, sformat("iscsiadm -m discovery -t st -p %1:%2", b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260")); - - // do authentication if needed TODO: use NEW(iscsiadm -m fw) options - if (size(b["iSCSI_TARGET_CHAP_NAME"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD"]:"")>0){ - y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); - setValue(curr_rec, "node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:""); - setValue(curr_rec, "node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); - setValue(curr_rec, "node.session.auth.authmethod", "CHAP"); - } else y2internal("No authentication used for autoLogOn"); - - // log on into target - SCR::Execute(.target.bash, sformat("iscsiadm -m node -T %1 -p %2:%3 --login ", b["node.name"]:"", b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260")); - - // set startup status to onboot - y2milestone("set startup status to onboot"); - setStartupStatus(curr_rec, "onboot"); - } else y2error("Already connected, no autoLogOn needed"); - } else y2error("node.name or node.conn[0].address are not available. Couldn't do autoLogOn"); + if (size(getiBFT())>0){ + y2milestone("Autologin into iBFT : %1", SCR::Execute(.target.bash_output, "iscsiadm -m fw -l")); } return true; } -*/ + global boolean loginIntoTarget(map target){ currentRecord = [target["portal"]:"", target["target"]:""]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/src/inst_iscsi-client.ycp new/yast2-iscsi-client-2.19.3/src/inst_iscsi-client.ycp --- old/yast2-iscsi-client-2.19.2/src/inst_iscsi-client.ycp 2010-02-09 13:20:21.000000000 +0100 +++ new/yast2-iscsi-client-2.19.3/src/inst_iscsi-client.ycp 2010-03-23 09:57:34.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: inst_iscsi-client.ycp 60759 2010-02-09 12:20:20Z mzugec $ + * $Id: inst_iscsi-client.ycp 61441 2010-03-23 08:57:32Z mzugec $ * * Main file for iscsi-client configuration. Uses all other files. */ @@ -40,12 +40,12 @@ IscsiClientLib::checkInitiatorName(); +IscsiClientLib::getiBFT(); ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); -// start daemon before +// start iscsid daemon IscsiClientLib::startIScsid(); -//if (size(IscsiClientLib::getiBFT())>0) IscsiClientLib::autoLogOn(); -IscsiClientLib::getiBFT(); +IscsiClientLib::autoLogOn(); // run dialog ret = MainSequence(); y2debug("MainSequence ret=%1", ret); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-bootloader for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at Tue Mar 23 22:35:02 CET 2010. -------- --- yast2-bootloader/yast2-bootloader.changes 2010-03-09 16:15:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2010-03-23 10:57:45.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 23 11:00:00 CET 2010 - juhliarik(a)suse.cz + +- added fix for checking custom boot partition (bnc#588770) +- 2.19.9 + +------------------------------------------------------------------- +Tue Mar 16 17:35:52 CET 2010 - juhliarik(a)suse.cz + +- added fix for adding XEN section on IA64 (bnc#588609) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.19.8.tar.bz2 New: ---- yast2-bootloader-2.19.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.0mulnT/_old 2010-03-23 22:32:40.000000000 +0100 +++ /var/tmp/diff_new_pack.0mulnT/_new 2010-03-23 22:32:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.19.8) +# spec file for package yast2-bootloader (Version 2.19.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-bootloader -Version: 2.19.8 +Version: 2.19.9 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.19.8.tar.bz2 +Source0: yast2-bootloader-2.19.9.tar.bz2 Prefix: /usr @@ -67,7 +67,7 @@ This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.19.8 +%setup -n yast2-bootloader-2.19.9 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-bootloader-2.19.8.tar.bz2 -> yast2-bootloader-2.19.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.8/VERSION new/yast2-bootloader-2.19.9/VERSION --- old/yast2-bootloader-2.19.8/VERSION 2010-03-09 16:17:38.000000000 +0100 +++ new/yast2-bootloader-2.19.9/VERSION 2010-03-23 11:00:46.000000000 +0100 @@ -1 +1 @@ -2.19.8 +2.19.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.8/src/grub/misc.ycp new/yast2-bootloader-2.19.9/src/grub/misc.ycp --- old/yast2-bootloader-2.19.8/src/grub/misc.ycp 2010-03-09 16:17:56.000000000 +0100 +++ new/yast2-bootloader-2.19.9/src/grub/misc.ycp 2010-03-23 11:01:18.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 61210 2010-03-09 15:14:43Z juhliarik $ + * $Id: misc.ycp 61449 2010-03-23 09:56:57Z juhliarik $ * */ @@ -857,7 +857,7 @@ ]; - if ( BootCommon::globals["boot_custom"]:nil != nil ) { + if ( BootCommon::globals["boot_custom"]:nil != nil && BootCommon::globals["boot_custom"]:nil != "") { list all_boot_partitions = BootStorage::getPartitionList(`boot, "grub"); if ( ! contains(all_boot_partitions, BootCommon::globals["boot_custom"]:nil) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.8/src/modules/BootELILO.ycp new/yast2-bootloader-2.19.9/src/modules/BootELILO.ycp --- old/yast2-bootloader-2.19.8/src/modules/BootELILO.ycp 2009-06-26 11:18:15.000000000 +0200 +++ new/yast2-bootloader-2.19.9/src/modules/BootELILO.ycp 2010-03-16 17:37:25.000000000 +0100 @@ -17,7 +17,7 @@ * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootELILO.ycp 57310 2009-05-25 14:24:53Z jreidinger $ + * $Id: BootELILO.ycp 61352 2010-03-16 16:33:37Z juhliarik $ * */ @@ -160,14 +160,20 @@ global void CreateSections () { map<string,any> linux = CreateLinuxSection ("linux"); map<string,any> failsafe = CreateLinuxSection ("failsafe"); - map<string,any> xen = CreateLinuxSection ("xen"); + + // bnc#588609 - Problems writing elilo + map<string,any> xen = $[]; + if (BootCommon::XenPresent ()) + xen = CreateLinuxSection ("xen"); // append for default section is in global // FIXME do it later // if (haskey (linux, "append")) // linux = remove (linux, "append"); - - BootCommon::sections = [ linux, failsafe, xen ]; + if ((xen != nil) && (size(xen) >0)) + BootCommon::sections = [ linux, failsafe, xen ]; + else + BootCommon::sections = [ linux, failsafe ]; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 usbprog for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package usbprog for openSUSE:Factory checked in at Tue Mar 23 22:32:23 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/usbprog/usbprog.changes 2010-01-06 21:27:58.000000000 +0100 @@ -0,0 +1,189 @@ +------------------------------------------------------------------- +Wed Jan 6 21:27:21 CET 2010 - bernhard(a)bwalle.de + +- Add patch 'usbprog-wxwidgets-2.4.diff' that allows the package + to be built on SLE 10. + +------------------------------------------------------------------- +Tue Jan 5 16:02:37 CET 2010 - bernhard(a)bwalle.de + +- Update to 0.2.0 + o Install PDF documentation and add a new menu entry in "Help" + that opens a PDF viewer and shows that PDF documentation. + o Rename "JP" to "JP4" in the pin information dialog to make it + more clear that the "JP4" jumper is the firmware-specific one. + o MacOS: + - Fix the problem that the menu bar is not displayed on MacOS. + - Build system fixes for MacOS. + o Windows: + - Don't install the filter driver on Win32. This makes USBprog + compatible with Windows Vista and Windows 7. + - Register the uninstaller on Windows in the Control Panel. + - Install the driver files in c:\Program Files\USBprog\driver. + - Ensure that the complete program directory gets uninstalled. + +------------------------------------------------------------------- +Tue Jan 5 15:54:26 CET 2010 - bernhard(a)bwalle.de + +- SUSE only: Change 'uucp' to 'dialout' for openSUSE >= 11.2 since + the serial devices belong to 'dialout' since that release. + +------------------------------------------------------------------- +Sun Jan 3 13:35:41 CET 2010 - bernhard(a)bwalle.de + +- Make spec file more generic (cleanup). +- Fedora/RHEL/CentOS only: Add udev rules file also for that + distribution. Use 'uucp' group on RHEL 5/CentOS 5 and 'dialout' + on recent Fedora versions. See also README.$distribution. + +------------------------------------------------------------------- +Sun Jan 3 11:35:19 CET 2010 - bernhard(a)bwalle.de + +- Don't install the static library. +- SUSE only: Add udev rules file (98-usbprog.rules) to add USBprog + devices to the 'uucp' group. See also README.SUSE. + +------------------------------------------------------------------- +Sat Jan 2 21:12:25 CET 2010 - bernhard(a)bwalle.de + +- Remove workaround (BuildRequires) in spec file for Fedora since + that seems to be fixed in Fedora build targets of the OBS. + +------------------------------------------------------------------- +Sun Nov 29 18:35:21 UTC 2009 - bernhard(a)bwalle.de + +- update to 0.1.10 (no functional changes on Linux) + +------------------------------------------------------------------- +Sun Apr 5 18:52:50 CEST 2009 - bernhard(a)bwalle.de + +- update to 0.1.9 + o Print error when downloading fails with a non 400 status code. + o Fix GUI on MacOS X (contributed by Nabil Sayegh) + +------------------------------------------------------------------- +Tue Jan 27 19:50:28 CET 2009 - bwalle(a)suse.de + +- update to 0.1.8 + o fix tab completion for multiple matches (like 'device' and + 'devices') + o Fix problem with recent wxGtk versions that the whole GUI was + hanging when updating the progress bar. + +------------------------------------------------------------------- +Thu Jul 3 22:40:38 CEST 2008 - bwalle(a)suse.de + +- update to 0.1.7 + o fix problem that firmware with more than 16k can't be flashed +- remove usbprog-fix-nonvoid: merged upstream + +------------------------------------------------------------------- +Mon May 5 15:16:40 CEST 2008 - bwalle(a)suse.de + +- fix usbprog no-return-in-nonvoid-function commands.cc: 987 + +------------------------------------------------------------------- +Wed Mar 26 10:34:04 CET 2008 - bwalle(a)suse.de + +- use %postun -p to avoid extra shell + +------------------------------------------------------------------- +Tue Mar 25 10:29:04 CET 2008 - bwalle(a)suse.de + +- update to 0.1.6 + o CLI: fix mechanism to avoid downloading the index file again + and again if the CLI is invoked repeatedly in small intervals + o remove GPL-incompatible md5_loc.h from source distribution +- remove usbprog-build-fixes: fix for usbprog.desktop upstream + +------------------------------------------------------------------- +Fri Mar 21 00:10:49 CET 2008 - bwalle(a)suse.de + +- don't package INSTALL +- run ldconfig + +------------------------------------------------------------------- +Tue Mar 18 19:32:19 CET 2008 - bwalle(a)suse.de + +- fix build on SUSE Linux 10.0 (RPM parser problem) + +------------------------------------------------------------------- +Tue Mar 18 09:25:49 CET 2008 - bwalle(a)suse.de + +- don't build GUI package on CentOS/RHEL + +------------------------------------------------------------------- +Sun Mar 16 23:21:31 CET 2008 - bwalle(a)suse.de + +- update to 0.1.5 final + o GUI: implemented -h / -v / -D command line options for GUI + o CLI: implement command completion + +------------------------------------------------------------------- +Sun Mar 9 19:04:31 CET 2008 - bwalle(a)suse.de + +- don't build the GUI for CentOS and RHEL due to lacking wxGtk + +------------------------------------------------------------------- +Sun Mar 2 00:21:11 CET 2008 - bwalle(a)suse.de + +- update to 0.1.5 + o install icon and destop file + +------------------------------------------------------------------- +Sat Feb 9 22:52:36 CET 2008 - bwalle(a)suse.de + +- update to 0.1.4 + o Windows: honor IE proxy settings + o CLI: make (Internet) download progress working + o CLI: always re-discover devices with the "devices" command + o CLI: new "start" command to only start the firmware without + uploading anything and added "-nostart" option to "upload" + command + o Unix: build system fixes + +------------------------------------------------------------------- +Sun Jan 13 19:29:42 CET 2008 - bwalle(a)suse.de + +- update to 0.1.3 + o GUI: fix local upload + o GUI: make offline mode working, show only firmwares that are + available offline + +------------------------------------------------------------------- +Sun Jan 6 22:51:34 CET 2008 - bwalle(a)suse.de + +- update to 0.1.2 + o improved error handling + o autoconf fixes (building without GUI is now possible) + o CLI: new string tokenizer to be able to deal with spaces + (use "string with spaces" or string\ with\ spaces like in bash) + o GUI: new firmware and pin information + +------------------------------------------------------------------- +Fri Jan 4 11:20:05 CET 2008 - bwalle(a)suse.de + +- fix build for Fedora 8 + +------------------------------------------------------------------- +Wed Jan 2 00:38:52 CET 2008 - bwalle(a)suse.de + +- update to 0.1.1 + o compilation and build fixes + o CLI: improve debugging messages + o GUI: new "logfile" option for debugging + o Windows: fix problem that download is corrupted + o add support for checksum testing after download to ensure that + the download was correct + +------------------------------------------------------------------- +Thu Dec 27 23:14:54 CET 2007 - bwalle(a)suse.de + +- fix build for gcc 4.3 + +------------------------------------------------------------------- +Thu Dec 27 20:26:17 CET 2007 - bwalle(a)suse.de + +- intial SUSE package + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- README.distribution usbprog-0.2.0.tar.bz2 usbprog-wxwidgets-2.4.diff usbprog.changes usbprog.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbprog.spec ++++++ # # spec file for package usbprog (Version 0.2.0) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # RHEL and CentOS have no wxGTK, so we cannot build the GUI here %if 0%{?rhel_version} || 0%{?centos_version} %define build_gui 0 %define readme_name README.RedHat %define group_name uucp %endif %if 0%{?fedora_version} %define build_gui 1 %define readme_name README.Fedora %define group_name dialout %endif %if 0%{?suse_version} %define build_gui 1 %define readme_name README.SUSE %if %{?suse_version} >= 1120 %define group_name dialout %else %define group_name uucp %endif %endif Name: usbprog Version: 0.2.0 Release: 1 License: GPL Url: http://www.embedded-projects.net/index.php?page_id=165 BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Tools/Other Source0: %{name}-%{version}.tar.bz2 Source1: README.distribution Patch0: usbprog-wxwidgets-2.4.diff Summary: Programmer for the USBprog hardware BuildRequires: gcc-c++ libusb-devel libxml2-devel readline-devel %if %{build_gui} BuildRequires: wxGTK-devel %endif %if 0%{?suse_version} >= 1030 BuildRequires: libcurl-devel %else BuildRequires: curl-devel %endif %if 0%{?suse_version} >= 1010 BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif %description USBprog is a programmer for the USBprog hardware. Author ------ Bernhard Walle <bernhard(a)bwalle.de> %if %{build_gui} %package gui License: GPL Requires: %{name} = %{version} Summary: GUI program of USBprog Group: Development/Tools/Other AutoReqProv: on %description gui A wxGTK version of the USBprog programmer. Author ------ Bernhard Walle <bernhard(a)bwalle.de> %endif %package -n libusbprog0 License: GPL Requires: %{name} = %{version} Summary: USBprog Library Group: Development/Tools/Other AutoReqProv: on %description -n libusbprog0 Library for USBprog. Author ------ Bernhard Walle <bernhard(a)bwalle.de> %package devel License: GPL Requires: %{name} = %{version} Summary: Development files for libusbprog Group: Development/Tools/Other AutoReqProv: on %description devel Header files for libusbprog. Author ------ Bernhard Walle <bernhard(a)bwalle.de> %prep %setup -q %patch0 -p1 %build %configure make %install %makeinstall %if %{build_gui} == 0 rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/usbprog.desktop rm -f $RPM_BUILD_ROOT/%{_datadir}/pixmaps/usbprog_icon.xpm %endif rm -f $RPM_BUILD_ROOT/%{_libdir}/*.*a mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d sed -e 's/@@USBPROG_GROUP@@/'%{group_name}'/g' usbprog.rules.in \ > $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/98-usbprog.rules sed -e 's/@@USBPROG_GROUP@@/'%{group_name}'/g' %{S:1} > %{readme_name} %clean rm -rf "$RPM_BUILD_ROOT" %post -n libusbprog0 -p /sbin/ldconfig %postun -n libusbprog0 -p /sbin/ldconfig %files %defattr(-,root,root) %doc README COPYING ChangeLog NEWS %{readme_name} %doc %{_datadir}/doc/usbprog/USBprog.pdf %dir %{_datadir}/doc/usbprog %{_bindir}/usbprog %{_mandir}/man1/usbprog.1* %config %{_sysconfdir}/udev/rules.d/98-usbprog.rules %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %files -n libusbprog0 %defattr(-,root,root) %{_libdir}/*so.* %if %{build_gui} %files gui %defattr(-,root,root) %{_bindir}/usbprog-gui %{_datadir}/applications/usbprog.desktop %{_datadir}/pixmaps/usbprog_icon.xpm %{_mandir}/man1/usbprog-gui.1* %endif %files devel %defattr(-,root,root) %{_includedir}/usbprog %{_libdir}/*so %changelog ++++++ README.distribution ++++++ Package-specific README for USBprog 2010-01-03 =================================== bernhard(a)bwalle.de (1) Permissions This package contains a udev rules file in /etc/udev/rules.d/ that puts the USB device files below /dev/bus/usb/* that belogs to the hardware listed below in the group '@@USBPROG_GROUP@@'. To enable access for an ordinary user, put that user in the group '@@USBPROG_GROUP@@'. This group has been chosen because of several reasons: • the serial devices (/dev/tty*) are put into that group by the distribution vendor, • users that use microcontrollers usually also use a serial interface for debugging, so the user is already in that group, • in the avrdude package of openSUSE, the parallel port (/dev/parport*) is in the 'uucp' group. If you see any serious security problems in that decision, please report this as bug. But don't come with HAL/PAM etc. solutions that are very distribution-specific and change each year. Does anybody remember the times when SUSE patched their software to use 'resmgr'? __________________________________________________________________________ Vendor ID Device ID Name __________________________________________________________________________ 0x1781 0x0c62 USBprog, in programmable state (or with simpleport firmware) 0x1781 0x0c63 USBprog with OpenOCD firmware 0x1781 0x0c64 USBprog with at89prog or usbprogrs232 firmware 0x03eb 0x2104 USBprog with Atmel AVR ISP mkII firmware __________________________________________________________________________ (2) Bug reports Please report bugs specific to that package in Novell Bugzilla. You can assign it directly to 'bernhard(a)bwalle.de'. You can also use the links in the openSUSE Build Service. Yes, since the packages are built in the OBS, even Fedora bugreports belong there. ++++++ usbprog-wxwidgets-2.4.diff ++++++ --- gui/viewer_posix.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/gui/viewer_posix.cc +++ b/gui/viewer_posix.cc @@ -39,7 +39,7 @@ bool Viewer::openPDF(const wxString &fil } const wxChar *args[] = { - wxString::FromUTF8(VIEWER_COMMAND), + wxT(VIEWER_COMMAND), file, NULL }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qtcurve-kde4 for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at Tue Mar 23 22:29:54 CET 2010. -------- --- KDE/qtcurve-kde4/qtcurve-kde4.changes 2010-01-28 22:14:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2010-03-22 19:12:54.000000000 +0100 @@ -1,0 +2,54 @@ +Mon Mar 22 18:10:12 UTC 2010 - tittiatcoke(a)gmail.com + +- Update to 1.2.0 + 1. Draw etch effect on radios if using a button effect, and not + using button-like check/radios. + 2. If drawing square non-gtk style scrollviews, use a dark/light + borders. + 3. If drawing square scrollviews, set frame width to 1 if using + thin scrollbar groove. + 4. Add options to draw square progress and entry fields when + rounding. + 5. Add option to control whether progressbars have a border on + all sides, or just top/bottom. + 6. Add option to colour default buttons using highlight colour. + 7. Expand selected check/radio colour option so as to be able + to specift colour. + 8. Add circular slider style. + 9. Add glow to mouse over of slider handles (not scrollbars). + 10. Add option to draw stripes on scrollbar sliders. + 11. Add a 'faded' style porgressbar stripe option. + 12. Add option to draw agua shine on custom gradients. + 13. Allow to draw focus highlight for square scrollviews. + 14. Improve appearance of button style check and radio buttons. + 15. Add option to control whether scrollbar groove has a border + or not. + 16. Dont use pixmaps to draw rounded slider, or radio buttons. + 17. Add option to increase size of check/radios - default is now + 15pixels. + 18. Really fix Qt only compile. + 19. Increase default shadow sizes. + 20. If using gtk style combos and bordering menu items, increase + frame width by 1 pixel. + 21. Remove border from preview colour square in KDE colour + selection dialog. + 22. Only offset vertical position of etch text. + 23. OpenOffice.org improvements: + - only draw check of checkboxes in menus + - draw check for radios in menus + - draw frames (general, line edits, scrollviews) + - fix pressed behaviour of toolbar buttons + - fix drawing of full width scrollbar + - reduce padding within frames + - dont etch entries or scrollviews + - fix spin buttons appearing disabled + - only apply menu fix to oo.o menus, not file selector menus + - use square entry fields + 24. Set Qt toolbar font to KDE setting - but not for lineedits + and comboboxes. + 25. Fix text position in non-unified editable combos. + 26. In settings dialog, add the ability to copy gradient settings + to new custom gradient. + 27. In settings dialog, draw borders, etc, around preview. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- QtCurve-KDE4-1.0.1.tar.bz2 New: ---- QtCurve-KDE4-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.QEAhTm/_old 2010-03-23 22:29:30.000000000 +0100 +++ /var/tmp/diff_new_pack.QEAhTm/_new 2010-03-23 22:29:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-kde4 (Version 1.0.1) +# spec file for package qtcurve-kde4 (Version 1.2.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ License: GPLv2+ Group: System/GUI/KDE Summary: QtCurve style for KDE 4 -Version: 1.0.1 +Version: 1.2.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE4-%{version}.tar.bz2 ++++++ QtCurve-KDE4-1.0.1.tar.bz2 -> QtCurve-KDE4-1.2.0.tar.bz2 ++++++ ++++ 20753 lines of diff (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