September 2015 - crux-commits

ports/opt (3.1): cups-filters: apply upstream patch to fix cups-browsed for systems without dbus
by crux＠crux.nu 10 Sep '15

10 Sep '15

commit f4a2c9146fc180a6ca331c257f256a23077dde20 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Sep 10 18:02:19 2015 +0200 cups-filters: apply upstream patch to fix cups-browsed for systems without dbus diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 4b6ebc0..4b07675 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,3 @@ 7540a6989be0042429f41770b1cdf215 cups-browsed +ae85325dea633cc1ae42ea51cda29fad cups-filters-1.0.75-browsed_without_dbus.patch 928b349db6b310fa14a4cabacabbdb55 cups-filters-1.0.75.tar.xz diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 0e5f3e7..b256a4e 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,13 +5,16 @@ name=cups-filters version=1.0.75 -release=1 +release=2 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz - cups-browsed) + cups-browsed + $name-$version-browsed_without_dbus.patch) build () { cd $name-$version + patch -p0 -i $SRC/$name-$version-browsed_without_dbus.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ diff --git a/cups-filters/cups-filters-1.0.75-browsed_without_dbus.patch b/cups-filters/cups-filters-1.0.75-browsed_without_dbus.patch new file mode 100644 index 0000000..3270efb --- /dev/null +++ b/cups-filters/cups-filters-1.0.75-browsed_without_dbus.patch @@ -0,0 +1,222 @@ +# https://bugs.linuxfoundation.org/show_bug.cgi?id=1316#c0 + +=== modified file 'NEWS' +--- NEWS 2015-09-07 23:55:59 +0000 ++++ NEWS 2015-09-10 01:58:49 +0000 +@@ -1,6 +1,18 @@ + NEWS - OpenPrinting CUPS Filters v1.0.75 - 2015-09-07 + ----------------------------------------------------- + ++CHANGES IN V1.0.76 ++ ++ - cups-browsed: Make absence of CUPS notifications via D-Bus ++ non-fatal and fall back to the old behavior of cups-browsed ++ (fail-over instead of load balancing for equally-named ++ remote queues, do not remove generated queue if it is ++ default instead of default printer management). This solves ++ problems of CUPS and/or cups-browsed built without D-Bus ++ support or absence of D-Bus on the system (Bug #1316). ++ - cups-browsed: Do not use g_warning() function, sneaked in by ++ copy and paste of CUPS subscription functions. ++ + CHANGES IN V1.0.75 + + - texttopdf: Really support BoldItalic (original texttops just maps + +=== modified file 'utils/cups-browsed.c' +--- utils/cups-browsed.c 2015-08-25 16:23:45 +0000 ++++ utils/cups-browsed.c 2015-09-10 01:58:49 +0000 +@@ -245,6 +245,8 @@ + + static GList *browse_data = NULL; + ++static CupsNotifier *cups_notifier = NULL; ++ + static GMainLoop *gmainloop = NULL; + #ifdef HAVE_AVAHI + static AvahiGLibPoll *glib_poll = NULL; +@@ -1569,8 +1571,8 @@ + + resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/"); + if (!resp || cupsLastError() != IPP_OK) { +- g_warning ("Error subscribing to CUPS notifications: %s\n", +- cupsLastErrorString ()); ++ debug_printf ("cups-browsed: Error subscribing to CUPS notifications: %s\n", ++ cupsLastErrorString ()); + return 0; + } + +@@ -1578,8 +1580,9 @@ + if (attr) + id = ippGetInteger (attr, 0); + else +- g_warning ("ipp-create-printer-subscription response doesn't contain " +- "subscription id.\n"); ++ debug_printf ("cups-browsed: " ++ "ipp-create-printer-subscription response doesn't contain " ++ "subscription id.\n"); + + ippDelete (resp); + return id; +@@ -1604,8 +1607,8 @@ + + resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/"); + if (!resp || cupsLastError() != IPP_OK) { +- g_warning ("Error renewing CUPS subscription %d: %s\n", +- id, cupsLastErrorString ()); ++ debug_printf ("cups-browsed: Error renewing CUPS subscription %d: %s\n", ++ id, cupsLastErrorString ()); + return FALSE; + } + +@@ -1643,8 +1646,8 @@ + + resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/"); + if (!resp || cupsLastError() != IPP_OK) { +- g_warning ("Error subscribing to CUPS notifications: %s\n", +- cupsLastErrorString ()); ++ debug_printf ("cups-browsed: Error subscribing to CUPS notifications: %s\n", ++ cupsLastErrorString ()); + return; + } + +@@ -1929,6 +1932,10 @@ + + int + queue_creation_handle_default(const char *printer) { ++ /* No default printer management if we cannot get D-Bus notifications ++ from CUPS */ ++ if (cups_notifier == NULL) ++ return 0; + /* If this queue is recorded as the former default queue (and the current + default is local), set it as default (the CUPS notification handler + will record the local default printer then) */ +@@ -1952,6 +1959,10 @@ + + int + queue_removal_handle_default(const char *printer) { ++ /* No default printer management if we cannot get D-Bus notifications ++ from CUPS */ ++ if (cups_notifier == NULL) ++ return 0; + /* If the queue is the default printer, get back + to the recorded local default printer, record this queue for getting the + default set to this queue again if it re-appears. */ +@@ -2737,6 +2748,17 @@ + back to the last local default printer */ + queue_removal_handle_default(p->name); + ++ /* If we do not have a subscription to CUPS' D-Bus notifications and ++ so no default printer management, we simply do not remove this ++ CUPS queue if it is the default printer, to not cause a change ++ of the default printer or the loss of the information that this ++ printer is the default printer. */ ++ if (cups_notifier == NULL && is_cups_default_printer(p->name)) { ++ /* Schedule the removal of the queue for later */ ++ p->timeout = current_time + TIMEOUT_RETRY; ++ break; ++ } ++ + /* No jobs, remove the CUPS queue */ + request = ippNewRequest(CUPS_DELETE_PRINTER); + /* Printer URI: ipp://localhost:631/printers/<queue name> */ +@@ -2821,9 +2843,12 @@ + for load balancing. In this case we will assign an implicitclass:... + device URI, which makes cups-browsed find the best destination for + each job. */ +- if (p->num_duplicates > 0) { ++ if (cups_notifier != NULL && p->num_duplicates > 0) { + /* We have duplicates, so we use the device URI +- implicitclass:<queue name> */ ++ implicitclass:<queue name> ++ We never use the implicitclass backend if we do not have D-Bus ++ notification from CUPS as we cannot assign a destination printer ++ to an incoming job then. */ + snprintf(device_uri, sizeof(device_uri), "implicitclass:%s", + p->name); + debug_printf("cups-browsed: Print queue %s has duplicates, using implicit class device URI %s\n", +@@ -4895,7 +4920,6 @@ + const char *val; + remote_printer_t *p; + GDBusProxy *proxy = NULL; +- CupsNotifier *cups_notifier = NULL; + GError *error = NULL; + int subscription_id = 0; + +@@ -4988,25 +5012,25 @@ + setenv("CUPS_SERVER", "localhost", 1); + + if (BrowseLocalProtocols & BROWSE_DNSSD) { +- fprintf(stderr, "Local support for DNSSD not implemented\n"); ++ fprintf(stderr, "cups-browsed: Local support for DNSSD not implemented\n"); + BrowseLocalProtocols &= ~BROWSE_DNSSD; + } + + if (BrowseLocalProtocols & BROWSE_LDAP) { +- fprintf(stderr, "Local support for LDAP not implemented\n"); ++ fprintf(stderr, "cups-browsed: Local support for LDAP not implemented\n"); + BrowseLocalProtocols &= ~BROWSE_LDAP; + } + + #ifndef HAVE_AVAHI + if (BrowseRemoteProtocols & BROWSE_DNSSD) { +- fprintf(stderr, "Remote support for DNSSD not supported\n"); ++ fprintf(stderr, "cups-browsed: Remote support for DNSSD not supported\n"); + BrowseRemoteProtocols &= ~BROWSE_DNSSD; + } + #endif /* HAVE_AVAHI */ + + #ifndef HAVE_LDAP + if (BrowseRemoteProtocols & BROWSE_LDAP) { +- fprintf(stderr, "Remote support for LDAP not supported\n"); ++ fprintf(stderr, "cups-browsed: Remote support for LDAP not supported\n"); + BrowseRemoteProtocols &= ~BROWSE_LDAP; + } + #endif /* HAVE_LDAP */ +@@ -5188,14 +5212,16 @@ + NULL, + &error); + if (error) { +- g_warning ("Error creating cups notify handler: %s", error->message); ++ fprintf (stderr, "cups-browsed: Error creating cups notify handler: %s", error->message); + g_error_free (error); +- goto fail; +- } +- g_signal_connect (cups_notifier, "printer-state-changed", +- G_CALLBACK (on_printer_state_changed), NULL); +- g_signal_connect (cups_notifier, "printer-deleted", +- G_CALLBACK (on_printer_deleted), NULL); ++ cups_notifier = NULL; ++ } ++ if (cups_notifier != NULL) { ++ g_signal_connect (cups_notifier, "printer-state-changed", ++ G_CALLBACK (on_printer_state_changed), NULL); ++ g_signal_connect (cups_notifier, "printer-deleted", ++ G_CALLBACK (on_printer_deleted), NULL); ++ } + + /* If auto shutdown is active and we do not find any printers initially, + schedule the shutdown in autoshutdown_timeout seconds */ +@@ -5217,10 +5243,6 @@ + + /* Clean up things */ + +- cancel_subscription (subscription_id); +- if (cups_notifier) +- g_object_unref (cups_notifier); +- + if (proxy) + g_object_unref (proxy); + +@@ -5232,6 +5254,10 @@ + } + handle_cups_queues(NULL); + ++ cancel_subscription (subscription_id); ++ if (cups_notifier) ++ g_object_unref (cups_notifier); ++ + if (BrowsePoll) { + size_t index; + for (index = 0; +

1 0

ports/core (3.1): xfsprogs: update to 4.2.0
by crux＠crux.nu 09 Sep '15

09 Sep '15

commit ef17574048af2c352f88b60f22f5ce09160d8180 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Sep 9 16:31:14 2015 +0200 xfsprogs: update to 4.2.0 diff --git a/xfsprogs/.footprint b/xfsprogs/.footprint index 5211e63..ae778d8 100644 --- a/xfsprogs/.footprint +++ b/xfsprogs/.footprint @@ -11,9 +11,12 @@ drwxr-xr-x root/root usr/include/xfs/ -rw-r--r-- root/root usr/include/xfs/handle.h -rw-r--r-- root/root usr/include/xfs/jdm.h -rw-r--r-- root/root usr/include/xfs/linux.h --rw-r--r-- root/root usr/include/xfs/platform_defs.h -rw-r--r-- root/root usr/include/xfs/xfs.h +-rw-r--r-- root/root usr/include/xfs/xfs_arch.h +-rw-r--r-- root/root usr/include/xfs/xfs_da_format.h +-rw-r--r-- root/root usr/include/xfs/xfs_format.h -rw-r--r-- root/root usr/include/xfs/xfs_fs.h +-rw-r--r-- root/root usr/include/xfs/xfs_log_format.h -rw-r--r-- root/root usr/include/xfs/xfs_types.h -rw-r--r-- root/root usr/include/xfs/xqm.h drwxr-xr-x root/root usr/lib/ diff --git a/xfsprogs/.md5sum b/xfsprogs/.md5sum index e1cfdda..f786b15 100644 --- a/xfsprogs/.md5sum +++ b/xfsprogs/.md5sum @@ -1 +1 @@ -c28db88f058ada506fe0ac6a897a1c42 xfsprogs-3.2.4.tar.gz +e1b9438d3e6775b9df52cc9a13e9f9a6 xfsprogs-4.2.0.tar.gz diff --git a/xfsprogs/Pkgfile b/xfsprogs/Pkgfile index 481f1bc..13251d5 100644 --- a/xfsprogs/Pkgfile +++ b/xfsprogs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: util-linux name=xfsprogs -version=3.2.4 +version=4.2.0 release=1 source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$name-$version.tar.gz) @@ -22,7 +22,7 @@ build() { make make -j1 DIST_ROOT=$PKG install install-dev - rm $PKG/lib/libhandle.so + rm $PKG/lib/libhandle.{so,a,la} ln -sf ../../lib/$(readlink $PKG/lib/libhandle.so.1) $PKG/usr/lib/libhandle.so rm -r $PKG/usr/share

1 0

ports/opt (3.2): ncurses-ruby: update for ruby 2.2
by crux＠crux.nu 09 Sep '15

09 Sep '15

commit c4d6b9758e95dfed4d244e1e5a4fa8da1b41bdf4 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Sep 9 14:19:44 2015 +0200 ncurses-ruby: update for ruby 2.2 diff --git a/ncurses-ruby/.footprint b/ncurses-ruby/.footprint index 42b63eb..4417a8a 100644 --- a/ncurses-ruby/.footprint +++ b/ncurses-ruby/.footprint @@ -2,7 +2,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/ruby/ drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/ -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/ --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/ncurses.rb -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/ --rwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/ncurses.so +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.2/ +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.2/ncurses.rb +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.2/x86_64-linux/ +-rwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.2/x86_64-linux/ncurses.so diff --git a/ncurses-ruby/Pkgfile b/ncurses-ruby/Pkgfile index 98e8b00..3f5ec46 100644 --- a/ncurses-ruby/Pkgfile +++ b/ncurses-ruby/Pkgfile @@ -5,7 +5,7 @@ name=ncurses-ruby version=20140731 -release=1 +release=2 source=(http://crux.s3.amazonaws.com/dist/$name-$version.tar.xz) build () {

1 0

ports/opt (3.2): ncurses-ruby: update for ruby 2.2
by crux＠crux.nu 09 Sep '15

09 Sep '15

commit c4d6b9758e95dfed4d244e1e5a4fa8da1b41bdf4 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Sep 9 14:19:44 2015 +0200 ncurses-ruby: update for ruby 2.2 diff --git a/ncurses-ruby/.footprint b/ncurses-ruby/.footprint index 42b63eb..4417a8a 100644 --- a/ncurses-ruby/.footprint +++ b/ncurses-ruby/.footprint @@ -2,7 +2,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/ruby/ drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/ -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/ --rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.1/ncurses.rb -drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/ --rwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.1/x86_64-linux/ncurses.so +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.2/ +-rw-r--r-- root/root usr/lib/ruby/vendor_ruby/2.2/ncurses.rb +drwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.2/x86_64-linux/ +-rwxr-xr-x root/root usr/lib/ruby/vendor_ruby/2.2/x86_64-linux/ncurses.so diff --git a/ncurses-ruby/Pkgfile b/ncurses-ruby/Pkgfile index 98e8b00..3f5ec46 100644 --- a/ncurses-ruby/Pkgfile +++ b/ncurses-ruby/Pkgfile @@ -5,7 +5,7 @@ name=ncurses-ruby version=20140731 -release=1 +release=2 source=(http://crux.s3.amazonaws.com/dist/$name-$version.tar.xz) build () {

1 0

ports/core (3.2): ncurses: to satisfy ldconfig add another temporary sysmlink
by crux＠crux.nu 09 Sep '15

09 Sep '15

commit b35e906252ee4c4191d7e5aff0ed9d655cdccf9a Author: Juergen Daubert <jue(a)jue.li> Date: Wed Sep 9 14:05:19 2015 +0200 ncurses: to satisfy ldconfig add another temporary sysmlink diff --git a/ncurses/.footprint b/ncurses/.footprint index e87627f..d3c4915 100644 --- a/ncurses/.footprint +++ b/ncurses/.footprint @@ -57,6 +57,7 @@ lrwxrwxrwx root/root usr/lib/libncurses.so.5 -> libncursesw.so -rw-r--r-- root/root usr/lib/libncursesw.a lrwxrwxrwx root/root usr/lib/libncursesw.so -> ../../lib/libncursesw.so.6.0 lrwxrwxrwx root/root usr/lib/libncursesw.so.5 -> libncursesw.so +lrwxrwxrwx root/root usr/lib/libncursesw.so.6 -> libncursesw.so -rw-r--r-- root/root usr/lib/libpanel.so -rw-r--r-- root/root usr/lib/libpanelw.a lrwxrwxrwx root/root usr/lib/libpanelw.so -> libpanelw.so.6 diff --git a/ncurses/Pkgfile b/ncurses/Pkgfile index 90f5ad8..33b4a71 100644 --- a/ncurses/Pkgfile +++ b/ncurses/Pkgfile @@ -41,6 +41,7 @@ build() { # symlinks for ncurses 5 (remove them later)) ln -s libncursesw.so $PKG/usr/lib/libncurses.so.5 ln -s libncursesw.so $PKG/usr/lib/libncursesw.so.5 + ln -s libncursesw.so $PKG/usr/lib/libncursesw.so.6 # some progs expect a /usr/include/curses.h ln -s ../curses.h $PKG/usr/include/ncursesw/ncurses.h

1 0

ports/core (3.2): ncurses: build only the wide library and fix library symlinks (FS#1210)
by crux＠crux.nu 09 Sep '15

09 Sep '15

commit ace38a1781a18c42007cb381e81f83446a9ad804 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Sep 9 12:44:42 2015 +0200 ncurses: build only the wide library and fix library symlinks (FS#1210) our old port for ncurses was somewhat broken and ldconfig creates two additional symlinks - /usr/lib/libncurses.so.5 - /usr/lib/libncursesw.so.5 Because of this we have to force-install the new port! diff --git a/ncurses/.footprint b/ncurses/.footprint index 1c4d37b..e87627f 100644 --- a/ncurses/.footprint +++ b/ncurses/.footprint @@ -1,6 +1,5 @@ drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libncurses.so.6 -> libncurses.so.6.0 --rwxr-xr-x root/root lib/libncurses.so.6.0 +lrwxrwxrwx root/root lib/libncurses.so.6 -> libncursesw.so.6.0 lrwxrwxrwx root/root lib/libncursesw.so.6 -> libncursesw.so.6.0 -rwxr-xr-x root/root lib/libncursesw.so.6.0 drwxr-xr-x root/root usr/ @@ -9,7 +8,6 @@ lrwxrwxrwx root/root usr/bin/captoinfo -> tic -rwxr-xr-x root/root usr/bin/clear -rwxr-xr-x root/root usr/bin/infocmp lrwxrwxrwx root/root usr/bin/infotocap -> tic --rwxr-xr-x root/root usr/bin/ncurses6-config -rwxr-xr-x root/root usr/bin/ncursesw6-config lrwxrwxrwx root/root usr/bin/reset -> tset -rwxr-xr-x root/root usr/bin/tabs @@ -41,39 +39,39 @@ lrwxrwxrwx root/root usr/include/ncursesw/ncurses.h -> ../curses.h -rw-r--r-- root/root usr/include/tic.h -rw-r--r-- root/root usr/include/unctrl.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libcurses.a -> libncurses.a lrwxrwxrwx root/root usr/lib/libcurses.so -> libncurses.so -lrwxrwxrwx root/root usr/lib/libcursesw.so -> libncursesw.so --rw-r--r-- root/root usr/lib/libform.a -lrwxrwxrwx root/root usr/lib/libform.so -> libform.so.6 -lrwxrwxrwx root/root usr/lib/libform.so.6 -> libform.so.6.0 --rwxr-xr-x root/root usr/lib/libform.so.6.0 +-rw-r--r-- root/root usr/lib/libcursesw.so +-rw-r--r-- root/root usr/lib/libform.so -rw-r--r-- root/root usr/lib/libformw.a lrwxrwxrwx root/root usr/lib/libformw.so -> libformw.so.6 lrwxrwxrwx root/root usr/lib/libformw.so.6 -> libformw.so.6.0 -rwxr-xr-x root/root usr/lib/libformw.so.6.0 --rw-r--r-- root/root usr/lib/libmenu.a -lrwxrwxrwx root/root usr/lib/libmenu.so -> libmenu.so.6 -lrwxrwxrwx root/root usr/lib/libmenu.so.6 -> libmenu.so.6.0 --rwxr-xr-x root/root usr/lib/libmenu.so.6.0 +-rw-r--r-- root/root usr/lib/libmenu.so -rw-r--r-- root/root usr/lib/libmenuw.a lrwxrwxrwx root/root usr/lib/libmenuw.so -> libmenuw.so.6 lrwxrwxrwx root/root usr/lib/libmenuw.so.6 -> libmenuw.so.6.0 -rwxr-xr-x root/root usr/lib/libmenuw.so.6.0 --rw-r--r-- root/root usr/lib/libncurses++.a -rw-r--r-- root/root usr/lib/libncurses++w.a --rw-r--r-- root/root usr/lib/libncurses.a -lrwxrwxrwx root/root usr/lib/libncurses.so -> ../../lib/libncurses.so.6.0 +-rw-r--r-- root/root usr/lib/libncurses.so +lrwxrwxrwx root/root usr/lib/libncurses.so.5 -> libncursesw.so -rw-r--r-- root/root usr/lib/libncursesw.a lrwxrwxrwx root/root usr/lib/libncursesw.so -> ../../lib/libncursesw.so.6.0 --rw-r--r-- root/root usr/lib/libpanel.a -lrwxrwxrwx root/root usr/lib/libpanel.so -> libpanel.so.6 -lrwxrwxrwx root/root usr/lib/libpanel.so.6 -> libpanel.so.6.0 --rwxr-xr-x root/root usr/lib/libpanel.so.6.0 +lrwxrwxrwx root/root usr/lib/libncursesw.so.5 -> libncursesw.so +-rw-r--r-- root/root usr/lib/libpanel.so -rw-r--r-- root/root usr/lib/libpanelw.a lrwxrwxrwx root/root usr/lib/libpanelw.so -> libpanelw.so.6 lrwxrwxrwx root/root usr/lib/libpanelw.so.6 -> libpanelw.so.6.0 -rwxr-xr-x root/root usr/lib/libpanelw.so.6.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +lrwxrwxrwx root/root usr/lib/pkgconfig/form.pc -> formw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/formw.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/menu.pc -> menuw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/menuw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/ncurses++w.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/ncurses.pc -> ncursesw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/ncursesw.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/panel.pc -> panelw.pc +-rw-r--r-- root/root usr/lib/pkgconfig/panelw.pc lrwxrwxrwx root/root usr/lib/terminfo -> ../share/terminfo drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ @@ -82,7 +80,6 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/clear.1.gz -rw-r--r-- root/root usr/share/man/man1/infocmp.1m.gz -rw-r--r-- root/root usr/share/man/man1/infotocap.1m.gz --rw-r--r-- root/root usr/share/man/man1/ncurses6-config.1.gz -rw-r--r-- root/root usr/share/man/man1/ncursesw6-config.1.gz lrwxrwxrwx root/root usr/share/man/man1/reset.1.gz -> tset.1.gz -rw-r--r-- root/root usr/share/man/man1/tabs.1.gz @@ -949,17 +946,6 @@ drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/terminfo.5.gz drwxr-xr-x root/root usr/share/man/man7/ -rw-r--r-- root/root usr/share/man/man7/term.7.gz -drwxr-xr-x root/root usr/share/pkgconfig/ --rw-r--r-- root/root usr/share/pkgconfig/form.pc --rw-r--r-- root/root usr/share/pkgconfig/formw.pc --rw-r--r-- root/root usr/share/pkgconfig/menu.pc --rw-r--r-- root/root usr/share/pkgconfig/menuw.pc --rw-r--r-- root/root usr/share/pkgconfig/ncurses++.pc --rw-r--r-- root/root usr/share/pkgconfig/ncurses++w.pc --rw-r--r-- root/root usr/share/pkgconfig/ncurses.pc --rw-r--r-- root/root usr/share/pkgconfig/ncursesw.pc --rw-r--r-- root/root usr/share/pkgconfig/panel.pc --rw-r--r-- root/root usr/share/pkgconfig/panelw.pc drwxr-xr-x root/root usr/share/tabset/ -rw-r--r-- root/root usr/share/tabset/std -rw-r--r-- root/root usr/share/tabset/stdcrt diff --git a/ncurses/Pkgfile b/ncurses/Pkgfile index e253481..90f5ad8 100644 --- a/ncurses/Pkgfile +++ b/ncurses/Pkgfile @@ -4,40 +4,44 @@ name=ncurses version=6.0 -release=1 +release=2 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) build() { cd $name-$version - local OPTIONS=" ---with-install-prefix=$PKG ---prefix=/usr ---mandir=/usr/share/man ---with-normal ---with-shared ---without-debug ---without-ada ---without-tests ---enable-pc-files -" - - ./configure $OPTIONS - make - make install - make distclean + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-{normal,shared} \ + --without-{debug,ada,tests} \ + --enable-pc-files \ + --with-pkg-config-libdir=/usr/lib/pkgconfig \ + --enable-widec - ./configure $OPTIONS --enable-widec make - make install + make DESTDIR=$PKG install install -d $PKG/{lib,usr/include/ncursesw} - for i in w ''; do - mv $PKG/usr/lib/libncurses$i.so.* $PKG/lib - ln -sf libncurses$i.so $PKG/usr/lib/libcurses$i.so - ln -sf ../../lib/libncurses$i.so.$version $PKG/usr/lib/libncurses$i.so + # move library to /lib and create symlinks + mv $PKG/usr/lib/libncursesw.so.* $PKG/lib + ln -sf ../../lib/libncursesw.so.$version $PKG/usr/lib/libncursesw.so + ln -s libncursesw.so.$version $PKG/lib/libncurses.so.${version%%.*} + + # linker scripts and .pc files for non-wide ncurses + for LIB in ncurses form panel menu ; do + echo "INPUT(-l${LIB}w)" > $PKG/usr/lib/lib${LIB}.so + ln -s ${LIB}w.pc $PKG/usr/lib/pkgconfig/${LIB}.pc done + # linker script for the curses library + echo "INPUT(-lncursesw)" > $PKG/usr/lib/libcursesw.so + ln -s libncurses.so $PKG/usr/lib/libcurses.so + + # symlinks for ncurses 5 (remove them later)) + ln -s libncursesw.so $PKG/usr/lib/libncurses.so.5 + ln -s libncursesw.so $PKG/usr/lib/libncursesw.so.5 + + # some progs expect a /usr/include/curses.h ln -s ../curses.h $PKG/usr/include/ncursesw/ncurses.h }

1 0

ports/opt (3.1): chromium-pepperflash: 39.0.2171.95 -> 45.0.2454.85
by crux＠crux.nu 08 Sep '15

08 Sep '15

commit 9572dcf17851eb37ee27ad31c2fa53e235ffe8be Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Sep 9 01:58:04 2015 +0200 chromium-pepperflash: 39.0.2171.95 -> 45.0.2454.85 diff --git a/chromium-pepperflash/Pkgfile b/chromium-pepperflash/Pkgfile index f311217..7d43990 100644 --- a/chromium-pepperflash/Pkgfile +++ b/chromium-pepperflash/Pkgfile @@ -4,7 +4,7 @@ # Depends on: chromium name=chromium-pepperflash -version=39.0.2171.95 +version=45.0.2454.85 release=1 source=()

1 0

ports/opt (3.1): chromium-pepperflash: 39.0.2171.95 -> 45.0.2454.85
by crux＠crux.nu 08 Sep '15

08 Sep '15

commit 9572dcf17851eb37ee27ad31c2fa53e235ffe8be Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Sep 9 01:58:04 2015 +0200 chromium-pepperflash: 39.0.2171.95 -> 45.0.2454.85 diff --git a/chromium-pepperflash/Pkgfile b/chromium-pepperflash/Pkgfile index f311217..7d43990 100644 --- a/chromium-pepperflash/Pkgfile +++ b/chromium-pepperflash/Pkgfile @@ -4,7 +4,7 @@ # Depends on: chromium name=chromium-pepperflash -version=39.0.2171.95 +version=45.0.2454.85 release=1 source=()

1 0

ports/opt (3.1): sitecopy: new source URL
by crux＠crux.nu 08 Sep '15

08 Sep '15

commit 29f23a15542ae67b0f413a895f6580bc4f679120 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Sep 8 13:51:24 2015 +0200 sitecopy: new source URL diff --git a/sitecopy/Pkgfile b/sitecopy/Pkgfile index 642244d..e4fe712 100644 --- a/sitecopy/Pkgfile +++ b/sitecopy/Pkgfile @@ -6,7 +6,7 @@ name=sitecopy version=0.16.6 release=3 -source=(http://www.manyfish.co.uk/sitecopy/$name-$version.tar.gz +source=(http://crux.s3.amazonaws.com/dist/$name-$version.tar.gz $name-$version.patch) build () {

1 0

ports/opt (3.1): sitecopy: new source URL
by crux＠crux.nu 08 Sep '15

08 Sep '15

commit 29f23a15542ae67b0f413a895f6580bc4f679120 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Sep 8 13:51:24 2015 +0200 sitecopy: new source URL diff --git a/sitecopy/Pkgfile b/sitecopy/Pkgfile index 642244d..e4fe712 100644 --- a/sitecopy/Pkgfile +++ b/sitecopy/Pkgfile @@ -6,7 +6,7 @@ name=sitecopy version=0.16.6 release=3 -source=(http://www.manyfish.co.uk/sitecopy/$name-$version.tar.gz +source=(http://crux.s3.amazonaws.com/dist/$name-$version.tar.gz $name-$version.patch) build () {

1 0